Fix gf with a line number (#8708)

VSCodeVim · Nov 17, 2023 · 49dd3dc · 49dd3dc
1 parent 7c2d3de
commit 49dd3dc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/actions/commands/actions.ts b/src/actions/commands/actions.ts
@@ -1037,7 +1037,7 @@ class CommandOpenFile extends BaseCommand {
         bang: false,
         opt: [],
         file: filePath,
-        cmd: isNaN(line) ? undefined : { type: 'line_number', line },
+        cmd: isNaN(line) ? undefined : { type: 'line_number', line: line - 1 },
         createFileIfNotExists: false,
       });
       fileCommand.execute(vimState);

diff --git a/src/cmd_line/commands/file.ts b/src/cmd_line/commands/file.ts
@@ -52,7 +52,7 @@ type LegacyArgs = {
 };
 function getLegacyArgs(args: IFileCommandArguments): LegacyArgs {
   if (args.name === 'edit') {
-    return { file: args.file, bang: args.bang, createFileIfNotExists: true };
+    return { file: args.file, bang: args.bang, cmd: args.cmd, createFileIfNotExists: true };
   } else if (args.name === 'enew') {
     return { bang: args.bang, createFileIfNotExists: true };
   } else if (args.name === 'new') {
@@ -229,7 +229,7 @@ export class FileCommand extends ExCommand {
     }
 
     const doc = await vscode.workspace.openTextDocument(fileUri);
-    await vscode.window.showTextDocument(doc);
+    const editor = await vscode.window.showTextDocument(doc);
 
     const lineNumber =
       args.cmd?.type === 'line_number'
@@ -238,9 +238,10 @@ export class FileCommand extends ExCommand {
           ? vscode.window.activeTextEditor!.document.lineCount - 1
           : undefined;
     if (lineNumber !== undefined && lineNumber >= 0) {
-      vscode.window.activeTextEditor!.revealRange(
-        new vscode.Range(new vscode.Position(lineNumber, 0), new vscode.Position(lineNumber, 0)),
-      );
+      const pos = new vscode.Position(lineNumber, 0);
+      editor.selection = new vscode.Selection(pos, pos);
+      const range = new vscode.Range(pos, pos);
+      editor.revealRange(range);
     }
     await hidePreviousEditor();
   }