Fixes #4426 showing hidden views

Adapts view focus command for VS Code 1.100+
 - Uses a version-aware helper to use 'open' instead of 'focus'
 - Ensures views are shown before attempting to restore selections
 - Avoids hanging promise when trying to clear a hidden view

Author: eamodio

src/constants.commands.ts

@@ -184,7 +184,7 @@ export type CoreCommands =
 	| 'workbench.view.extension.gitlensInspect'
 	| 'workbench.view.scm'
 	| `${ViewContainerIds | CoreViewContainerIds}.resetViewContainerLocation`
-	| `${ViewIds}.${'focus' | 'removeView' | 'resetViewLocation' | 'toggleVisibility'}`;
+	| `${ViewIds}.${'focus' | 'open' | 'removeView' | 'resetViewLocation' | 'toggleVisibility'}`;
 
 export type CoreGitCommands =
 	| 'git.fetch'

src/system/-webview/vscode/views.ts

@@ -0,0 +1,11 @@
+import { version as codeVersion } from 'vscode';
+import type { CoreCommands } from '../../../constants.commands';
+import type { ViewIds } from '../../../constants.views';
+import { compare } from '../../version';
+
+export function getViewFocusCommand(viewId: ViewIds): CoreCommands {
+	if (compare(codeVersion, '1.100') >= 0) {
+		return `${viewId}.open`;
+	}
+	return `${viewId}.focus`;
+}

src/views/scmGroupedView.ts

@@ -81,8 +81,10 @@ export class ScmGroupedView implements Disposable {
 			// Force a "refresh" of the tree to blank it out
 			this._cleared?.cancel();
 			this._cleared = defer<void>();
-			this._onDidChangeTreeData?.fire(undefined);
-			await this._cleared.promise.catch(() => {}).finally(() => (this._cleared = undefined));
+			if (this._tree?.visible) {
+				this._onDidChangeTreeData?.fire(undefined);
+				await this._cleared.promise.catch(() => {}).finally(() => (this._cleared = undefined));
+			}
 			this._cleared = undefined;
 		}
 	}

src/views/viewBase.ts

@@ -39,6 +39,7 @@ import type { TreeViewIds, TreeViewTypes, WebviewViewTypes } from '../constants.
 import type { Container } from '../container';
 import { executeCoreCommand } from '../system/-webview/command';
 import { configuration } from '../system/-webview/configuration';
+import { getViewFocusCommand } from '../system/-webview/vscode/views';
 import { debug, log } from '../system/decorators/log';
 import { once } from '../system/event';
 import { debounce } from '../system/function/debounce';
