From 648ceceed4dbb12efc07fced8d15c2a9882c1cf7 Mon Sep 17 00:00:00 2001
From: gjsjohnmurray <johnm@georgejames.com>
Date: Mon, 3 Mar 2025 20:49:11 +0000
Subject: [PATCH] Remove dependency on Server Manager extension

---
 package.json     | 6 +++---
 src/extension.ts | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 699eafbb..076ca3a8 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "onLanguage:objectscript-class",
     "onLanguage:objectscript-macros",
     "onLanguage:xml",
-    "onView:intersystems-community_servermanager",
+    "onView:intersystems-community",
     "onFileSystem:isfs",
     "onFileSystem:isfs-readonly",
     "onFileSystem:objectscript",
@@ -1614,7 +1614,7 @@
       }
     },
     "views": {
-      "intersystems-community_servermanager": [
+      "intersystems-community": [
         {
           "id": "ObjectScriptExplorer",
           "name": "Explorer",
@@ -1822,6 +1822,6 @@
     "ws": "^8.18.0"
   },
   "extensionDependencies": [
-    "intersystems-community.servermanager"
+    "intersystems-community.viewcontainer"
   ]
 }
diff --git a/src/extension.ts b/src/extension.ts
index d4240aa0..0e1fd8f4 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -752,10 +752,12 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
   extensionContext = context;
   workspaceState.update("workspaceFolder", undefined);
 
-  // Get api for servermanager extension
+  // Get api for servermanager extension if it is installed
   const smExt = vscode.extensions.getExtension(smExtensionId);
-  if (!smExt.isActive) await smExt.activate();
-  serverManagerApi = smExt.exports;
+  if (smExt && !smExt.isActive) {
+    await smExt.activate();
+    serverManagerApi = smExt.exports;
+  }
 
   documentContentProvider = new DocumentContentProvider();
   fileSystemProvider = new FileSystemProvider();