Macro #894
Macro #894
Conversation
| @@ -15,7 +15,7 @@ export enum RegisterMode { | |||
| }; | |||
|
|
|||
| export interface IRegisterContent { | |||
| text : string | string[]; | |||
| text : string | string[] | RecordedState; | |||
There was a problem hiding this comment.
Shouldn't it be RecordedState[]?
There was a problem hiding this comment.
I directly append each action to RecordedState.runActions so we don't necessarily need an array.
| @@ -70,7 +77,8 @@ export class Register { | |||
| }; | |||
| } | |||
|
|
|||
| public static putByKey(content: string | string[], register = '"', registerMode = RegisterMode.FigureItOutFromCurrentMode): void { | |||
| public static putByKey(content: string | string[] | RecordedState, register = '"', | |||
There was a problem hiding this comment.
We should probably do type RegisterContent = string | string[] | RecordedState at this point.
| @@ -611,6 +611,14 @@ class CommandInsertRegisterContent extends BaseCommand { | |||
|
|
|||
| if (register.text instanceof Array) { | |||
| text = (register.text as string []).join("\n"); | |||
| } else if (register.text instanceof RecordedState) { | |||
| vimState.recordedState.transformations.push({ | |||
There was a problem hiding this comment.
Can we just immediately produce the stringified macro right here instead of shipping it off to some text transformation thing? The transformations are supposed to only be when you're actually changing the content in the text editor.
There was a problem hiding this comment.
I was planing to do so but later on I found we are doing this way for dot command, which is similar to Macros. Besides, actually I do want to delegate back the real content change/ action execution back to modeHandler, any ideas to do so if we don't leverage transformations? I use transformations as a way of lazy execution.
There was a problem hiding this comment.
If we're actually performing a macro at this point, then we absolutely should use a transformation.
But it looked to me like we were just storing the content of the macro in a register, which doesn't require any text transformations.
There was a problem hiding this comment.
hmn, I agree. In this particular case, we just need to insert all the keystrokes.
There was a problem hiding this comment.
@johnfn just played with Vim again and found that running Ctrl-R {register} is actually performing the macro stored in {register}.
For example, you recored ab<BS>c<Esc> in register a, which represents Enter Insert Mode, insert b, backspace, insert c. Repeating this macro in Normal mode will just insert c and return back to Normal Mode. If you are in Insert Mode and run <C-r> a, what gets inserted is ac. The first a is translated to Insert a as it's Insert Mode and then perform all following keystrokes.
|
Change the code a little bit and fix several corner cases. @johnfn @jpoon @xconverge I think it's good to review then have it merged as I'm not a frequent Macro user so I'd like to have it released first and test in prod :) |
| @@ -84,4 +84,8 @@ export async function cleanUpWorkspace(): Promise<any> { | |||
| export function setTextEditorOptions(tabSize: number, insertSpaces: boolean): void { | |||
| Configuration.getInstance().tabstop = tabSize; | |||
| Configuration.getInstance().expandtab = insertSpaces; | |||
| let options = vscode.window.activeTextEditor.options; | |||
| options.tabSize = tabSize; | |||
There was a problem hiding this comment.
This should be moved once we can really update Code's configuration through API, which relies on #913. So for now we still have to update the cache option in active text editor.
|
This is awesome! |
Yay! We love PRs! 🎊
Please include a description of your change and ensure:
gulp)Instead of tracking keystrokes, we track the translation of keystrokes, which are actions or document changes.