@@ -911,7 +912,7 @@ export abstract class ViewBase<
 		const scope = getLogScope();
 
 		try {
-			const command = `${this.grouped ? 'gitlens.views.scm.grouped' : this.id}.focus` as const;
+			const command = getViewFocusCommand(this.grouped ? 'gitlens.views.scm.grouped' : this.id);
 			// If we haven't been initialized, the focus command will show the view, but won't focus it, so wait until it's initialized and then focus again
 			if (this.initialized.pending) {
 				void executeCoreCommand(command, options);

src/views/views.ts

@@ -14,6 +14,7 @@ import type { GitWorktree } from '../git/models/worktree';
 import { executeCommand, executeCoreCommand, registerCommand } from '../system/-webview/command';
 import { configuration } from '../system/-webview/configuration';
 import { getContext, setContext } from '../system/-webview/context';
+import { getViewFocusCommand } from '../system/-webview/vscode/views';
 import { once } from '../system/function';
 import { first } from '../system/iterable';
 import { compare } from '../system/version';
@@ -139,9 +140,9 @@ export class Views implements Disposable {
 			const disposable = once(container.onReady)(() => {
 				disposable?.dispose();
 				setTimeout(() => {
-					executeCoreCommand(`gitlens.views.scm.grouped.focus`, { preserveFocus: true });
+					executeCoreCommand(getViewFocusCommand('gitlens.views.scm.grouped'), { preserveFocus: true });
 					if (newInstall) {
-						executeCoreCommand(`gitlens.views.home.focus`, { preserveFocus: true });
+						executeCoreCommand(getViewFocusCommand('gitlens.views.home'), { preserveFocus: true });
 					}
 				}, 0);
 			});
@@ -531,6 +532,10 @@ export class Views implements Disposable {
 
 			// Restore the last selection for this view type (if any)
 			if (view) {
+				if (!view.visible) {
+					await view.show({ preserveFocus: !focus });
+				}
+
 				const selection = this._lastSelectedByView.get(type);
 				if (selection != null) {
 					setTimeout(async () => {
@@ -549,7 +554,7 @@ export class Views implements Disposable {
 		this.lastSelectedScmGroupedView = type;
 
 		if (focus) {
-			void executeCoreCommand(`gitlens.views.scm.grouped.focus`);
+			void executeCoreCommand(getViewFocusCommand('gitlens.views.scm.grouped'), { preserveFocus: false });
 		}
 
 		return undefined;
@@ -597,7 +602,7 @@ export class Views implements Disposable {
 		await updateScmGroupedViewsInConfig(this._scmGroupedViews);
 
 		// Show the view after the configuration change has been applied
-		setTimeout(() => executeCoreCommand(`gitlens.views.${grouped ? 'scm.grouped' : type}.focus`), 1);
+		setTimeout(() => executeCoreCommand(getViewFocusCommand(`gitlens.views.${grouped ? 'scm.grouped' : type}`), 1));
 	}
 
 	private toggleScmViewVisibility(type: GroupableTreeViewTypes, visible: boolean) {
@@ -988,7 +993,7 @@ export class Views implements Disposable {
 			case 'workspaces':
 				return this.workspaces.show();
 			case 'scm.grouped':
-				return void executeCoreCommand(`gitlens.views.scm.grouped.focus`);
+				return void executeCoreCommand(getViewFocusCommand('gitlens.views.scm.grouped'));
 		}
 	}
 }

src/webviews/apps/plus/graph/graph-header.ts

@@ -760,7 +760,7 @@ export class GlGraphHeader extends SignalWatcher(LitElement) {
 						</gl-tooltip>
 						<gl-tooltip placement="bottom">
 							<a
-								href=${'command:gitlens.views.home.focus'}
+								href=${'command:gitlens.showHomeView'}
 								class="action-button"
 								aria-label=${`Open GitLens Home View`}
 							>

src/webviews/webviewController.ts

@@ -9,6 +9,7 @@ import { isCancellationError } from '../errors';
 import { getSubscriptionNextPaidPlanId } from '../plus/gk/utils/subscription.utils';
 import { executeCommand, executeCoreCommand } from '../system/-webview/command';
 import { setContext } from '../system/-webview/context';
+import { getViewFocusCommand } from '../system/-webview/vscode/views';
 import { getScopedCounter } from '../system/counter';
 import { debug, logName } from '../system/decorators/log';
 import { sequentialize } from '../system/decorators/serialize';
@@ -382,7 +383,7 @@ export class WebviewController<
 				);
 			}
 		} else if (this.is('view')) {
-			await executeCoreCommand(`${this.id}.focus`, options);
+			await executeCoreCommand(getViewFocusCommand(this.id), options);
 			if (loading) {
 				this.provider.onVisibilityChanged?.(true);
 			}

src/webviews/webviewsController.ts

@@ -14,6 +14,7 @@ import type { WebviewIds, WebviewTypes, WebviewViewIds, WebviewViewTypes } from
 import type { Container } from '../container';
 import { ensurePlusFeaturesEnabled } from '../plus/gk/utils/-webview/plus.utils';
 import { executeCoreCommand, registerCommand } from '../system/-webview/command';
+import { getViewFocusCommand } from '../system/-webview/vscode/views';
 import { debug } from '../system/decorators/log';
 import { find, first, map } from '../system/iterable';
 import { Logger } from '../system/logger';
@@ -255,7 +256,7 @@ export class WebviewsController implements Disposable {
 					await onBeforeShow?.(...args);
 				}
 
-				return void executeCoreCommand(`${descriptor.id}.focus`, options);
+				return void executeCoreCommand(getViewFocusCommand(descriptor.id), options);
 			},
 		} satisfies WebviewViewProxy<ID, ShowingArgs, SerializedState>;
 	}