Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-26 09:33:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2930 from JParisFerrer/vim_tab_switching

Browse Source 
Add tab switching support to vim mode
This commit is contained in:
hydroflame 2022-03-10 21:45:14 -05:00 committed by GitHub
commit 9372eef691
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/ScriptEditor/ui/ScriptEditorRoot.tsx
View File

@ -205,6 +205,32 @@ export function Root(props: IProps): React.ReactElement {
save(); save();
props.router.toTerminal(); props.router.toTerminal();
}); });
// Setup "go to next tab" and "go to previous tab". This is a little more involved
// since these aren't Ex commands (they run in normal mode, not after typing `:`)
MonacoVim.VimMode.Vim.defineAction("nextTabs", function (_cm: any, args: {repeat?: number}, _vim: any) {
const nTabs = args.repeat ?? 1;
// Go to the next tab (to the right). Wraps around when at the rightmost tab
const currIndex = currentTabIndex();
if (currIndex !== undefined) {
const nextIndex = (currIndex + nTabs) % openScripts.length;
onTabClick(nextIndex);
}
});
MonacoVim.VimMode.Vim.defineAction("prevTabs", function (_cm: any, args: {repeat?: number}, _vim: any) {
const nTabs = args.repeat ?? 1;
// Go to the previous tab (to the left). Wraps around when at the leftmost tab
const currIndex = currentTabIndex();
if (currIndex !== undefined) {
let nextIndex = (currIndex - nTabs);
while (nextIndex < 0) {
nextIndex += openScripts.length;
}
onTabClick(nextIndex);
}
});
MonacoVim.VimMode.Vim.mapCommand("gt", "action", "nextTabs", {}, {context: "normal"});
MonacoVim.VimMode.Vim.mapCommand("gT", "action", "prevTabs", {}, {context: "normal"});
editor.focus(); editor.focus();
}); });
} catch { } } catch { }
@ -604,16 +630,26 @@ export function Root(props: IProps): React.ReactElement {
openScripts = items; openScripts = items;
} }
function currentTabIndex(): number | undefined {
if (currentScript !== null) {
return openScripts.findIndex(
(script) =>
currentScript !== null &&
script.fileName === currentScript.fileName &&
script.hostname === currentScript.hostname,
);
}
return undefined;
}
function onTabClick(index: number): void { function onTabClick(index: number): void {
if (currentScript !== null) { if (currentScript !== null) {
// Save currentScript to openScripts // Save currentScript to openScripts
const curIndex = openScripts.findIndex( const curIndex = currentTabIndex();
(script) => if (curIndex !== undefined) {
currentScript !== null && openScripts[curIndex] = currentScript;
script.fileName === currentScript.fileName && }
script.hostname === currentScript.hostname,
);
openScripts[curIndex] = currentScript;
} }
currentScript = { ...openScripts[index] }; currentScript = { ...openScripts[index] };