Merge pull request #1010 from zowe/theia-v1.1.0-update-fix

Update environment check for Theia compatability
zowe · Sep 11, 2020 · 9100ee3 · 9100ee3
2 parents 027db5e + 99dfe31
commit 9100ee3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/__tests__/__unit__/extension.unit.test.ts b/__tests__/__unit__/extension.unit.test.ts
@@ -79,6 +79,12 @@ async function createGlobalMocks() {
                 WorkspaceFolder: 3
             };
         }),
+        UIKindEnums: jest.fn().mockImplementation(() => {
+            return {
+                Desktop: 1,
+                Web: 2
+            };
+        }),
         testSession: new imperative.Session({
             user: "fake",
             password: "fake",
@@ -227,6 +233,7 @@ async function createGlobalMocks() {
     Object.defineProperty(globalMocks.mockImperativeConfig, "instance", { value: globalMocks.mockIcInstance, configurable: true });
     Object.defineProperty(globalMocks.mockIcInstance, "cliHome", { get: globalMocks.mockCliHome });
     Object.defineProperty(vscode.env, "appName", { value: globalMocks.appName, configurable: true });
+    Object.defineProperty(vscode, "UIKind", { value: globalMocks.UIKindEnums, configurable: true });
     Object.defineProperty(Profiles, "createInstance", {
         value: jest.fn(() => globalMocks.testProfileOps)
     });
@@ -360,6 +367,7 @@ describe("Extension Unit Tests", () => {
         const globalMocks = await createGlobalMocks();
 
         Object.defineProperty(vscode.env, "appName", { value: "Eclipse Theia" });
+        Object.defineProperty(vscode.env, "uiKind", { value: vscode.UIKind.Web });
         globalMocks.mockExistsSync.mockReset();
         globalMocks.mockReaddirSync.mockReset();
         globalMocks.mockExistsSync.mockReturnValueOnce(true);

diff --git a/src/globals.ts b/src/globals.ts
@@ -52,7 +52,7 @@ export const ACTIVE_CONTEXT = CONTEXT_PREFIX + "Active";
 export const UNVERIFIED_CONTEXT = CONTEXT_PREFIX + "Unverified";
 export const ICON_STATE_OPEN = "open";
 export const ICON_STATE_CLOSED = "closed";
-export const THEIA = "Eclipse Theia";
+export const VSCODE_APPNAME: string[] = ["Visual Studio Code", "VSCodium"];
 export const ROOTPATH = path.join(__dirname, "..", "..");
 
 /**
@@ -71,7 +71,9 @@ export enum PersistenceSchemaEnum {
 export function defineGlobals(tempPath: string | undefined) {
     // Set app name
     const appName: string = vscode.env.appName;
-    if (appName && appName === this.THEIA) { this.ISTHEIA = true; }
+    if (appName && !this.VSCODE_APPNAME.includes(appName) && vscode.env.uiKind === vscode.UIKind.Web) {
+        this.ISTHEIA = true;
+    }
 
     // Set temp path & folder paths
     tempPath !== "" && tempPath !== undefined ?