feature: relative, plus/minus ranges. closes #2384 #3071
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Since nobody's had time to review this yet, I decided to take care of the second point above so it's a little cleaner within this PR :). I took the second approach (improving the lexer so LineNumber and Offset are semantically distinct). I'll update it to master and then push it. |
It seems more in-line with the original direction the code was going It's a little more code, but I think easier to understand for a first-time reader this way.
…ve-command-ranges
xconverge
reviewed
Oct 9, 2018
src/cmd_line/lexer.ts
Outdated
| return lexDigits(TokenType.LineNumber); | ||
| } else { | ||
| // otherwise, use previous token to determine which flavor of digit lexer should be used | ||
| let previousTokenType = tokens[tokens.length - 1].type; |
xconverge
reviewed
Oct 9, 2018
src/cmd_line/node.ts
Outdated
| let currentColumn = 0; // only mark does this differently | ||
| let currentOperation: LineRefOperation = undefined; | ||
|
|
||
| var firstToken = toks[0]; |
xconverge
reviewed
Oct 9, 2018
…ve-command-ranges
…aius/Vim into relative-command-ranges
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
This PR fixes the current line ranges functionality and also adds the ability to do relative line ranges like vim (e.g. :.,.+2s/this/that/). A few bugs were fixed along the way too (e.g. specifying a single-line only, etc).
Which issue(s) this PR fixes
#2384
Special notes for your reviewer:
First of all, you'll notice I tried to make it behave like vim even when in undocumented cases. If anything seems a little weird, there'll be a comment with "undocumented:" nearby so you can try it for yourself on vim ;)
Also, a few things worth noting that i came across while working on this:
I decided to defer the shorthand feature in vim, because it's unrelated - i.e. 4:s/this/that becomes :.,.+3s/this/thatdone in this PR - it turned out to be a 4-liner ;)I think TokenType.LineNumber probably needs a different name, like LineNumberOrOffset ;) - or we can do some surgery on the lexer, but I don't think you folks would think that's worthwhile.I updated the lexer - I decided it's clearer to understand this way, even though it's a little more code to read. If anyone disagrees, I'll be happy to revert.