diff options
author | Shin'ya Ueoka <ueokande@i-beam.org> | 2020-03-25 07:01:59 +0900 |
---|---|---|
committer | Shin'ya Ueoka <ueokande@i-beam.org> | 2020-03-25 07:01:59 +0900 |
commit | f7479c36ad0883455e511a86adf86e147ff4460a (patch) | |
tree | b70a44eda90615582a6f9f411db0eb736cdf3fe4 | |
parent | 6be2dabff6c35fb79d85ba39b692c5d06cd53125 (diff) |
Remove ! from commands
-rw-r--r-- | src/console/commandline/CommandParser.ts | 8 | ||||
-rw-r--r-- | src/shared/Command.ts | 2 | ||||
-rw-r--r-- | test/console/commandline/CommandParser.test.ts | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/src/console/commandline/CommandParser.ts b/src/console/commandline/CommandParser.ts index 5228c77..79ae8c8 100644 --- a/src/console/commandline/CommandParser.ts +++ b/src/console/commandline/CommandParser.ts @@ -8,6 +8,8 @@ export class UnknownCommandError extends Error { export default class CommandParser { parse(value: string): Command { + value = value.replace(/!$/, ""); + switch (value) { case 'o': case 'open': @@ -25,14 +27,8 @@ export default class CommandParser { case 'bdel': case 'bdelete': return Command.BufferDelete; - case 'bd!': - case 'bdel!': - case 'bdelete!': - return Command.BufferDeleteForce; case 'bdeletes': return Command.BuffersDelete; - case 'bdeletes!': - return Command.BuffersDeleteForce; case 'addbookmark': return Command.AddBookmark; case 'q': diff --git a/src/shared/Command.ts b/src/shared/Command.ts index e492f4a..cd2ed0a 100644 --- a/src/shared/Command.ts +++ b/src/shared/Command.ts @@ -4,9 +4,7 @@ export enum Command { WindowOpen = "winopen", Buffer = "buffer", BufferDelete = "bdelete", - BufferDeleteForce = "bdelete!", BuffersDelete = "bdeletes", - BuffersDeleteForce = "bdeletes!", AddBookmark = "addbookmark", Quit = "quit", QuitAll = "quitall", diff --git a/test/console/commandline/CommandParser.test.ts b/test/console/commandline/CommandParser.test.ts index 4ad78fd..129821a 100644 --- a/test/console/commandline/CommandParser.test.ts +++ b/test/console/commandline/CommandParser.test.ts @@ -8,7 +8,7 @@ describe("CommandParser", () => { const sut = new CommandParser(); expect(sut.parse("open")).to.equal(Command.Open); expect(sut.parse("w")).to.equal(Command.WindowOpen); - expect(sut.parse("bdelete!")).to.equal(Command.BufferDeleteForce); + expect(sut.parse("bdelete!")).to.equal(Command.BufferDelete); expect(() => sut.parse("harakiri")).to.throw(UnknownCommandError); }) }) |