chore: try to activate official extension first

lifeart · Mar 29, 2024 · afb12d1 · afb12d1
1 parent 348c7f1
commit afb12d1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "description": "(aka uELS, Unstable Ember Language Server), Provides features like auto complete, goto definition and diagnostics for Ember.js projects",
   "author": "Aleksandr Kanunnikov <lifeart92@gmail.com>",
   "license": "MIT",
-  "version": "3.0.54",
+  "version": "3.0.55",
   "publisher": "lifeart",
   "icon": "assets/icon.png",
   "keywords": [

diff --git a/src/extension.ts b/src/extension.ts
@@ -34,8 +34,18 @@ let ExtServerDebugBarItem: StatusBarItem;
 const OFFICIAL_EMBER_LANGUAGE_SERVER = 'EmberTooling.vscode-ember';
 export async function activate(context: ExtensionContext) {
   const extension = extensions.getExtension(OFFICIAL_EMBER_LANGUAGE_SERVER);
-  if (extension && extension.isActive) {
-    return;
+  if (extension) {
+    if (extension.isActive) {
+      return;
+    }
+    try {
+      await extension.activate();
+    } catch (e) {
+      // noop
+    }
+    if (extension.isActive) {
+      return;
+    }
   }
   // The server is implemented in node
   const serverModule = path.join(context.extensionPath, './start-server.js');