VSCodeVim/Vim
1
1
Fork 0
mirror of https://github.com/VSCodeVim/Vim.git synced 2024-09-20 08:37:45 +03:00
Code Issues Projects Releases Wiki Activity

Slight cleanup of LineRange parser

Browse Source
This commit is contained in:
Jason Fields 2021-09-16 01:29:20 -04:00
parent 2ce6c12818
commit 43d62b5003
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/vimscript/lineRange.ts
View File

@ -4,6 +4,7 @@ import { ErrorCode, VimError } from '../error';
import { globalState } from '../state/globalState';
import { SearchDirection, SearchState } from '../state/searchState';
import { VimState } from '../state/vimState';
import { numberParser } from './parserUtils';
/**
* Specifies the start or end of a line range.
@ -60,16 +61,18 @@ type LineSpecifier =
};
const lineSpecifierParser: Parser<LineSpecifier> = alt(
regexp(/\d+/).map((num) => {
return { type: 'number', num: Number.parseInt(num, 10) };
numberParser.map((num) => {
return { type: 'number', num };
}),
string('.').result({ type: 'current_line' }),
string('$').result({ type: 'last_line' }),
string('%').result({ type: 'entire_file' }),
string('*').result({ type: 'last_visual_range' }),
seq(string("'"), any).map(([tick, mark]) => {
return { type: 'mark', mark };
}),
string("'")
.then(any)
.map((mark) => {
return { type: 'mark', mark };
}),
// TODO: pattern_next
// TODO: pattern_prev
string('\\/').result({ type: 'last_search_pattern_next' }),
@ -78,15 +81,11 @@ const lineSpecifierParser: Parser<LineSpecifier> = alt(
);
const offsetParser: Parser<number> = alt(
seq(string('+'), regexp(/\d+/).fallback('1')).map(([plus, num]) => {
return Number.parseInt(num, 10);
}),
seq(string('-'), regexp(/\d+/).fallback('1')).map(([minus, num]) => {
return -1 * Number.parseInt(num, 10);
}),
regexp(/\d+/).map((num) => {
return Number.parseInt(num, 10);
})
string('+').then(numberParser.fallback(1)),
string('-')
.then(numberParser.fallback(1))
.map((num) => -num),
numberParser
)
.skip(optWhitespace)
.atLeast(1)

3
src/vimscript/parserUtils.ts Normal file
View File

@ -0,0 +1,3 @@
import { Parser, regexp } from 'parsimmon';
export const numberParser: Parser<number> = regexp(/\d+/).map((num) => Number.parseInt(num, 10));