From b96374b7ca2c5609da999cc60df4dc7938da8320 Mon Sep 17 00:00:00 2001 From: Alex Daily Date: Sat, 5 Nov 2022 22:51:45 +0100 Subject: [PATCH 1/7] wq and report msgs --- package.json | 1 + src/components/Vi.svelte | 12 ++++++++ src/lib/vi/index.ts | 3 ++ src/lib/vi/utils.ts | 62 +++++++++++++++++++++++++++++++--------- src/types/app.ts | 2 ++ yarn.lock | 2 +- 6 files changed, 67 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index caeb790..3a14d83 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "@testing-library/svelte": "^3.2.2", "@tsconfig/svelte": "^3.0.0", "@types/jest": "^29.2.0", + "@types/node": "^18.11.9", "@typescript-eslint/eslint-plugin": "^5.40.0", "@typescript-eslint/parser": "^5.40.0", "babel-jest": "^29.2.2", diff --git a/src/components/Vi.svelte b/src/components/Vi.svelte index 4a5f939..f3c9c71 100644 --- a/src/components/Vi.svelte +++ b/src/components/Vi.svelte @@ -5,6 +5,14 @@ width: 100%; } + .message { + position: fixed; + bottom: 28px; + width: 100%; + background-color: red; + color: white; + } + .buffer { display: block; } @@ -33,6 +41,7 @@ let { MODE, COMMAND_LINE, + MESSAGE, COORDS: { x, y }, BUFFER: { BUFFER_PRE, LINE, BUFFER_POST }, } = STATE as ViState @@ -51,6 +60,9 @@
{BUFFER_PRE.length + 2 + index} {line}
{/each} + {#if !!MESSAGE} +
{MESSAGE}
+ {/if}
{#if MODE === VI_MODE.COMMAND} : diff --git a/src/lib/vi/index.ts b/src/lib/vi/index.ts index dc6b4fe..c60bbcf 100644 --- a/src/lib/vi/index.ts +++ b/src/lib/vi/index.ts @@ -15,6 +15,8 @@ export const startVi = ({ STATE, args }: { STATE: ShellState; args: string[] }): MODE: VI_MODE.VISUAL, COMMAND_LINE: { ...EMPTY_LINE }, COORDS: { x: 0, y: 0 }, + MESSAGE: null, + REGISTERS: {}, } } @@ -27,6 +29,7 @@ export const viUp: KeyMapping = ({ e: KeyboardEvent STATE: ViState }) => { + STATE = { ...STATE, MESSAGE: null } switch (MODE) { case VI_MODE.COMMAND: return processCommandMode({ e, STATE }) diff --git a/src/lib/vi/utils.ts b/src/lib/vi/utils.ts index 67e2960..f6794f0 100644 --- a/src/lib/vi/utils.ts +++ b/src/lib/vi/utils.ts @@ -1,27 +1,61 @@ -import type { ViState } from '../../types' -import { write, separate } from '../../lib' -import { EMPTY_LINE, INITAL_STATE, bufferToFile } from '../../utils' +import type { Line, ViState } from '../../types' +import { write, stat } from '../fs' +import { separate } from '../path' +import { EMPTY_LINE, INITAL_STATE, bufferToFile, lineToString, EMPTY } from '../../utils' import { VI_MODE } from './constants' -// TODO own vi command parser -import { parseCmd } from '../sh/evaluate' +function parseCmd(input: Line) { + const commandTokens = lineToString(input).split(' ') + const cmd = commandTokens?.[0] ?? '' + const args = commandTokens.slice(1) + + const cmds = cmd.split('') + const override = cmds.includes('!') + + return { cmds, args, override } +} function writeFile({ args, STATE }: { args: string[]; STATE: ViState }): ViState { + let { FILE_NAME } = STATE + const { BUFFER } = STATE + FILE_NAME = FILE_NAME ?? args?.[0] + + if (!FILE_NAME) return report({ STATE, MESSAGE: 'No file name' }) + + write({ ...separate(FILE_NAME), obj: bufferToFile(BUFFER) }) + return { ...STATE, COMMAND_LINE: EMPTY_LINE, MODE: VI_MODE.VISUAL, FILE_NAME } +} + +function checkSaveStatus({ STATE }: { STATE: ViState }): boolean { const { FILE_NAME, BUFFER } = STATE - write({ ...separate(FILE_NAME ?? args[0] ?? 'temp'), obj: bufferToFile(BUFFER) }) - return { ...STATE, COMMAND_LINE: EMPTY_LINE, MODE: VI_MODE.VISUAL } + const { exists, obj } = stat(FILE_NAME) + const file = bufferToFile(BUFFER) + + return !exists ? file === EMPTY : obj === file +} + +function report({ STATE, MESSAGE }: { STATE: ViState; MESSAGE: string }) { + return { ...STATE, MESSAGE, COMMAND_LINE: EMPTY_LINE } } export function vimCommands(STATE: ViState) { const { COMMAND_LINE, OLD_COMMANDS } = STATE - const { cmd, args } = parseCmd(COMMAND_LINE) + const { cmds, args, override } = parseCmd(COMMAND_LINE) - switch (cmd ?? '') { - case 'q': + for (const cmd of cmds) { + if (cmd === 'w') { + STATE = writeFile({ args, STATE }) + continue + } + + if (cmd === 'q') { + if (!checkSaveStatus({ STATE }) && !override) { + return report({ STATE, MESSAGE: 'No write since last change' }) + } return { ...INITAL_STATE, OLD_COMMANDS } - case 'w': - return writeFile({ args, STATE }) - default: - return { ...STATE, COMMAND_LINE: EMPTY_LINE, MODE: VI_MODE.VISUAL } + } + + return { ...STATE, COMMAND_LINE: EMPTY_LINE, MODE: VI_MODE.VISUAL } } + return { ...STATE, COMMAND_LINE: EMPTY_LINE, MODE: VI_MODE.VISUAL } } diff --git a/src/types/app.ts b/src/types/app.ts index 67d66e6..8e05a75 100644 --- a/src/types/app.ts +++ b/src/types/app.ts @@ -58,4 +58,6 @@ export type ViState = BaseState & { } COORDS: { x: number; y: number } FILE_NAME: string | null + REGISTERS: Record + MESSAGE: string | null } diff --git a/yarn.lock b/yarn.lock index 6e168a5..6090be2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1504,7 +1504,7 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== -"@types/node@*": +"@types/node@*", "@types/node@^18.11.9": version "18.11.9" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4" integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg== From 676a34be9c877707433d9036128549adecb1b591 Mon Sep 17 00:00:00 2001 From: Alex Daily Date: Sat, 5 Nov 2022 22:56:12 +0100 Subject: [PATCH 2/7] update tests --- .../state/__snapshots__/vi.test.ts.snap | 24 +++++++++++++++++++ .../ui/__snapshots__/vi.test.ts.snap | 24 +++++++++---------- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/src/__tests__/state/__snapshots__/vi.test.ts.snap b/src/__tests__/state/__snapshots__/vi.test.ts.snap index b1484ee..bd0ef34 100644 --- a/src/__tests__/state/__snapshots__/vi.test.ts.snap +++ b/src/__tests__/state/__snapshots__/vi.test.ts.snap @@ -31,6 +31,7 @@ exports[`vii 1`] = ` "DOWN_MAPPING": [Function], "FILE_NAME": null, "HISTORY_INDEX": -1, + "MESSAGE": null, "MODE": 1, "NAME": 1, "OLD_COMMANDS": [ @@ -48,6 +49,7 @@ exports[`vii 1`] = ` }, ], "PWD": "/home/guest", + "REGISTERS": {}, "UP_MAPPING": [Function], "USER": "guest", } @@ -85,6 +87,7 @@ exports[`vii 1`] = ` "DOWN_MAPPING": [Function], "FILE_NAME": null, "HISTORY_INDEX": -1, + "MESSAGE": null, "MODE": 1, "NAME": 1, "OLD_COMMANDS": [ @@ -102,6 +105,7 @@ exports[`vii 1`] = ` }, ], "PWD": "/home/guest", + "REGISTERS": {}, "UP_MAPPING": [Function], "USER": "guest", } @@ -146,6 +150,7 @@ exports[`viiArrowUpArrowUpArrowUp 1`] "DOWN_MAPPING": [Function], "FILE_NAME": null, "HISTORY_INDEX": -1, + "MESSAGE": null, "MODE": 1, "NAME": 1, "OLD_COMMANDS": [ @@ -163,6 +168,7 @@ exports[`viiArrowUpArrowUpArrowUp 1`] }, ], "PWD": "/home/guest", + "REGISTERS": {}, "UP_MAPPING": [Function], "USER": "guest", } @@ -206,6 +212,7 @@ exports[`viiArrowUpArrowUpArrowUpArrow "DOWN_MAPPING": [Function], "FILE_NAME": null, "HISTORY_INDEX": -1, + "MESSAGE": null, "MODE": 1, "NAME": 1, "OLD_COMMANDS": [ @@ -223,6 +230,7 @@ exports[`viiArrowUpArrowUpArrowUpArrow }, ], "PWD": "/home/guest", + "REGISTERS": {}, "UP_MAPPING": [Function], "USER": "guest", } @@ -260,6 +268,7 @@ exports[`viihello 1`] = ` "DOWN_MAPPING": [Function], "FILE_NAME": null, "HISTORY_INDEX": -1, + "MESSAGE": null, "MODE": 1, "NAME": 1, "OLD_COMMANDS": [ @@ -277,6 +286,7 @@ exports[`viihello 1`] = ` }, ], "PWD": "/home/guest", + "REGISTERS": {}, "UP_MAPPING": [Function], "USER": "guest", } @@ -316,6 +326,7 @@ exports[`viihello world 1`] = ` "DOWN_MAPPING": [Function], "FILE_NAME": null, "HISTORY_INDEX": -1, + "MESSAGE": null, "MODE": 1, "NAME": 1, "OLD_COMMANDS": [ @@ -333,6 +344,7 @@ exports[`viihello world 1`] = ` }, ], "PWD": "/home/guest", + "REGISTERS": {}, "UP_MAPPING": [Function], "USER": "guest", } @@ -409,6 +421,7 @@ exports[`viihellohello worldArrowUp 1`] = ` "DOWN_MAPPING": [Function], "FILE_NAME": null, "HISTORY_INDEX": -1, + "MESSAGE": null, "MODE": 1, "NAME": 1, "OLD_COMMANDS": [ @@ -426,6 +439,7 @@ exports[`viihellohello worldArrowUp 1`] = ` }, ], "PWD": "/home/guest", + "REGISTERS": {}, "UP_MAPPING": [Function], "USER": "guest", } @@ -463,6 +477,7 @@ exports[`viihellohello worldArrowUpArrowDown 1`] = ` "DOWN_MAPPING": [Function], "FILE_NAME": null, "HISTORY_INDEX": -1, + "MESSAGE": null, "MODE": 1, "NAME": 1, "OLD_COMMANDS": [ @@ -480,6 +495,7 @@ exports[`viihellohello worldArrowUpArrowDown 1`] = ` }, ], "PWD": "/home/guest", + "REGISTERS": {}, "UP_MAPPING": [Function], "USER": "guest", } @@ -517,6 +533,7 @@ exports[`viihello 1`] = ` "DOWN_MAPPING": [Function], "FILE_NAME": null, "HISTORY_INDEX": -1, + "MESSAGE": null, "MODE": 1, "NAME": 1, "OLD_COMMANDS": [ @@ -534,6 +551,7 @@ exports[`viihello 1`] = ` }, ], "PWD": "/home/guest", + "REGISTERS": {}, "UP_MAPPING": [Function], "USER": "guest", } @@ -571,6 +589,7 @@ exports[`viihello\` 1`] = ` "DOWN_MAPPING": [Function], "FILE_NAME": null, "HISTORY_INDEX": -1, + "MESSAGE": null, "MODE": 0, "NAME": 1, "OLD_COMMANDS": [ @@ -588,6 +607,7 @@ exports[`viihello\` 1`] = ` }, ], "PWD": "/home/guest", + "REGISTERS": {}, "UP_MAPPING": [Function], "USER": "guest", } @@ -625,6 +645,7 @@ exports[`viihello\`:cmd 1`] = ` "DOWN_MAPPING": [Function], "FILE_NAME": null, "HISTORY_INDEX": -1, + "MESSAGE": null, "MODE": 2, "NAME": 1, "OLD_COMMANDS": [ @@ -642,6 +663,7 @@ exports[`viihello\`:cmd 1`] = ` }, ], "PWD": "/home/guest", + "REGISTERS": {}, "UP_MAPPING": [Function], "USER": "guest", } @@ -679,6 +701,7 @@ exports[`viihello\`:cmd 1`] = ` "DOWN_MAPPING": [Function], "FILE_NAME": null, "HISTORY_INDEX": -1, + "MESSAGE": null, "MODE": 2, "NAME": 1, "OLD_COMMANDS": [ @@ -696,6 +719,7 @@ exports[`viihello\`:cmd 1`] = ` }, ], "PWD": "/home/guest", + "REGISTERS": {}, "UP_MAPPING": [Function], "USER": "guest", } diff --git a/src/__tests__/ui/__snapshots__/vi.test.ts.snap b/src/__tests__/ui/__snapshots__/vi.test.ts.snap index 4ca6090..1bc422d 100644 --- a/src/__tests__/ui/__snapshots__/vi.test.ts.snap +++ b/src/__tests__/ui/__snapshots__/vi.test.ts.snap @@ -1,16 +1,16 @@ // Vitest Snapshot v1 -exports[`vii 1`] = `"
1
2
3 ㅤ
3,1
"`; +exports[`vii 1`] = `"
1
2
3 ㅤ
3,1
"`; -exports[`vii 1`] = `"
1 ㅤ
1,1
"`; +exports[`vii 1`] = `"
1 ㅤ
1,1
"`; -exports[`viiArrowUpArrowUpArrowUp 1`] = `"
1
2
3 ㅤ
4
5
6
3,1
"`; +exports[`viiArrowUpArrowUpArrowUp 1`] = `"
1
2
3 ㅤ
4
5
6
3,1
"`; -exports[`viiArrowUpArrowUpArrowUpArrowUpArrowUp 1`] = `"
1 ㅤ
2
3
4
5
6
1,1
"`; +exports[`viiArrowUpArrowUpArrowUpArrowUpArrowUp 1`] = `"
1 ㅤ
2
3
4
5
6
1,1
"`; -exports[`viihello 1`] = `"
1 helloㅤ
1,6
"`; +exports[`viihello 1`] = `"
1 helloㅤ
1,6
"`; -exports[`viihello world 1`] = `"
1 hello
2 ㅤworld
2,1
"`; +exports[`viihello world 1`] = `"
1 hello
2 ㅤworld
2,1
"`; exports[`viihello world\`:w out\`:q 1`] = ` "
guest@127.0.0.1:~/ @@ -18,14 +18,14 @@ exports[`viihello world\`:w out\`:q 1`] = ` $ _
" `; -exports[`viihellohello worldArrowUp 1`] = `"
1 helloㅤ
2 hello world
1,6
"`; +exports[`viihellohello worldArrowUp 1`] = `"
1 helloㅤ
2 hello world
1,6
"`; -exports[`viihellohello worldArrowUpArrowDown 1`] = `"
1 ㅤ world
1,1
"`; +exports[`viihellohello worldArrowUpArrowDown 1`] = `"
1 ㅤ world
1,1
"`; -exports[`viihello 1`] = `"
1 helloㅤ
1,6
"`; +exports[`viihello 1`] = `"
1 helloㅤ
1,6
"`; -exports[`viihello\` 1`] = `"
1 hello
1,5
"`; +exports[`viihello\` 1`] = `"
1 hello
1,5
"`; -exports[`viihello\`:cmd 1`] = `"
1 hello
: cmd_ 1,5
"`; +exports[`viihello\`:cmd 1`] = `"
1 hello
: cmd_ 1,5
"`; -exports[`viihello\`:cmd 1`] = `"
1 hello
: cmd_ 1,5
"`; +exports[`viihello\`:cmd 1`] = `"
1 hello
: cmd_ 1,5
"`; From 731028aa15fabee55d3785b1047100f3ba9ee0a9 Mon Sep 17 00:00:00 2001 From: Alex Daily Date: Sat, 5 Nov 2022 23:04:50 +0100 Subject: [PATCH 3/7] tests --- src/__tests__/cases.ts | 4 + .../state/__snapshots__/vi.test.ts.snap | 205 ++++++++++++++++++ .../ui/__snapshots__/vi.test.ts.snap | 12 + 3 files changed, 221 insertions(+) diff --git a/src/__tests__/cases.ts b/src/__tests__/cases.ts index f327789..91d1399 100644 --- a/src/__tests__/cases.ts +++ b/src/__tests__/cases.ts @@ -66,4 +66,8 @@ export const vi = [ [...ENTER_VI, 'i', ...fill(5, ENTER), ...fill(5, UP)], [...ENTER_VI, 'i', ...fill(5, ENTER), ...fill(3, BACK)], [...ENTER_VI, 'i', ...fill(5, ENTER), ...fill(5, BACK)], + [...ENTER_VI, 'i', ...'hello world'.split(''), '`', ':', 'w', ENTER], + [...ENTER_VI, 'i', ...'hello world'.split(''), '`', ':', ...'wq'.split(''), ENTER], + [...ENTER_VI, 'i', ...'hello world'.split(''), '`', ':', 'q', ENTER], + [...ENTER_VI, 'i', ...'hello world'.split(''), '`', ':', 'q', '!', ENTER], ] diff --git a/src/__tests__/state/__snapshots__/vi.test.ts.snap b/src/__tests__/state/__snapshots__/vi.test.ts.snap index bd0ef34..dae3b09 100644 --- a/src/__tests__/state/__snapshots__/vi.test.ts.snap +++ b/src/__tests__/state/__snapshots__/vi.test.ts.snap @@ -354,6 +354,99 @@ exports[`viihello world 2`] = `"{"home":{"guest":{".bashrc exports[`viihello world 3`] = `"{"PWD":"/home/guest","HOME":"/home/guest"}"`; +exports[`viihello world\`:q! 1`] = ` +{ + "COMMAND_LINE": { + "CARET": null, + "CARET_WIDTH": 1, + "EOL": true, + "POSTCARET": "", + "PRECARET": "", + }, + "CONTROL_DOWN": false, + "DOWN_MAPPING": [Function], + "HISTORY_INDEX": -1, + "NAME": 0, + "OLD_COMMANDS": [ + { + "COMMAND_LINE": { + "CARET": null, + "CARET_WIDTH": 1, + "EOL": true, + "POSTCARET": "", + "PRECARET": "vi", + }, + "PWD": "/home/guest", + "STDOUT": "", + "USER": "guest", + }, + ], + "PWD": "/home/guest", + "UP_MAPPING": [Function], + "USER": "guest", +} +`; + +exports[`viihello world\`:q! 2`] = `"{"home":{"guest":{".bashrc":"#!/usr/sh",".history":""},"root":{}}}"`; + +exports[`viihello world\`:q! 3`] = `"{"PWD":"/home/guest","HOME":"/home/guest"}"`; + +exports[`viihello world\`:q 1`] = ` +{ + "BUFFER": { + "BUFFER_POST": [], + "BUFFER_PRE": [], + "LINE": { + "CARET": "d", + "CARET_WIDTH": 1, + "EOL": false, + "POSTCARET": "", + "PRECARET": "hello worl", + }, + }, + "COMMAND_LINE": { + "CARET": null, + "CARET_WIDTH": 1, + "EOL": true, + "POSTCARET": "", + "PRECARET": "", + }, + "CONTROL_DOWN": false, + "COORDS": { + "x": 10, + "y": 0, + }, + "DOWN_MAPPING": [Function], + "FILE_NAME": null, + "HISTORY_INDEX": -1, + "MESSAGE": "No write since last change", + "MODE": 2, + "NAME": 1, + "OLD_COMMANDS": [ + { + "COMMAND_LINE": { + "CARET": null, + "CARET_WIDTH": 1, + "EOL": true, + "POSTCARET": "", + "PRECARET": "vi", + }, + "PWD": "/home/guest", + "STDOUT": "", + "USER": "guest", + }, + ], + "PWD": "/home/guest", + "REGISTERS": {}, + "UP_MAPPING": [Function], + "USER": "guest", +} +`; + +exports[`viihello world\`:q 2`] = `"{"home":{"guest":{".bashrc":"#!/usr/sh",".history":""},"root":{}}}"`; + +exports[`viihello world\`:q 3`] = `"{"PWD":"/home/guest","HOME":"/home/guest"}"`; + exports[`viihello world\`:w out\`:q 1`] = ` { "COMMAND_LINE": { @@ -391,6 +484,118 @@ exports[`viihello world\`:w out\`:q 2`] = `"{"home":{"guest exports[`viihello world\`:w out\`:q 3`] = `"{"PWD":"/home/guest","HOME":"/home/guest"}"`; +exports[`viihello world\`:w 1`] = ` +{ + "BUFFER": { + "BUFFER_POST": [], + "BUFFER_PRE": [], + "LINE": { + "CARET": "d", + "CARET_WIDTH": 1, + "EOL": false, + "POSTCARET": "", + "PRECARET": "hello worl", + }, + }, + "COMMAND_LINE": { + "CARET": null, + "CARET_WIDTH": 1, + "EOL": true, + "POSTCARET": "", + "PRECARET": "", + }, + "CONTROL_DOWN": false, + "COORDS": { + "x": 10, + "y": 0, + }, + "DOWN_MAPPING": [Function], + "FILE_NAME": null, + "HISTORY_INDEX": -1, + "MESSAGE": "No file name", + "MODE": 0, + "NAME": 1, + "OLD_COMMANDS": [ + { + "COMMAND_LINE": { + "CARET": null, + "CARET_WIDTH": 1, + "EOL": true, + "POSTCARET": "", + "PRECARET": "vi", + }, + "PWD": "/home/guest", + "STDOUT": "", + "USER": "guest", + }, + ], + "PWD": "/home/guest", + "REGISTERS": {}, + "UP_MAPPING": [Function], + "USER": "guest", +} +`; + +exports[`viihello world\`:w 2`] = `"{"home":{"guest":{".bashrc":"#!/usr/sh",".history":""},"root":{}}}"`; + +exports[`viihello world\`:w 3`] = `"{"PWD":"/home/guest","HOME":"/home/guest"}"`; + +exports[`viihello world\`:wq 1`] = ` +{ + "BUFFER": { + "BUFFER_POST": [], + "BUFFER_PRE": [], + "LINE": { + "CARET": "d", + "CARET_WIDTH": 1, + "EOL": false, + "POSTCARET": "", + "PRECARET": "hello worl", + }, + }, + "COMMAND_LINE": { + "CARET": null, + "CARET_WIDTH": 1, + "EOL": true, + "POSTCARET": "", + "PRECARET": "", + }, + "CONTROL_DOWN": false, + "COORDS": { + "x": 10, + "y": 0, + }, + "DOWN_MAPPING": [Function], + "FILE_NAME": null, + "HISTORY_INDEX": -1, + "MESSAGE": "No write since last change", + "MODE": 2, + "NAME": 1, + "OLD_COMMANDS": [ + { + "COMMAND_LINE": { + "CARET": null, + "CARET_WIDTH": 1, + "EOL": true, + "POSTCARET": "", + "PRECARET": "vi", + }, + "PWD": "/home/guest", + "STDOUT": "", + "USER": "guest", + }, + ], + "PWD": "/home/guest", + "REGISTERS": {}, + "UP_MAPPING": [Function], + "USER": "guest", +} +`; + +exports[`viihello world\`:wq 2`] = `"{"home":{"guest":{".bashrc":"#!/usr/sh",".history":""},"root":{}}}"`; + +exports[`viihello world\`:wq 3`] = `"{"PWD":"/home/guest","HOME":"/home/guest"}"`; + exports[`viihellohello worldArrowUp 1`] = ` { "BUFFER": { diff --git a/src/__tests__/ui/__snapshots__/vi.test.ts.snap b/src/__tests__/ui/__snapshots__/vi.test.ts.snap index 1bc422d..53a5ce6 100644 --- a/src/__tests__/ui/__snapshots__/vi.test.ts.snap +++ b/src/__tests__/ui/__snapshots__/vi.test.ts.snap @@ -12,12 +12,24 @@ exports[`viihello 1`] = `"
ihello world 1`] = `"
1 hello
2 ㅤworld
2,1
"`; +exports[`viihello world\`:q! 1`] = ` +"
guest@127.0.0.1:~/ + $ vi
guest@127.0.0.1:~/ + $ _
" +`; + +exports[`viihello world\`:q 1`] = `"
1 hello world
No write since last change
: _ 1,11
"`; + exports[`viihello world\`:w out\`:q 1`] = ` "
guest@127.0.0.1:~/ $ vi
guest@127.0.0.1:~/ $ _
" `; +exports[`viihello world\`:w 1`] = `"
1 hello world
No file name
1,11
"`; + +exports[`viihello world\`:wq 1`] = `"
1 hello world
No write since last change
: _ 1,11
"`; + exports[`viihellohello worldArrowUp 1`] = `"
1 helloㅤ
2 hello world
1,6
"`; exports[`viihellohello worldArrowUpArrowDown 1`] = `"
1 ㅤ world
1,1
"`; From 7ef96638fc2e2e61d2c2c25eb979cc1fad36907f Mon Sep 17 00:00:00 2001 From: Alex Daily Date: Sat, 5 Nov 2022 23:07:01 +0100 Subject: [PATCH 4/7] tests --- src/__tests__/cases.ts | 5 + .../state/__snapshots__/vi.test.ts.snap | 186 ++++++++++++++++++ .../ui/__snapshots__/vi.test.ts.snap | 16 ++ 3 files changed, 207 insertions(+) diff --git a/src/__tests__/cases.ts b/src/__tests__/cases.ts index 91d1399..ab8c04a 100644 --- a/src/__tests__/cases.ts +++ b/src/__tests__/cases.ts @@ -30,6 +30,7 @@ export const sh = [ ] const ENTER_VI = [...'vi'.split(''), ENTER] +const ENTER_VI_FILE = (file: string) => [...'vi '.split(''), ...file.split(''), ENTER] export const vi = [ [...ENTER_VI, 'i', ...'hello'.split('')], @@ -70,4 +71,8 @@ export const vi = [ [...ENTER_VI, 'i', ...'hello world'.split(''), '`', ':', ...'wq'.split(''), ENTER], [...ENTER_VI, 'i', ...'hello world'.split(''), '`', ':', 'q', ENTER], [...ENTER_VI, 'i', ...'hello world'.split(''), '`', ':', 'q', '!', ENTER], + [...ENTER_VI_FILE('test'), 'i', ...'hello world'.split(''), '`', ':', 'w', ENTER], + [...ENTER_VI_FILE('test'), 'i', ...'hello world'.split(''), '`', ':', ...'wq'.split(''), ENTER], + [...ENTER_VI_FILE('test'), 'i', ...'hello world'.split(''), '`', ':', 'q', ENTER], + [...ENTER_VI_FILE('test'), 'i', ...'hello world'.split(''), '`', ':', 'q', '!', ENTER], ] diff --git a/src/__tests__/state/__snapshots__/vi.test.ts.snap b/src/__tests__/state/__snapshots__/vi.test.ts.snap index dae3b09..0447a21 100644 --- a/src/__tests__/state/__snapshots__/vi.test.ts.snap +++ b/src/__tests__/state/__snapshots__/vi.test.ts.snap @@ -1,5 +1,191 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`vi testihello world\`:q! 1`] = ` +{ + "COMMAND_LINE": { + "CARET": null, + "CARET_WIDTH": 1, + "EOL": true, + "POSTCARET": "", + "PRECARET": "", + }, + "CONTROL_DOWN": false, + "DOWN_MAPPING": [Function], + "HISTORY_INDEX": -1, + "NAME": 0, + "OLD_COMMANDS": [ + { + "COMMAND_LINE": { + "CARET": null, + "CARET_WIDTH": 1, + "EOL": true, + "POSTCARET": "", + "PRECARET": "vi test", + }, + "PWD": "/home/guest", + "STDOUT": "", + "USER": "guest", + }, + ], + "PWD": "/home/guest", + "UP_MAPPING": [Function], + "USER": "guest", +} +`; + +exports[`vi testihello world\`:q! 2`] = `"{"home":{"guest":{".bashrc":"#!/usr/sh",".history":""},"root":{}}}"`; + +exports[`vi testihello world\`:q! 3`] = `"{"PWD":"/home/guest","HOME":"/home/guest"}"`; + +exports[`vi testihello world\`:q 1`] = ` +{ + "BUFFER": { + "BUFFER_POST": [], + "BUFFER_PRE": [], + "LINE": { + "CARET": "d", + "CARET_WIDTH": 1, + "EOL": false, + "POSTCARET": "", + "PRECARET": "hello worl", + }, + }, + "COMMAND_LINE": { + "CARET": null, + "CARET_WIDTH": 1, + "EOL": true, + "POSTCARET": "", + "PRECARET": "", + }, + "CONTROL_DOWN": false, + "COORDS": { + "x": 10, + "y": 0, + }, + "DOWN_MAPPING": [Function], + "FILE_NAME": "/home/guest/test", + "HISTORY_INDEX": -1, + "MESSAGE": "No write since last change", + "MODE": 2, + "NAME": 1, + "OLD_COMMANDS": [ + { + "COMMAND_LINE": { + "CARET": null, + "CARET_WIDTH": 1, + "EOL": true, + "POSTCARET": "", + "PRECARET": "vi test", + }, + "PWD": "/home/guest", + "STDOUT": "", + "USER": "guest", + }, + ], + "PWD": "/home/guest", + "REGISTERS": {}, + "UP_MAPPING": [Function], + "USER": "guest", +} +`; + +exports[`vi testihello world\`:q 2`] = `"{"home":{"guest":{".bashrc":"#!/usr/sh",".history":""},"root":{}}}"`; + +exports[`vi testihello world\`:q 3`] = `"{"PWD":"/home/guest","HOME":"/home/guest"}"`; + +exports[`vi testihello world\`:w 1`] = ` +{ + "BUFFER": { + "BUFFER_POST": [], + "BUFFER_PRE": [], + "LINE": { + "CARET": "d", + "CARET_WIDTH": 1, + "EOL": false, + "POSTCARET": "", + "PRECARET": "hello worl", + }, + }, + "COMMAND_LINE": { + "CARET": null, + "CARET_WIDTH": 1, + "EOL": true, + "POSTCARET": "", + "PRECARET": "", + }, + "CONTROL_DOWN": false, + "COORDS": { + "x": 10, + "y": 0, + }, + "DOWN_MAPPING": [Function], + "FILE_NAME": "/home/guest/test", + "HISTORY_INDEX": -1, + "MESSAGE": null, + "MODE": 0, + "NAME": 1, + "OLD_COMMANDS": [ + { + "COMMAND_LINE": { + "CARET": null, + "CARET_WIDTH": 1, + "EOL": true, + "POSTCARET": "", + "PRECARET": "vi test", + }, + "PWD": "/home/guest", + "STDOUT": "", + "USER": "guest", + }, + ], + "PWD": "/home/guest", + "REGISTERS": {}, + "UP_MAPPING": [Function], + "USER": "guest", +} +`; + +exports[`vi testihello world\`:w 2`] = `"{"home":{"guest":{".bashrc":"#!/usr/sh",".history":"","test":"hello world"},"root":{}}}"`; + +exports[`vi testihello world\`:w 3`] = `"{"PWD":"/home/guest","HOME":"/home/guest"}"`; + +exports[`vi testihello world\`:wq 1`] = ` +{ + "COMMAND_LINE": { + "CARET": null, + "CARET_WIDTH": 1, + "EOL": true, + "POSTCARET": "", + "PRECARET": "", + }, + "CONTROL_DOWN": false, + "DOWN_MAPPING": [Function], + "HISTORY_INDEX": -1, + "NAME": 0, + "OLD_COMMANDS": [ + { + "COMMAND_LINE": { + "CARET": null, + "CARET_WIDTH": 1, + "EOL": true, + "POSTCARET": "", + "PRECARET": "vi test", + }, + "PWD": "/home/guest", + "STDOUT": "", + "USER": "guest", + }, + ], + "PWD": "/home/guest", + "UP_MAPPING": [Function], + "USER": "guest", +} +`; + +exports[`vi testihello world\`:wq 2`] = `"{"home":{"guest":{".bashrc":"#!/usr/sh",".history":"","test":"hello world"},"root":{}}}"`; + +exports[`vi testihello world\`:wq 3`] = `"{"PWD":"/home/guest","HOME":"/home/guest"}"`; + exports[`vii 1`] = ` { "BUFFER": { diff --git a/src/__tests__/ui/__snapshots__/vi.test.ts.snap b/src/__tests__/ui/__snapshots__/vi.test.ts.snap index 53a5ce6..6f1bb13 100644 --- a/src/__tests__/ui/__snapshots__/vi.test.ts.snap +++ b/src/__tests__/ui/__snapshots__/vi.test.ts.snap @@ -1,5 +1,21 @@ // Vitest Snapshot v1 +exports[`vi testihello world\`:q! 1`] = ` +"
guest@127.0.0.1:~/ + $ vi test
guest@127.0.0.1:~/ + $ _
" +`; + +exports[`vi testihello world\`:q 1`] = `"
1 hello world
No write since last change
: _ 1,11
"`; + +exports[`vi testihello world\`:w 1`] = `"
1 hello world
1,11
"`; + +exports[`vi testihello world\`:wq 1`] = ` +"
guest@127.0.0.1:~/ + $ vi test
guest@127.0.0.1:~/ + $ _
" +`; + exports[`vii 1`] = `"
1
2
3 ㅤ
3,1
"`; exports[`vii 1`] = `"
1 ㅤ
1,1
"`; From 86ebed7952788cb33a7f73eb1f7e2adff148de26 Mon Sep 17 00:00:00 2001 From: Alex Daily Date: Sat, 5 Nov 2022 23:09:45 +0100 Subject: [PATCH 5/7] update todos --- src/lib/bin.ts | 4 ++-- src/lib/fs.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/bin.ts b/src/lib/bin.ts index 65ec254..064c6af 100644 --- a/src/lib/bin.ts +++ b/src/lib/bin.ts @@ -10,7 +10,7 @@ export const echo = (args: string[]) => { export const ls = (args: string[]) => { const dir = args?.[0] ?? EMPTY - // TODO multiple dirs + // TODO ls: handle multiple dirs const { exists, isDirectory, obj } = stat(dir) if (!exists) return `ls: cannot access '${dir}': No such file or directory` return isDirectory ? Object.keys(obj).join(' ') : dir.split('/').at(-1) @@ -18,7 +18,7 @@ export const ls = (args: string[]) => { export const cat = (args: string[]): string => { const file = args?.[0] ?? EMPTY - // TODO multiple files + // TODO cat: handle multiple files const { exists, isDirectory, obj } = stat(file) if (!exists) return `cat: cannot access '${file}': No such file or directory` return isDirectory ? `cat: ${file}: Is a directory` : (obj as string) diff --git a/src/lib/fs.ts b/src/lib/fs.ts index 8a32f47..5bae6c6 100644 --- a/src/lib/fs.ts +++ b/src/lib/fs.ts @@ -62,6 +62,7 @@ export function setEnv(key: string, value: string): void { } export function setFs(fs: Directory): void { + // TODO save with dir name as key and contents as value localStorage.setItem(FS, JSON.stringify(fs)) } From 8d109f06b6a17686e40cc04fd4d2100c0a129aac Mon Sep 17 00:00:00 2001 From: Alex Daily Date: Sat, 5 Nov 2022 23:13:01 +0100 Subject: [PATCH 6/7] todos --- src/lib/vi/visual.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/lib/vi/visual.ts b/src/lib/vi/visual.ts index 73639de..6527091 100644 --- a/src/lib/vi/visual.ts +++ b/src/lib/vi/visual.ts @@ -19,6 +19,25 @@ export const processVisualMode: KeyMapping = ({ e: { key }, STATE }) => { console.log({ MODE: 'COMMAND' }) return { ...STATE, MODE: VI_MODE.COMMAND } } + // TODO case '[0-9]': + case 'A': { // TODO + return STATE + } + case 'D': { // TODO + return STATE + } + case 'd': { // TODO + return STATE + } + case 'y': { // TODO + return STATE + } + case 'p': { // TODO + return STATE + } + case 'u': { // TODO + return STATE + } case 'a': { console.log({ MODE: 'INSERT' }) x += 1 From 8265a6bf57315d4845e4ee026aa32be9d851aa2b Mon Sep 17 00:00:00 2001 From: Alex Daily Date: Sat, 5 Nov 2022 23:41:01 +0100 Subject: [PATCH 7/7] wip --- src/lib/vi/visual.ts | 76 +++++++++++++++++++++++++++++++++++++------- src/types/app.ts | 2 +- 2 files changed, 66 insertions(+), 12 deletions(-) diff --git a/src/lib/vi/visual.ts b/src/lib/vi/visual.ts index 6527091..b175f1f 100644 --- a/src/lib/vi/visual.ts +++ b/src/lib/vi/visual.ts @@ -1,43 +1,97 @@ import type { KeyMapping, ViState } from '../../types' import { VI_MODE } from './constants' -import { EMPTY } from '../../utils' +import { EMPTY, lineToString } from '../../utils' import { pager } from './pager' +import { shiftDown } from '../shift' export const processVisualMode: KeyMapping = ({ e: { key }, STATE }) => { const { BUFFER, COORDS, COORDS: { y }, - BUFFER: { LINE }, + BUFFER: { LINE, BUFFER_POST }, } = STATE as ViState let { x } = COORDS const { PRECARET, CARET, POSTCARET } = LINE + const line = lineToString(LINE) switch (key) { case ':': { console.log({ MODE: 'COMMAND' }) return { ...STATE, MODE: VI_MODE.COMMAND } } - // TODO case '[0-9]': - case 'A': { // TODO - return STATE - } - case 'D': { // TODO + case 'O': + console.log({ MODE: 'INSERT' }) + return { + ...STATE, + ...shiftDown({ + BUFFER: { + ...BUFFER, + LINE: { ...LINE, CARET_WIDTH: 0 }, + BUFFER_POST: [EMPTY, ...BUFFER_POST], + }, + COORDS: { x: 0, y: y + 1 }, + }), + MODE: VI_MODE.INSERT, + } + case 'A': + console.log({ MODE: 'INSERT' }) + return { + ...STATE, + BUFFER: { + ...BUFFER, + LINE: { PRECARET: line, CARET: null, POSTCARET: EMPTY, CARET_WIDTH: 0, EOL: true }, + }, + COORDS: { x: line.length, y }, + MODE: VI_MODE.INSERT, + } + case '$': + return { + ...STATE, + BUFFER: { + ...BUFFER, + LINE: { PRECARET: line, CARET: null, POSTCARET: EMPTY, CARET_WIDTH: 1, EOL: true }, + }, + COORDS: { x: line.length, y }, + } + case '0': + return { + ...STATE, + BUFFER: { + ...BUFFER, + // TODO refactor shift methods and refactor weird state stuff to use them + LINE: { + PRECARET: EMPTY, + CARET: line?.[0] ?? null, + POSTCARET: line.slice(1), + CARET_WIDTH: 1, + EOL: !line.length, + }, + }, + COORDS: { x: 0, y }, + } + case 'D': { + // TODO return STATE } - case 'd': { // TODO + case 'd': { + // TODO return STATE } - case 'y': { // TODO + case 'y': { + // TODO return STATE } - case 'p': { // TODO + case 'p': { + // TODO return STATE } - case 'u': { // TODO + case 'u': { + // TODO return STATE } + // TODO case '[1-9]': case 'a': { console.log({ MODE: 'INSERT' }) x += 1 diff --git a/src/types/app.ts b/src/types/app.ts index 8e05a75..e1fd52c 100644 --- a/src/types/app.ts +++ b/src/types/app.ts @@ -58,6 +58,6 @@ export type ViState = BaseState & { } COORDS: { x: number; y: number } FILE_NAME: string | null - REGISTERS: Record + REGISTERS: Record MESSAGE: string | null }