Add bdlete/bdelete! commands
This commit is contained in:
parent
9b3d12eb31
commit
b91e53e5fe
3 changed files with 50 additions and 1 deletions
|
@ -84,6 +84,14 @@ const exec = (tab, line, settings) => {
|
||||||
case 'b':
|
case 'b':
|
||||||
case 'buffer':
|
case 'buffer':
|
||||||
return bufferCommand(args);
|
return bufferCommand(args);
|
||||||
|
case 'bd':
|
||||||
|
case 'bdel':
|
||||||
|
case 'bdelete':
|
||||||
|
return tabs.closeTabByKeywords(args.join(' '));
|
||||||
|
case 'bd!':
|
||||||
|
case 'bdel!':
|
||||||
|
case 'bdelete!':
|
||||||
|
return tabs.closeTabByKeywordsForce(args.join(' '));
|
||||||
case 'bdeletes':
|
case 'bdeletes':
|
||||||
return tabs.closeTabsByKeywords(args.join(' '));
|
return tabs.closeTabsByKeywords(args.join(' '));
|
||||||
case 'bdeletes!':
|
case 'bdeletes!':
|
||||||
|
|
|
@ -88,6 +88,12 @@ const getCompletions = (line, settings) => {
|
||||||
return getOpenCompletions(name, keywords, settings.search);
|
return getOpenCompletions(name, keywords, settings.search);
|
||||||
case 'b':
|
case 'b':
|
||||||
case 'buffer':
|
case 'buffer':
|
||||||
|
case 'bd':
|
||||||
|
case 'bdel':
|
||||||
|
case 'bdelete':
|
||||||
|
case 'bd!':
|
||||||
|
case 'bdel!':
|
||||||
|
case 'bdelete!':
|
||||||
case 'bdeletes':
|
case 'bdeletes':
|
||||||
case 'bdeletes!':
|
case 'bdeletes!':
|
||||||
return tabs.getCompletions(keywords).then((gotTabs) => {
|
return tabs.getCompletions(keywords).then((gotTabs) => {
|
||||||
|
|
|
@ -12,6 +12,40 @@ const closeTabForce = (id) => {
|
||||||
return browser.tabs.remove(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) => {
|
const closeTabsByKeywords = (keyword) => {
|
||||||
tabCompletions.getCompletions(keyword).then((tabs) => {
|
tabCompletions.getCompletions(keyword).then((tabs) => {
|
||||||
let tabs2 = tabs.filter(tab => !tab.pinned);
|
let tabs2 = tabs.filter(tab => !tab.pinned);
|
||||||
|
@ -134,7 +168,8 @@ const duplicate = (id) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
export {
|
export {
|
||||||
closeTab, closeTabForce, closeTabsByKeywords, closeTabsByKeywordsForce,
|
closeTab, closeTabForce, closeTabByKeywords, closeTabByKeywordsForce,
|
||||||
|
closeTabsByKeywords, closeTabsByKeywordsForce,
|
||||||
reopenTab, selectAt, selectByKeyword,
|
reopenTab, selectAt, selectByKeyword,
|
||||||
selectPrevTab, selectNextTab, selectFirstTab,
|
selectPrevTab, selectNextTab, selectFirstTab,
|
||||||
selectLastTab, selectTab, reload, updateTabPinned,
|
selectLastTab, selectTab, reload, updateTabPinned,
|
||||||
|
|
Reference in a new issue