2 files changed, 42 insertions, 1 deletions
diff --git a/src/background/shared/completions/index.js b/src/background/shared/completions/index.js
index 77394bc..21c3dd2 100644
--- a/src/background/shared/completions/index.js
+++ b/src/background/shared/completions/index.js
@@ -88,6 +88,12 @@ const getCompletions = (line, settings) => {
     return getOpenCompletions(name, keywords, settings.search);
   case 'b':
   case 'buffer':
+  case 'bd':
+  case 'bdel':
+  case 'bdelete':
+  case 'bd!':
+  case 'bdel!':
+  case 'bdelete!':
   case 'bdeletes':
   case 'bdeletes!':
     return tabs.getCompletions(keywords).then((gotTabs) => {
diff --git a/src/background/shared/tabs.js b/src/background/shared/tabs.js
index c90ac4b..a9a677a 100644
--- a/src/background/shared/tabs.js
+++ b/src/background/shared/tabs.js
@@ -12,6 +12,40 @@ const closeTabForce = (id) => {
   return browser.tabs.remove(id);
 };
 
+const closeTabByKeywords = (keyword) => {
+  return browser.tabs.query({ currentWindow: true }).then((tabs) => {
+    let matched = tabs.filter((t) => {
+      return t.url.includes(keyword) || t.title.includes(keyword);
+    });
+
+    if (matched.length === 0) {
+      throw new Error('No matching buffer for ' + keyword);
+    } else if (matched.length > 1) {
+      throw new Error('More than one match for ' + keyword);
+    }
+    if (matched[0].pinned) {
+      throw new Error('Cannot close a pinned tab (add ! to override)');
+    }
+    browser.tabs.remove(matched[0].id);
+  });
+};
+
+const closeTabByKeywordsForce = (keyword) => {
+  return browser.tabs.query({ currentWindow: true }).then((tabs) => {
+    let matched = tabs.filter((t) => {
+      return t.url.includes(keyword) || t.title.includes(keyword);
+    });
+
+    if (matched.length === 0) {
+      throw new Error('No matching buffer for ' + keyword);
+    } else if (matched.length > 1) {
+      throw new Error('More than one match for ' + keyword);
+    }
+    browser.tabs.remove(matched[0].id);
+  });
+};
+
+
 const closeTabsByKeywords = (keyword) => {
   tabCompletions.getCompletions(keyword).then((tabs) => {
     let tabs2 = tabs.filter(tab => !tab.pinned);
@@ -134,7 +168,8 @@ const duplicate = (id) => {
 };
 
 export {
-  closeTab, closeTabForce, closeTabsByKeywords, closeTabsByKeywordsForce,
+  closeTab, closeTabForce, closeTabByKeywords, closeTabByKeywordsForce,
+  closeTabsByKeywords, closeTabsByKeywordsForce,
   reopenTab, selectAt, selectByKeyword,
   selectPrevTab, selectNextTab, selectFirstTab,
   selectLastTab, selectTab, reload, updateTabPinned,