workspace: cleanup workbench state

Signed-off-by: vince-fugnitto <[email protected]>
eclipse-theia · Dec 17, 2021 · ad52561 · ad52561
1 parent 89f6897
commit ad52561
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/packages/workspace/src/browser/workspace-frontend-contribution.ts b/packages/workspace/src/browser/workspace-frontend-contribution.ts
@@ -51,6 +51,7 @@ export enum WorkspaceStates {
     folder = 'folder',
 };
 export type WorkspaceState = keyof typeof WorkspaceStates;
+export type WorkbenchState = keyof typeof WorkspaceStates;
 
 @injectable()
 export class WorkspaceFrontendContribution implements CommandContribution, KeybindingContribution, MenuContribution, FrontendApplicationContribution {
@@ -90,7 +91,7 @@ export class WorkspaceFrontendContribution implements CommandContribution, Keybi
         const updateWorkspaceStateKey = () => workspaceStateKey.set(this.updateWorkspaceStateKey());
         updateWorkspaceStateKey();
 
-        const workbenchStateKey = this.contextKeyService.createKey<WorkspaceState>('workbenchState', 'empty');
+        const workbenchStateKey = this.contextKeyService.createKey<WorkbenchState>('workbenchState', 'empty');
         const updateWorkbenchStateKey = () => workbenchStateKey.set(this.updateWorkbenchStateKey());
         updateWorkbenchStateKey();
 
@@ -500,14 +501,14 @@ export class WorkspaceFrontendContribution implements CommandContribution, Keybi
     }
 
     protected updateWorkspaceStateKey(): WorkspaceState {
-        return this.doUpdateWorkspaceState();
+        return this.doUpdateState();
     }
 
-    protected updateWorkbenchStateKey(): WorkspaceState {
-        return this.doUpdateWorkspaceState();
+    protected updateWorkbenchStateKey(): WorkbenchState {
+        return this.doUpdateState();
     }
 
-    protected doUpdateWorkspaceState(): WorkspaceState {
+    protected doUpdateState(): WorkspaceState | WorkbenchState {
         if (this.workspaceService.opened) {
             return this.workspaceService.isMultiRootWorkspaceOpened ? 'workspace' : 'folder';
         }