Add next command functionality

gulpfile.js

@@ -158,3 +158,4 @@ gulp.task(
   ),
 );
 gulp.task('default', shell.task('yarn build-dev'));
+gulp.task('build-dev', shell.task('yarn build-dev'));

src/cmd_line/commands/tab.ts

@@ -44,6 +44,7 @@ export type ITabCommandArguments =
       bang: boolean;
       cmd?: FileCmd;
       count?: number;
+      file?: string;
     }
   | {
       type: TabCommandType.Close | TabCommandType.Only;
@@ -126,6 +127,14 @@ export class TabCommand extends ExCommand {
         file,
       });
     }),
+    next: seq(
+      bangParser,
+      optWhitespace.then(alt<number | string>(numberParser, fileNameParser)).fallback(undefined),
+    ).map(([bang, arg]) => {
+      const count = typeof arg === 'number' ? arg : undefined;
+      const file = typeof arg === 'string' ? arg : undefined;
+      return new TabCommand({ type: TabCommandType.Next, bang, count, file });
+    }),
     tabmove: optWhitespace
       .then(
         seq(
@@ -180,6 +189,37 @@ export class TabCommand extends ExCommand {
         }
         break;
       case TabCommandType.Next:
+        if (this.arguments.file) {
+          const isAbsolute = path.isAbsolute(this.arguments.file);
+          const currentFilePath = vscode.window.activeTextEditor!.document.uri.fsPath;
+          const isInWorkspace =
+            vscode.workspace.workspaceFolders !== undefined &&
+            vscode.workspace.workspaceFolders.length > 0;
+
+          let toOpenPath: string;
+          if (isAbsolute) {
+            toOpenPath = this.arguments.file;
+          } else if (isInWorkspace) {
+            const workspacePath = vscode.workspace.workspaceFolders![0].uri.path;
+            if (currentFilePath.startsWith(workspacePath)) {
+              toOpenPath = path.join(path.dirname(currentFilePath), this.arguments.file);
+            } else {
+              toOpenPath = path.join(workspacePath, this.arguments.file);
+            }
+          } else {
+            toOpenPath = path.join(path.dirname(currentFilePath), this.arguments.file);
+          }
+
+          let uri = vscode.Uri.file(toOpenPath);
+          try {
+            await vscode.workspace.fs.stat(uri);
+          } catch {
+            uri = uri.with({ scheme: 'untitled' });
+          }
+          await vscode.commands.executeCommand('vscode.open', uri);
+          break;
+        }
+
         if (this.arguments.count !== undefined && this.arguments.count <= 0) {
           break;
         }

src/vimscript/exCommandParser.ts

@@ -369,7 +369,7 @@ export const builtinExCommands: ReadonlyArray<[[string, string], ArgParser | und
   [['mkv', 'imrc'], undefined],
   [['mkvie', 'w'], undefined],
   [['mod', 'e'], undefined],
-  [['n', 'ext'], undefined],
+  [['n', 'ext'], TabCommand.argParsers.next],
   [['new', ''], FileCommand.argParsers.new],
   [['nm', 'ap'], undefined],
   [['nmapc', 'lear'], undefined],

test/index.ts

@@ -9,7 +9,7 @@
 // host can call to run the tests. The test runner is expected to use console.log
 // to report the results back to the caller. When the tests are finished, return
 // a possible error to the callback or null if none.
-import glob from 'glob';
+import { glob } from 'glob';
 import Mocha from 'mocha';
 import * as path from 'path';
 
@@ -19,7 +19,7 @@ import { Configuration } from './testConfiguration';
 Globals.isTesting = true;
 Globals.mockConfiguration = new Configuration();
 
-export function run(): Promise<void> {
+export async function run(): Promise<void> {
   const mochaGrep = new RegExp(process.env.MOCHA_GREP || '');
 
   // Create the mocha test
@@ -32,28 +32,24 @@ export function run(): Promise<void> {
 
   const testsRoot = path.resolve(__dirname, '.');
 
+  const files = await glob('**/**.test.js', { cwd: testsRoot });
+
+  // Add files to the test suite
+  files.forEach((f) => mocha.addFile(path.resolve(testsRoot, f)));
+
   return new Promise((c, e) => {
-    glob('**/**.test.js', { cwd: testsRoot }, (err, files) => {
-      if (err) {
-        return e(err);
-      }
-
-      // Add files to the test suite
-      files.forEach((f) => mocha.addFile(path.resolve(testsRoot, f)));
-
-      try {
-        // Run the mocha test
-        mocha.run((failures) => {
-          if (failures > 0) {
-            e(new Error(`${failures} tests failed.`));
-          } else {
-            c();
-          }
-        });
-      } catch (error) {
-        console.error(error);
-        e(error as Error);
-      }
-    });
+    try {
+      // Run the mocha test
+      mocha.run((failures) => {
+        if (failures > 0) {
+          e(new Error(`${failures} tests failed.`));
+        } else {
+          c();
+        }
+      });
+    } catch (error) {
+      console.error(error);
+      e(error as Error);
+    }
   });
 }

tsconfig.json

@@ -12,9 +12,9 @@
     "strict": true,
     "useUnknownInCatchVariables": false,
     "experimentalDecorators": true,
-    "baseUrl": ".",
     "paths": {
-      "platform/*": ["src/platform/node/*"]
+      "platform/*": ["./src/platform/node/*"],
+      "src/*": ["./src/*"]
     },
     "resolveJsonModule": true,
     "forceConsistentCasingInFileNames": true,