Unsuccessful gf throws error

Author: J-Fields

src/actions/commands/actions.ts

@@ -1029,36 +1029,35 @@ class CommandOpenFile extends BaseCommand {
 
     const fileInfo = fullFilePath.match(/(.*?(?=:[0-9]+)|.*):?([0-9]*)$/);
     if (fileInfo) {
-      const fileUri = await (async () => {
-        if (path.isAbsolute(fileInfo[1])) {
-          return Uri.file(fileInfo[1]);
+      const fileUri: Uri = await (async () => {
+        const pathStr = fileInfo[1];
+        if (path.isAbsolute(pathStr)) {
+          return Uri.file(pathStr);
         } else {
-          let uri = Uri.file(path.resolve(path.dirname(vimState.document.uri.fsPath), fileInfo[1]));
+          let uri = Uri.file(path.resolve(path.dirname(vimState.document.uri.fsPath), pathStr));
           if (!(await doesFileExist(uri))) {
             const workspaceRoot = vscode.workspace.getWorkspaceFolder(vimState.document.uri)?.uri;
             if (workspaceRoot) {
-              uri = Uri.file(path.join(workspaceRoot.fsPath, fileInfo[1]));
+              uri = Uri.file(path.join(workspaceRoot.fsPath, pathStr));
               if (!(await doesFileExist(uri))) {
-                return undefined;
+                throw VimError.fromCode(ErrorCode.CantFindFileInPath, pathStr);
               }
             }
           }
           return uri;
         }
       })();
 
-      if (fileUri) {
-        const line = parseInt(fileInfo[2], 10);
-        const fileCommand = new FileCommand({
-          name: 'edit',
-          bang: false,
-          opt: [],
-          file: fileUri.fsPath,
-          cmd: isNaN(line) ? undefined : { type: 'line_number', line: line - 1 },
-          createFileIfNotExists: false,
-        });
-        void fileCommand.execute(vimState);
-      }
+      const line = parseInt(fileInfo[2], 10);
+      const fileCommand = new FileCommand({
+        name: 'edit',
+        bang: false,
+        opt: [],
+        file: fileUri.fsPath,
+        cmd: isNaN(line) ? undefined : { type: 'line_number', line: line - 1 },
+        createFileIfNotExists: false,
+      });
+      void fileCommand.execute(vimState);
     }
   }
 }

src/error.ts

@@ -30,6 +30,7 @@ export enum ErrorCode {
   SearchHitTop = 384,
   SearchHitBottom = 385,
   CannotCloseLastWindow = 444,
+  CantFindFileInPath = 447,
   ArgumentRequired = 471,
   InvalidArgument474 = 474,
   InvalidArgument475 = 475,
@@ -111,6 +112,7 @@ export const ErrorMessage: IErrorMessage = {
   384: 'Search hit TOP without match for',
   385: 'Search hit BOTTOM without match for',
   444: 'Cannot close last window',
+  447: 'Can\'t find file "{FILE_NAME}" in path',
   471: 'Argument required',
   474: 'Invalid argument',
   475: 'Invalid argument',
@@ -175,17 +177,23 @@ export class VimError extends Error {
   }
 
   static fromCode(code: ErrorCode, extraValue?: string): VimError {
-    if (ErrorMessage[code]) {
+    let message = ErrorMessage[code];
+    if (message) {
+      // TODO: Come up with a more elegant solution
       if (extraValue) {
         if (code === ErrorCode.NothingInRegister) {
           extraValue = ` ${extraValue}`;
         } else if (code === ErrorCode.NoMatchingBuffer || code === ErrorCode.MultipleMatches) {
           extraValue = ` for ${extraValue}`;
+        } else if (code === ErrorCode.CantFindFileInPath) {
+          message = message.replace('{FILE_NAME}', extraValue);
+          extraValue = '';
         } else {
           extraValue = `: ${extraValue}`;
         }
       }
-      return new VimError(code, ErrorMessage[code] + (extraValue ?? ''));
+
+      return new VimError(code, message + (extraValue ?? ''));
     }
 
     throw new Error('unknown error code: ' + code);