fix. remove redundant os check at extension level (#234)

albertli-msft · web-flow · commit 5c5c7faa4954 · 2023-02-16T22:58:04.000+08:00
diff --git a/localize/i18n/cs/extension.json b/localize/i18n/cs/extension.json
@@ -6,7 +6,6 @@
   "PQSdk.common.logLevel.Trace": "Trace",
   "PQSdk.common.logLevel.Info": "Info",
   "PQSdk.common.logLevel.Error": "Error",
-  "PQSdk.boostrap.unsupported.arch": "Unsupported platform or architecture found, currently Power query SDK would only support Windows x86_64 or arm64",
   "PQSdk.debugger.error.cannot.find.program": "Cannot find a program to debug",
   "PQSdk.lifecycle.command.update.lastCtimeOfMezFile": "Update last ctime of an inferred mez file to {lastCtimeOfMezFileWhoseInfoSeized}",
   "PQSdk.lifecycle.command.detect.newerMezFile": "Detected a newer mez file, about to infer its latest info. {currentCtime}, {diffCtime}",
diff --git a/localize/i18n/de/extension.json b/localize/i18n/de/extension.json
@@ -6,7 +6,6 @@
   "PQSdk.common.logLevel.Trace": "Trace",
   "PQSdk.common.logLevel.Info": "Info",
   "PQSdk.common.logLevel.Error": "Error",
-  "PQSdk.boostrap.unsupported.arch": "Unsupported platform or architecture found, currently Power query SDK would only support Windows x86_64 or arm64",
   "PQSdk.debugger.error.cannot.find.program": "Cannot find a program to debug",
   "PQSdk.lifecycle.command.update.lastCtimeOfMezFile": "Update last ctime of an inferred mez file to {lastCtimeOfMezFileWhoseInfoSeized}",
   "PQSdk.lifecycle.command.detect.newerMezFile": "Detected a newer mez file, about to infer its latest info. {currentCtime}, {diffCtime}",
diff --git a/localize/i18n/es/extension.json b/localize/i18n/es/extension.json
@@ -6,7 +6,6 @@
   "PQSdk.common.logLevel.Trace": "Trace",
   "PQSdk.common.logLevel.Info": "Info",
   "PQSdk.common.logLevel.Error": "Error",
-  "PQSdk.boostrap.unsupported.arch": "Unsupported platform or architecture found, currently Power query SDK would only support Windows x86_64 or arm64",
   "PQSdk.debugger.error.cannot.find.program": "Cannot find a program to debug",
   "PQSdk.lifecycle.command.update.lastCtimeOfMezFile": "Update last ctime of an inferred mez file to {lastCtimeOfMezFileWhoseInfoSeized}",
   "PQSdk.lifecycle.command.detect.newerMezFile": "Detected a newer mez file, about to infer its latest info. {currentCtime}, {diffCtime}",
diff --git a/localize/i18n/fr/extension.json b/localize/i18n/fr/extension.json
@@ -6,7 +6,6 @@
   "PQSdk.common.logLevel.Trace": "Trace",
   "PQSdk.common.logLevel.Info": "Info",
   "PQSdk.common.logLevel.Error": "Error",
-  "PQSdk.boostrap.unsupported.arch": "Unsupported platform or architecture found, currently Power query SDK would only support Windows x86_64 or arm64",
   "PQSdk.debugger.error.cannot.find.program": "Cannot find a program to debug",
   "PQSdk.lifecycle.command.update.lastCtimeOfMezFile": "Update last ctime of an inferred mez file to {lastCtimeOfMezFileWhoseInfoSeized}",
   "PQSdk.lifecycle.command.detect.newerMezFile": "Detected a newer mez file, about to infer its latest info. {currentCtime}, {diffCtime}",
diff --git a/localize/i18n/it/extension.json b/localize/i18n/it/extension.json
@@ -6,7 +6,6 @@
   "PQSdk.common.logLevel.Trace": "Trace",
   "PQSdk.common.logLevel.Info": "Info",
   "PQSdk.common.logLevel.Error": "Error",
-  "PQSdk.boostrap.unsupported.arch": "Unsupported platform or architecture found, currently Power query SDK would only support Windows x86_64 or arm64",
   "PQSdk.debugger.error.cannot.find.program": "Cannot find a program to debug",
   "PQSdk.lifecycle.command.update.lastCtimeOfMezFile": "Update last ctime of an inferred mez file to {lastCtimeOfMezFileWhoseInfoSeized}",
   "PQSdk.lifecycle.command.detect.newerMezFile": "Detected a newer mez file, about to infer its latest info. {currentCtime}, {diffCtime}",
diff --git a/localize/i18n/ja/extension.json b/localize/i18n/ja/extension.json
@@ -6,7 +6,6 @@
   "PQSdk.common.logLevel.Trace": "Trace",
   "PQSdk.common.logLevel.Info": "Info",
   "PQSdk.common.logLevel.Error": "Error",
-  "PQSdk.boostrap.unsupported.arch": "Unsupported platform or architecture found, currently Power query SDK would only support Windows x86_64 or arm64",
   "PQSdk.debugger.error.cannot.find.program": "Cannot find a program to debug",
   "PQSdk.lifecycle.command.update.lastCtimeOfMezFile": "Update last ctime of an inferred mez file to {lastCtimeOfMezFileWhoseInfoSeized}",
   "PQSdk.lifecycle.command.detect.newerMezFile": "Detected a newer mez file, about to infer its latest info. {currentCtime}, {diffCtime}",
diff --git a/localize/i18n/ko/extension.json b/localize/i18n/ko/extension.json
@@ -6,7 +6,6 @@
   "PQSdk.common.logLevel.Trace": "Trace",
   "PQSdk.common.logLevel.Info": "Info",
   "PQSdk.common.logLevel.Error": "Error",
-  "PQSdk.boostrap.unsupported.arch": "Unsupported platform or architecture found, currently Power query SDK would only support Windows x86_64 or arm64",
   "PQSdk.debugger.error.cannot.find.program": "Cannot find a program to debug",
   "PQSdk.lifecycle.command.update.lastCtimeOfMezFile": "Update last ctime of an inferred mez file to {lastCtimeOfMezFileWhoseInfoSeized}",
   "PQSdk.lifecycle.command.detect.newerMezFile": "Detected a newer mez file, about to infer its latest info. {currentCtime}, {diffCtime}",
diff --git a/localize/i18n/pl/extension.json b/localize/i18n/pl/extension.json
@@ -6,7 +6,6 @@
   "PQSdk.common.logLevel.Trace": "Trace",
   "PQSdk.common.logLevel.Info": "Info",
   "PQSdk.common.logLevel.Error": "Error",
-  "PQSdk.boostrap.unsupported.arch": "Unsupported platform or architecture found, currently Power query SDK would only support Windows x86_64 or arm64",
   "PQSdk.debugger.error.cannot.find.program": "Cannot find a program to debug",
   "PQSdk.lifecycle.command.update.lastCtimeOfMezFile": "Update last ctime of an inferred mez file to {lastCtimeOfMezFileWhoseInfoSeized}",
   "PQSdk.lifecycle.command.detect.newerMezFile": "Detected a newer mez file, about to infer its latest info. {currentCtime}, {diffCtime}",
diff --git a/localize/i18n/pt-br/extension.json b/localize/i18n/pt-br/extension.json
@@ -6,7 +6,6 @@
   "PQSdk.common.logLevel.Trace": "Trace",
   "PQSdk.common.logLevel.Info": "Info",
   "PQSdk.common.logLevel.Error": "Error",
-  "PQSdk.boostrap.unsupported.arch": "Unsupported platform or architecture found, currently Power query SDK would only support Windows x86_64 or arm64",
   "PQSdk.debugger.error.cannot.find.program": "Cannot find a program to debug",
   "PQSdk.lifecycle.command.update.lastCtimeOfMezFile": "Update last ctime of an inferred mez file to {lastCtimeOfMezFileWhoseInfoSeized}",
   "PQSdk.lifecycle.command.detect.newerMezFile": "Detected a newer mez file, about to infer its latest info. {currentCtime}, {diffCtime}",
diff --git a/localize/i18n/ru/extension.json b/localize/i18n/ru/extension.json
@@ -6,7 +6,6 @@
   "PQSdk.common.logLevel.Trace": "Trace",
   "PQSdk.common.logLevel.Info": "Info",
   "PQSdk.common.logLevel.Error": "Error",
-  "PQSdk.boostrap.unsupported.arch": "Unsupported platform or architecture found, currently Power query SDK would only support Windows x86_64 or arm64",
   "PQSdk.debugger.error.cannot.find.program": "Cannot find a program to debug",
   "PQSdk.lifecycle.command.update.lastCtimeOfMezFile": "Update last ctime of an inferred mez file to {lastCtimeOfMezFileWhoseInfoSeized}",
   "PQSdk.lifecycle.command.detect.newerMezFile": "Detected a newer mez file, about to infer its latest info. {currentCtime}, {diffCtime}",
diff --git a/localize/i18n/tr/extension.json b/localize/i18n/tr/extension.json
@@ -6,7 +6,6 @@
   "PQSdk.common.logLevel.Trace": "Trace",
   "PQSdk.common.logLevel.Info": "Info",
   "PQSdk.common.logLevel.Error": "Error",
-  "PQSdk.boostrap.unsupported.arch": "Unsupported platform or architecture found, currently Power query SDK would only support Windows x86_64 or arm64",
   "PQSdk.debugger.error.cannot.find.program": "Cannot find a program to debug",
   "PQSdk.lifecycle.command.update.lastCtimeOfMezFile": "Update last ctime of an inferred mez file to {lastCtimeOfMezFileWhoseInfoSeized}",
   "PQSdk.lifecycle.command.detect.newerMezFile": "Detected a newer mez file, about to infer its latest info. {currentCtime}, {diffCtime}",
diff --git a/localize/i18n/zh-cn/extension.json b/localize/i18n/zh-cn/extension.json
@@ -6,7 +6,6 @@
   "PQSdk.common.logLevel.Trace": "Trace",
   "PQSdk.common.logLevel.Info": "Info",
   "PQSdk.common.logLevel.Error": "Error",
-  "PQSdk.boostrap.unsupported.arch": "Unsupported platform or architecture found, currently Power query SDK would only support Windows x86_64 or arm64",
   "PQSdk.debugger.error.cannot.find.program": "Cannot find a program to debug",
   "PQSdk.lifecycle.command.update.lastCtimeOfMezFile": "Update last ctime of an inferred mez file to {lastCtimeOfMezFileWhoseInfoSeized}",
   "PQSdk.lifecycle.command.detect.newerMezFile": "Detected a newer mez file, about to infer its latest info. {currentCtime}, {diffCtime}",
diff --git a/localize/i18n/zh-tw/extension.json b/localize/i18n/zh-tw/extension.json
@@ -6,7 +6,6 @@
   "PQSdk.common.logLevel.Trace": "Trace",
   "PQSdk.common.logLevel.Info": "Info",
   "PQSdk.common.logLevel.Error": "Error",
-  "PQSdk.boostrap.unsupported.arch": "Unsupported platform or architecture found, currently Power query SDK would only support Windows x86_64 or arm64",
   "PQSdk.debugger.error.cannot.find.program": "Cannot find a program to debug",
   "PQSdk.lifecycle.command.update.lastCtimeOfMezFile": "Update last ctime of an inferred mez file to {lastCtimeOfMezFileWhoseInfoSeized}",
   "PQSdk.lifecycle.command.detect.newerMezFile": "Detected a newer mez file, about to infer its latest info. {currentCtime}, {diffCtime}",
diff --git a/src/extension.ts b/src/extension.ts
@@ -11,10 +11,8 @@ import { convertExtensionInfoToLibraryJson, ExtensionInfo, IPQTestService } from
 import { getFirstWorkspaceFolder, maybeHandleNewWorkspaceCreated } from "./utils/vscodes";
 import { activateMQueryDebug } from "./debugAdaptor/activateMQueryDebug";
 import { ExtensionConfigurations } from "./constants/PowerQuerySdkConfiguration";
-import { extensionI18n } from "./i18n/extension";
 import { GlobalEventBus } from "./GlobalEventBus";
 import { IDisposable } from "./common/Disposable";
-import { isSupportedOs } from "./utils/osUtils";
 import { LifecycleCommands } from "./commands/LifecycleCommands";
 import { LifeCycleTaskTreeView } from "./features/LifeCycleTaskTreeView";
 import { PowerQueryTaskProvider } from "./features/PowerQueryTaskProvider";
@@ -25,85 +23,76 @@ import { PqTestExecutableTaskQueue } from "./pqTestConnector/PqTestExecutableTas
 import { PqTestResultViewPanel } from "./panels/PqTestResultViewPanel";
 
 export function activate(vscExtCtx: vscode.ExtensionContext): void {
-    if (isSupportedOs()) {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const vscPowerQuery: any = vscode.extensions.getExtension("powerquery.vscode-powerquery")?.exports;
-
-        const useServiceHost: boolean = ExtensionConfigurations.featureUseServiceHost;
-
-        // let's make extension::activate serves as minimum as possible:
-        // for now:
-        //          it basically does the Dependency Injection,
-        //          which could be replaced by *inversify* if we later really need to
-        const globalEventBus: GlobalEventBus = new GlobalEventBus(vscExtCtx);
-        const pqTestResultViewPanelDisposable: IDisposable = PqTestResultViewPanel.activate(vscExtCtx);
-        const pqSdkOutputChannel: PqSdkOutputChannel = new PqSdkOutputChannel();
-
-        const pqSdkNugetPackageService: PqSdkNugetPackageService = new PqSdkNugetPackageService(
-            vscExtCtx,
-            globalEventBus,
-            pqSdkOutputChannel,
-        );
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const vscPowerQuery: any = vscode.extensions.getExtension("powerquery.vscode-powerquery")?.exports;
+
+    const useServiceHost: boolean = ExtensionConfigurations.featureUseServiceHost;
+
+    // let's make extension::activate serves as minimum as possible:
+    // for now:
+    //          it basically does the Dependency Injection,
+    //          which could be replaced by *inversify* if we later really need to
+    const globalEventBus: GlobalEventBus = new GlobalEventBus(vscExtCtx);
+    const pqTestResultViewPanelDisposable: IDisposable = PqTestResultViewPanel.activate(vscExtCtx);
+    const pqSdkOutputChannel: PqSdkOutputChannel = new PqSdkOutputChannel();
+
+    const pqSdkNugetPackageService: PqSdkNugetPackageService = new PqSdkNugetPackageService(
+        vscExtCtx,
+        globalEventBus,
+        pqSdkOutputChannel,
+    );
+
+    const disposablePqTestServices: IPQTestService & IDisposable = useServiceHost
+        ? new PqServiceHostClient(globalEventBus, pqSdkOutputChannel)
+        : new PqTestExecutableTaskQueue(vscExtCtx, globalEventBus, pqSdkOutputChannel);
+
+    disposablePqTestServices.currentExtensionInfos.subscribe((infos: ExtensionInfo[]) => {
+        const theUri: vscode.Uri | undefined = getFirstWorkspaceFolder()?.uri;
+
+        if (theUri) {
+            vscPowerQuery.onModuleLibraryUpdated(theUri.toString(), convertExtensionInfoToLibraryJson(infos));
+        }
+    });
 
-        const disposablePqTestServices: IPQTestService & IDisposable = useServiceHost
-            ? new PqServiceHostClient(globalEventBus, pqSdkOutputChannel)
-            : new PqTestExecutableTaskQueue(vscExtCtx, globalEventBus, pqSdkOutputChannel);
+    if (disposablePqTestServices.currentExtensionInfos.value.length) {
+        disposablePqTestServices.currentExtensionInfos.emit();
+    }
 
-        disposablePqTestServices.currentExtensionInfos.subscribe((infos: ExtensionInfo[]) => {
-            const theUri: vscode.Uri | undefined = getFirstWorkspaceFolder()?.uri;
+    const pqTaskProvider: IDisposable = vscode.tasks.registerTaskProvider(
+        PowerQueryTaskProvider.TaskType,
+        new PowerQueryTaskProvider(disposablePqTestServices),
+    );
 
-            if (theUri) {
-                vscPowerQuery.onModuleLibraryUpdated(theUri.toString(), convertExtensionInfoToLibraryJson(infos));
-            }
-        });
+    // lifecycleCommands instance has not been a disposable yet
+    const lifecycleCommands: LifecycleCommands = new LifecycleCommands(
+        vscExtCtx,
+        globalEventBus,
+        pqSdkNugetPackageService,
+        disposablePqTestServices,
+        pqSdkOutputChannel,
+    );
 
-        if (disposablePqTestServices.currentExtensionInfos.value.length) {
-            disposablePqTestServices.currentExtensionInfos.emit();
-        }
+    const lifeCycleTaskTreeViewDataProvider: LifeCycleTaskTreeView = new LifeCycleTaskTreeView(globalEventBus);
 
-        const pqTaskProvider: IDisposable = vscode.tasks.registerTaskProvider(
-            PowerQueryTaskProvider.TaskType,
-            new PowerQueryTaskProvider(disposablePqTestServices),
-        );
+    const lifeCycleTaskTreeView: IDisposable = vscode.window.createTreeView(LifeCycleTaskTreeView.TreeViewName, {
+        treeDataProvider: lifeCycleTaskTreeViewDataProvider,
+    });
 
-        // lifecycleCommands instance has not been a disposable yet
-        const lifecycleCommands: LifecycleCommands = new LifecycleCommands(
-            vscExtCtx,
+    vscExtCtx.subscriptions.push(
+        ...[
             globalEventBus,
-            pqSdkNugetPackageService,
-            disposablePqTestServices,
+            pqTestResultViewPanelDisposable,
             pqSdkOutputChannel,
-        );
-
-        const lifeCycleTaskTreeViewDataProvider: LifeCycleTaskTreeView = new LifeCycleTaskTreeView(globalEventBus);
-
-        const lifeCycleTaskTreeView: IDisposable = vscode.window.createTreeView(LifeCycleTaskTreeView.TreeViewName, {
-            treeDataProvider: lifeCycleTaskTreeViewDataProvider,
-        });
-
-        vscExtCtx.subscriptions.push(
-            ...[
-                globalEventBus,
-                pqTestResultViewPanelDisposable,
-                pqSdkOutputChannel,
-                disposablePqTestServices,
-                pqTaskProvider,
-                lifecycleCommands,
-                lifeCycleTaskTreeView,
-            ].reverse(),
-        );
-
-        activateMQueryDebug(vscExtCtx, "server");
-
-        void maybeHandleNewWorkspaceCreated();
-    } else {
-        // do not activate for unsupported platform or architecture
-        const pqSdkOutputChannel: PqSdkOutputChannel = new PqSdkOutputChannel();
+            disposablePqTestServices,
+            pqTaskProvider,
+            lifecycleCommands,
+            lifeCycleTaskTreeView,
+        ].reverse(),
+    );
 
-        pqSdkOutputChannel.appendErrorLine(extensionI18n["PQSdk.boostrap.unsupported.arch"]);
+    activateMQueryDebug(vscExtCtx, "server");
 
-        vscExtCtx.subscriptions.push(pqSdkOutputChannel);
-    }
+    void maybeHandleNewWorkspaceCreated();
 }
 
 // we need not explicitly invoke deactivate callbacks for now
diff --git a/src/i18n/extension.json b/src/i18n/extension.json
@@ -6,7 +6,6 @@
   "PQSdk.common.logLevel.Trace": "Trace",
   "PQSdk.common.logLevel.Info": "Info",
   "PQSdk.common.logLevel.Error": "Error",
-  "PQSdk.boostrap.unsupported.arch": "Unsupported platform or architecture found, currently Power query SDK would only support Windows x86_64 or arm64",
   "PQSdk.debugger.error.cannot.find.program": "Cannot find a program to debug",
   "PQSdk.lifecycle.command.update.lastCtimeOfMezFile": "Update last ctime of an inferred mez file to {lastCtimeOfMezFileWhoseInfoSeized}",
   "PQSdk.lifecycle.command.detect.newerMezFile": "Detected a newer mez file, about to infer its latest info. {currentCtime}, {diffCtime}",
diff --git a/src/utils/osUtils.ts b/src/utils/osUtils.ts
@@ -19,10 +19,3 @@ export function makeOneTmpDir(): string {
 
     return targetDir;
 }
-
-export function isSupportedOs(): boolean {
-    const platform: string = os.platform();
-    const arch: string = os.arch();
-
-    return platform === "win32" && (arch === "x64" || arch === "arm64");
-}
