Improves rebase editor openning in correct window

Fixes not handling an empty rebase HEAD correctly

Author: eamodio

src/env/node/git/sub-providers/operations.ts

@@ -308,7 +308,7 @@ export class OperationsGitSubProvider implements GitOperationsSubProvider {
 		if (options?.interactive) {
 			args.push('--interactive');
 
-			const editor = await getHostEditorCommand();
+			const editor = await getHostEditorCommand(true);
 			configs = ['-c', `sequence.editor=${editor}`];
 		}
 

src/env/node/git/sub-providers/pausedOperations.ts

@@ -256,7 +256,7 @@ export class PausedOperationsGitSubProvider implements GitPausedOperationsSubPro
 					}
 
 					const [mergeBaseResult, branchTipsResult, tagTipsResult] = await Promise.allSettled([
-						rebaseHead != null
+						rebaseHead
 							? this.provider.refs.getMergeBase(repoPath, rebaseHead, 'HEAD', undefined, cancellation)
 							: this.provider.refs.getMergeBase(repoPath, onto, origHead, undefined, cancellation),
 						this.provider.branches.getBranchesWithCommits(
@@ -318,13 +318,12 @@ export class PausedOperationsGitSubProvider implements GitPausedOperationsSubPro
 						steps: {
 							current: {
 								number: getSettledValue(stepsNumberResult) ?? 0,
-								commit:
-									rebaseHead != null
-										? createReference(rebaseHead, repoPath, {
-												refType: 'revision',
-												message: getSettledValue(stepsMessageResult),
-											})
-										: undefined,
+								commit: rebaseHead
+									? createReference(rebaseHead, repoPath, {
+											refType: 'revision',
+											message: getSettledValue(stepsMessageResult),
+										})
+									: undefined,
 							},
 							total: getSettledValue(stepsTotalResult) ?? 0,
 						},

src/system/-webview/vscode.ts

@@ -101,8 +101,15 @@ export async function getHostExecutablePath(): Promise<string> {
 	return _hostExecutablePath;
 }
 
-export async function getHostEditorCommand(): Promise<string> {
+export async function getHostEditorCommand(includeWorkspaceUri: boolean = false): Promise<string> {
 	const path = normalizePath(await getHostExecutablePath()).replace(/ /g, '\\ ');
+	if (includeWorkspaceUri) {
+		const uri = workspace.workspaceFile ?? workspace.workspaceFolders?.[0]?.uri;
+		if (uri != null) {
+			return `${path} --wait --reuse-window --folder-uri="${uri.toString()}"`;
+		}
+	}
+
 	return `${path} --wait --reuse-window`;
 }