Fix a few bugs with :bd[elete]

- Implement `:bd {bufname}`
- Fix with high index
- Fix error handling

Author: J-Fields

src/cmd_line/commands/bufferDelete.ts

@@ -6,6 +6,8 @@ import { VimState } from '../../state/vimState';
 import { StatusBar } from '../../statusBar';
 import { ExCommand } from '../../vimscript/exCommand';
 import { bangParser, fileNameParser, numberParser } from '../../vimscript/parserUtils';
+import { find } from 'lodash';
+import { findTabInActiveTabGroup } from '../../util/util';
 
 interface IBufferDeleteCommandArguments {
   bang: boolean;
@@ -33,28 +35,37 @@ export class BufferDeleteCommand extends ExCommand {
       throw VimError.NoWriteSinceLastChange();
     }
 
+    let deletedBuffers = 0;
+
     if (this.arguments.buffers.length === 0) {
       await vscode.commands.executeCommand('workbench.action.closeActiveEditor');
     } else {
-      for (const buffer of this.arguments.buffers) {
+      for (let buffer of this.arguments.buffers) {
         if (typeof buffer === 'string') {
-          // TODO
-          StatusBar.setText(
-            vimState,
-            ':bd[elete][!] {bufname} is not yet implemented (PRs are welcome!)',
-            true,
-          );
+          const [idx, tab] = findTabInActiveTabGroup(buffer);
+          buffer = idx + 1;
+        }
+
+        if (buffer < 1) {
+          throw VimError.PositiveCountRequired();
+        }
+        if (buffer > vscode.window.tabGroups.activeTabGroup.tabs.length) {
           continue;
         }
 
         try {
-          await vscode.commands.executeCommand(`workbench.action.openEditorAtIndex${buffer}`);
+          await vscode.commands.executeCommand('workbench.action.openEditorAtIndex', buffer - 1);
         } catch (e) {
-          throw VimError.NoBuffersDeleted();
+          continue;
         }
 
         await vscode.commands.executeCommand('workbench.action.closeActiveEditor');
+        ++deletedBuffers;
       }
     }
+
+    if (deletedBuffers === 0) {
+      throw VimError.NoBuffersDeleted();
+    }
   }
 }

src/cmd_line/commands/tab.ts

@@ -14,6 +14,7 @@ import {
   numberParser,
 } from '../../vimscript/parserUtils';
 import { VimError } from '../../error';
+import { findTabInActiveTabGroup } from '../../util/util';
 
 export enum TabCommandType {
   Next,
@@ -171,23 +172,7 @@ export class TabCommand extends ExCommand {
             this.arguments.buf - 1,
           );
         } else if (this.arguments.buf !== undefined && typeof this.arguments.buf === 'string') {
-          const tabGroup = vscode.window.tabGroups.activeTabGroup;
-          const searchTerm = this.arguments.buf;
-          const foundBuffers = [];
-          for (const t of tabGroup.tabs) {
-            if (t.label.includes(searchTerm)) {
-              foundBuffers.push(t);
-            }
-            if (foundBuffers.length > 1) {
-              break;
-            }
-          }
-          if (foundBuffers.length === 0) {
-            throw VimError.NoMatchingBuffer(searchTerm);
-          } else if (foundBuffers.length > 1) {
-            throw VimError.MultipleMatches(searchTerm);
-          }
-          const tab = foundBuffers[0];
+          const [idx, tab] = findTabInActiveTabGroup(this.arguments.buf);
           if ((tab.input as vscode.TextDocument).uri !== undefined) {
             const uri = (tab.input as vscode.TextDocument).uri;
             await vscode.commands.executeCommand('vscode.open', uri);

src/error.ts

@@ -85,6 +85,7 @@ export enum ErrorCode {
   MaxDepthMustBeANonNegativeNumber = 900,
   ExpectedADict = 922,
   SecondArgumentOfFunction = 923,
+  PositiveCountRequired = 939,
   BlobLiteralShouldHaveAnEvenNumberOfHexCharacters = 973,
   UsingABlobAsANumber = 974,
   CanOnlyCompareBlobWithBlob = 977,
@@ -423,6 +424,9 @@ export class VimError extends Error {
       'Second argument of function() must be a list or a dict',
     );
   }
+  static PositiveCountRequired(): VimError {
+    return new VimError(ErrorCode.PositiveCountRequired, 'Positive count required');
+  }
   static BlobLiteralShouldHaveAnEvenNumberOfHexCharacters(): VimError {
     return new VimError(
       ErrorCode.BlobLiteralShouldHaveAnEvenNumberOfHexCharacters,

src/util/util.ts

@@ -1,6 +1,7 @@
 import * as vscode from 'vscode';
 import { Cursor } from '../common/motion/cursor';
 import { VimState } from '../state/vimState';
+import { VimError } from '../error';
 
 /**
  * We used to have an issue where we would do something like execute a VSCode
@@ -46,3 +47,21 @@ export function isHighSurrogate(charCode: number): boolean {
 export function isLowSurrogate(charCode: number): boolean {
   return 0xdc00 <= charCode && charCode <= 0xdfff;
 }
+
+export function findTabInActiveTabGroup(name: string): [number, vscode.Tab] {
+  const foundBuffers: Array<[number, vscode.Tab]> = [];
+  const tabs = vscode.window.tabGroups.activeTabGroup.tabs;
+  for (let t = 0; t < tabs.length; t++) {
+    const tab = tabs[t];
+    if (tab.label.includes(name)) {
+      foundBuffers.push([t, tab]);
+      if (foundBuffers.length > 1) {
+        throw VimError.MultipleMatches(name);
+      }
+    }
+  }
+  if (foundBuffers.length === 0) {
+    throw VimError.NoMatchingBuffer(name);
+  }
+  return foundBuffers[0];
+}