Adds open folder to worktree error notification

Author: eamodio

src/commands/git/worktree.ts

@@ -1,9 +1,9 @@
 import type { MessageItem } from 'vscode';
-import { QuickInputButtons, Uri, window, workspace } from 'vscode';
+import { env, QuickInputButtons, Uri, window, workspace } from 'vscode';
 import type { Config } from '../../config';
 import type { Container } from '../../container';
 import { PlusFeatures } from '../../features';
-import { convertOpenFlagsToLocation, reveal, revealInFileExplorer } from '../../git/actions/worktree';
+import { convertOpenFlagsToLocation, reveal } from '../../git/actions/worktree';
 import {
 	WorktreeCreateError,
 	WorktreeCreateErrorReason,
@@ -23,7 +23,7 @@ import { createFlagsQuickPickItem } from '../../quickpicks/items/flags';
 import { configuration } from '../../system/configuration';
 import { basename, isDescendant } from '../../system/path';
 import { pluralize, truncateLeft } from '../../system/string';
-import { openWorkspace } from '../../system/utils';
+import { openWorkspace, revealInFileExplorer } from '../../system/utils';
 import type { ViewsWithRepositoryFolders } from '../../views/viewBase';
 import type {
 	AsyncStepResultGenerator,
@@ -469,12 +469,21 @@ export class WorktreeGitCommand extends QuickCommand<State> {
 						continue;
 					}
 				} else if (WorktreeCreateError.is(ex, WorktreeCreateErrorReason.AlreadyExists)) {
-					void window.showErrorMessage(
-						`Unable to create a new worktree in '${GitWorktree.getFriendlyPath(
-							uri,
-						)}' because the folder already exists and is not empty.`,
-						'OK',
-					);
+					const confirm: MessageItem = { title: 'OK' };
+					const openFolder: MessageItem = { title: 'Open Folder' };
+					void window
+						.showErrorMessage(
+							`Unable to create a new worktree in '${GitWorktree.getFriendlyPath(
+								uri,
+							)}' because the folder already exists and is not empty.`,
+							confirm,
+							openFolder,
+						)
+						.then(result => {
+							if (result === openFolder) {
+								void env.openExternal(uri);
+							}
+						});
 				} else {
 					void showGenericErrorMessage(
 						`Unable to create a new worktree in '${GitWorktree.getFriendlyPath(uri)}.`,
@@ -835,7 +844,7 @@ export class WorktreeGitCommand extends QuickCommand<State> {
 			if (worktree == null) break;
 
 			if (state.flags.includes('--reveal-explorer')) {
-				void revealInFileExplorer(worktree);
+				void revealInFileExplorer(worktree.uri);
 			} else {
 				openWorkspace(worktree.uri, { location: convertOpenFlagsToLocation(state.flags) });
 			}

src/git/actions/repository.ts

@@ -1,6 +1,5 @@
 import type { ResetGitCommandArgs } from '../../commands/git/reset';
 import { Container } from '../../container';
-import { executeCoreCommand } from '../../system/command';
 import type { ViewsWithRepositoryFolders } from '../../views/viewBase';
 import { executeGitCommand } from '../actions';
 import type { GitBranchReference, GitReference, GitRevisionReference } from '../models/reference';
@@ -83,7 +82,3 @@ export async function reveal(
 	}
 	return node;
 }
-
-export async function revealInFileExplorer(repo: Repository) {
-	void (await executeCoreCommand('revealFileInOS', repo.uri));
-}

src/git/actions/worktree.ts

@@ -2,7 +2,6 @@ import type { Uri } from 'vscode';
 import type { WorktreeGitCommandArgs } from '../../commands/git/worktree';
 import { Container } from '../../container';
 import { ensure } from '../../system/array';
-import { executeCoreCommand } from '../../system/command';
 import type { OpenWorkspaceLocation } from '../../system/utils';
 import { executeGitCommand } from '../actions';
 import type { GitReference } from '../models/reference';
@@ -65,10 +64,6 @@ export async function reveal(
 	return node;
 }
 
-export async function revealInFileExplorer(worktree: GitWorktree) {
-	void (await executeCoreCommand('revealFileInOS', worktree.uri));
-}
-
 type OpenFlagsArray = Extract<NonNullable<Required<WorktreeGitCommandArgs['state']>>, { subcommand: 'open' }>['flags'];
 
 export function convertLocationToOpenFlags(location: OpenWorkspaceLocation | undefined): OpenFlagsArray | undefined {

src/system/utils.ts

@@ -58,6 +58,25 @@ export function findOrOpenEditors(uris: Uri[]): void {
 	}
 }
 
+export function getEditorCommand() {
+	let editor;
+	switch (env.appName) {
+		case 'Visual Studio Code - Insiders':
+			editor = 'code-insiders --wait --reuse-window';
+			break;
+		case 'Visual Studio Code - Exploration':
+			editor = 'code-exploration --wait --reuse-window';
+			break;
+		case 'VSCodium':
+			editor = 'codium --wait --reuse-window';
+			break;
+		default:
+			editor = 'code --wait --reuse-window';
+			break;
+	}
+	return editor;
+}
+
 export function getEditorIfActive(document: TextDocument): TextEditor | undefined {
 	const editor = window.activeTextEditor;
 	return editor != null && editor.document === document ? editor : undefined;
@@ -180,23 +199,8 @@ export function openWorkspace(
 	});
 }
 
-export function getEditorCommand() {
-	let editor;
-	switch (env.appName) {
-		case 'Visual Studio Code - Insiders':
-			editor = 'code-insiders --wait --reuse-window';
-			break;
-		case 'Visual Studio Code - Exploration':
-			editor = 'code-exploration --wait --reuse-window';
-			break;
-		case 'VSCodium':
-			editor = 'codium --wait --reuse-window';
-			break;
-		default:
-			editor = 'code --wait --reuse-window';
-			break;
-	}
-	return editor;
+export async function revealInFileExplorer(uri: Uri) {
+	void (await executeCoreCommand('revealFileInOS', uri));
 }
 
 export function supportedInVSCodeVersion(feature: 'input-prompt-links') {

src/views/viewCommands.ts

@@ -36,7 +36,7 @@ import { setContext } from '../system/context';
 import { log } from '../system/decorators/log';
 import { sequentialize } from '../system/function';
 import type { OpenWorkspaceLocation } from '../system/utils';
-import { openWorkspace } from '../system/utils';
+import { openWorkspace, revealInFileExplorer } from '../system/utils';
 import { RepositoryFolderNode } from './nodes/abstract/repositoryFolderNode';
 import {
 	canEditNode,
@@ -781,14 +781,14 @@ export class ViewCommands {
 	private revealRepositoryInExplorer(node: RepositoryNode) {
 		if (!(node instanceof RepositoryNode)) return undefined;
 
-		return RepoActions.revealInFileExplorer(node.repo);
+		return revealInFileExplorer(node.repo.uri);
 	}
 
 	@log()
 	private revealWorktreeInExplorer(node: WorktreeNode) {
 		if (!(node instanceof WorktreeNode)) return undefined;
 
-		return WorktreeActions.revealInFileExplorer(node.worktree);
+		return revealInFileExplorer(node.worktree.uri);
 	}
 
 	@log()