Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor commands [WIP] #234

Merged
merged 57 commits into from
Jun 5, 2016
Merged

Refactor commands [WIP] #234

merged 57 commits into from
Jun 5, 2016

Conversation

johnfn
Copy link
Member

@johnfn johnfn commented May 29, 2016 •
edited
Loading

Stuff I did:

  • Add a class for every action
  • Make 3 base types of actions: movements (e.g. h), operators (e.g. d) and commands (e.g. i). There may be more? I'm not sure.
  • Completely rewrite the core processing function. For example (it can't do all this yet, but the infrastructure is there) if you type 5"pdw, it'll gather:
  • * That it's going to happen 5 times
  • * It's going into the p register
  • * It's a delete operation
  • * Then it sees the w and does the whole thing.
  • Handle commands like dw, y} - commands that spell out an operation and a movement to do it over - in a unified manner rather than special casing all of them.
  • Instead of special casing commands that make you switch between modes, they're now just command actions and they work like anything else.
  • Remove CharacterWiseInclusive/Exclusive. We instead handle that stuff in the mode-specific processing in modeHandler.
  • Make aw and iw movements work as arguments to d, y and c.

jpoon
jpoon reviewed May 29, 2016
View reviewed changes
src/actions/actions.ts
Actions.allActions.push(new action());
}

@RegisterAction
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oohh! neat, didn't know TS/JS had this.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it's really snazzy. Unfortunately I'm running into some annoying bugs where depending on compile order things might not work, so I might have to remove it...

johnfn added 25 commits May 29, 2016 15:07
@johnfn
Refactor actions to return positions.
7675cb6
@johnfn
Refactor Normal & Visual mode to use same actions
bf5c42e
@johnfn
Rewrite modes to take Actions, not key presses.
7d15fff
@johnfn
Make operators inherit from a common base class.
ee15155
@johnfn
Track action state in ModeHandler and write core processing fn.
409822f
@johnfn
Remove a bunch of stuff.
a6d01bd 
This new abstraction handles motions like dw by default! Woo!
@johnfn
Respect modes for actions.
c6db2d5
@johnfn
Make all state transitions into Actions.
0b52969
@johnfn
Clean up, fix <esc>.
06ae75f
@johnfn
Add x/X actions.
3f2df04
@johnfn
Handle a lot of weird edge cases.
e0eb20c
@johnfn
Add a special case JUST for de.
97c615c 
I'm sure there are other things that need to be special cased. But I
don't know what they are, yet.
@johnfn
Add C.
8fe79c9
@johnfn
Shove everything in one massive class.
b87a41a 
TypeScript was having some issues with files with circular dependencies.
@johnfn
Fix cw.
f6d90dd
@johnfn
Fix cW as well.
bc8d0fe
@johnfn
Pass all [operator][motion] normal mode tests!
5bde23c
@johnfn
Begin adding/rewriting visual mode tests.
c3683f0
@johnfn
Fix all visual mode tests!
8a6c826
@johnfn
Fix a bug with deleting in Visual Mode.
0fce025
@johnfn
Fix gg, and refactor some logic along the way.
da30a64
@johnfn
Add test for gg.
e84f583
@johnfn
Refactor a lot of deletes to use DeleteOperator.
beef8a6 
This cleans up a lot of edge cases and small bugs nicely!
@johnfn
Make DeleteOperator inclusive/exclusive.
87a3d99
@johnfn
Remove an unused function.
8019bbe
johnfn added 17 commits June 2, 2016 11:04
@johnfn
Nest ActionState within VimState.
4982f4b
@johnfn
Nest ActionState within VimState and return VimState from actions.
1114f9b
@johnfn
Don't pass ActionState, only VimState.
9e055d6
@johnfn
Refactor the 'ready to run' logic.
a6c2144
@johnfn
Fix dl at end of line and add test.
af00ab7
@johnfn
Add commands like $ force desiredColumn to EOL.
b7ecb56
@johnfn
Handle the returned VimState in a unified way.
00cad54
@johnfn
Simplify logic.
7410857
@johnfn
Update mode via VimState.
f9fed66
@johnfn
Remove unnecessary parameter.
f837304
@johnfn
Remove handleDeactivation, which caused weird bugs.
0f3fa9e
@johnfn
Stop passing in modeHandler to actions.
e905f40 
This makes all the actions stateless and beautiful. : )
@johnfn
Add a bunch of commands.
0fc8e94
@johnfn
Add 2 more commands back.
efc6133
@johnfn
Add x operator in visual mode.
37a6abb
@johnfn
Add yank and put back.
1a0cbb9
@johnfn
Add text object and remove concept of inclusive/exclusive motions.
e0e6974
@johnfn johnfn mentioned this pull request Jun 4, 2016
Merged
@johnfn
Copy link
Member Author

johnfn commented Jun 5, 2016

Bah! The tests totally pass. I don't understand why they're timing out on the server.

I'LL JUST DO IT LIVE!!!

@johnfn johnfn merged commit 192861c into master Jun 5, 2016
@jpoon jpoon deleted the refactor-commands branch June 6, 2016 06:34
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@johnfn @jpoon