Move the unsupported error message higher up

microsoft · Aug 7, 2019 · 007292c · bobbrow · Aug 7, 2019 · 007292c
1 parent 8e31eb9
commit 007292c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts
@@ -70,17 +70,6 @@ export function activate(activationEventOccurred: boolean): void {
         return;
     }
 
-    let errMsg: string;
-    if (process.arch !== 'x32' && process.arch !== 'x64') {
-        errMsg = "Architecture " + String(process.arch) + " is not supported. ";
-    } else if (process.platform === 'linux' && fs.existsSync('/etc/alpine-release')) {
-        errMsg = "Alpine containers are not supported. ";
-    }
-    if (errMsg) {
-        vscode.window.showErrorMessage(errMsg);
-        return;
-    }
-
     taskProvider = vscode.tasks.registerTaskProvider(taskSourceStr, {
         provideTasks: () => {
             return getBuildTasks(false);

diff --git a/Extension/src/main.ts b/Extension/src/main.ts
@@ -29,6 +29,17 @@ let reloadMessageShown: boolean = false;
 let disposables: vscode.Disposable[] = [];
 
 export async function activate(context: vscode.ExtensionContext): Promise<CppToolsApi & CppToolsExtension> {
+    let errMsg: string = "";
+    if (process.arch !== 'x32' && process.arch !== 'x64') {
+        errMsg = "Architecture " + String(process.arch) + " is not supported. ";
+    } else if (process.platform === 'linux' && fs.existsSync('/etc/alpine-release')) {
+        errMsg = "Alpine containers are not supported. ";
+    }
+    if (errMsg) {
+        vscode.window.showErrorMessage(errMsg);
+        return;
+    }
+
     util.setExtensionContext(context);
     initializeTemporaryCommandRegistrar();
     Telemetry.activate();