:bd[elete] suppresses unsaved changes warning

Author: J-Fields

src/cmd_line/commands/bufferDelete.ts

@@ -3,10 +3,8 @@ import * as vscode from 'vscode';
 
 import { VimError } from '../../error';
 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 {
@@ -35,37 +33,47 @@ export class BufferDeleteCommand extends ExCommand {
       throw VimError.NoWriteSinceLastChange();
     }
 
+    const activeBuffer =
+      vscode.window.tabGroups.activeTabGroup.tabs.findIndex((t) => t.isActive) + 1;
+    if (this.arguments.buffers.length === 0) {
+      this.arguments.buffers = [activeBuffer];
+    }
+
     let deletedBuffers = 0;
 
-    if (this.arguments.buffers.length === 0) {
-      await vscode.commands.executeCommand('workbench.action.closeActiveEditor');
-    } else {
-      for (let buffer of this.arguments.buffers) {
-        if (typeof buffer === 'string') {
-          const [idx, tab] = findTabInActiveTabGroup(buffer);
-          buffer = idx + 1;
-        }
+    for (let buffer of this.arguments.buffers) {
+      if (typeof buffer === 'string') {
+        const [idx, tab] = findTabInActiveTabGroup(buffer);
+        buffer = idx + 1;
+      }
 
-        if (buffer < 1) {
-          throw VimError.PositiveCountRequired();
-        }
-        if (buffer > vscode.window.tabGroups.activeTabGroup.tabs.length) {
-          continue;
-        }
+      if (buffer < 1) {
+        throw VimError.PositiveCountRequired();
+      }
+      if (buffer > vscode.window.tabGroups.activeTabGroup.tabs.length) {
+        continue;
+      }
 
+      if (buffer !== activeBuffer) {
         try {
           await vscode.commands.executeCommand('workbench.action.openEditorAtIndex', buffer - 1);
         } catch (e) {
           continue;
         }
+      }
 
+      if (this.arguments.bang) {
+        await vscode.commands.executeCommand('workbench.action.revertAndCloseActiveEditor');
+      } else {
         await vscode.commands.executeCommand('workbench.action.closeActiveEditor');
-        ++deletedBuffers;
       }
+      ++deletedBuffers;
     }
 
     if (deletedBuffers === 0) {
       throw VimError.NoBuffersDeleted();
     }
   }
+
+  // TODO: executeWithRange
 }