Skip to content

Commit 648cece

Browse files
committed
Remove dependency on Server Manager extension
1 parent 3134001 commit 648cece

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"onLanguage:objectscript-class",
6969
"onLanguage:objectscript-macros",
7070
"onLanguage:xml",
71-
"onView:intersystems-community_servermanager",
71+
"onView:intersystems-community",
7272
"onFileSystem:isfs",
7373
"onFileSystem:isfs-readonly",
7474
"onFileSystem:objectscript",
@@ -1614,7 +1614,7 @@
16141614
}
16151615
},
16161616
"views": {
1617-
"intersystems-community_servermanager": [
1617+
"intersystems-community": [
16181618
{
16191619
"id": "ObjectScriptExplorer",
16201620
"name": "Explorer",
@@ -1822,6 +1822,6 @@
18221822
"ws": "^8.18.0"
18231823
},
18241824
"extensionDependencies": [
1825-
"intersystems-community.servermanager"
1825+
"intersystems-community.viewcontainer"
18261826
]
18271827
}

src/extension.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -752,10 +752,12 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
752752
extensionContext = context;
753753
workspaceState.update("workspaceFolder", undefined);
754754

755-
// Get api for servermanager extension
755+
// Get api for servermanager extension if it is installed
756756
const smExt = vscode.extensions.getExtension(smExtensionId);
757-
if (!smExt.isActive) await smExt.activate();
758-
serverManagerApi = smExt.exports;
757+
if (smExt && !smExt.isActive) {
758+
await smExt.activate();
759+
serverManagerApi = smExt.exports;
760+
}
759761

760762
documentContentProvider = new DocumentContentProvider();
761763
fileSystemProvider = new FileSystemProvider();

0 commit comments

Comments
 (0)