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

Only use regex lookbehind where supported #3525

Merged
merged 4 commits into from
Apr 8, 2019
Merged

Only use regex lookbehind where supported #3525

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7773cb8
Only use regex lookbehind where supported
jkillian Feb 26, 2019
ce646d7
Merge branch 'master' into fix_regex_on_old_machines
jkillian Feb 26, 2019
8e5eef6
Merge branch 'master' into fix_regex_on_old_machines
jkillian Apr 3, 2019
2819d7f
Merge branch 'master' into fix_regex_on_old_machines
jpoon Apr 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions src/common/motion/position.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,18 +856,28 @@ export class Position extends vscode.Position {
const escaped = characterSet && _.escapeRegExp(characterSet).replace(/-/g, '\\-');
const segments: string[] = [];

// old versions of VSCode before 1.31 will crash when trying to parse a regex with a lookbehind
let supportsLookbehind = true;
try {
// tslint:disable-next-line
new RegExp('(<=x)');
} catch {
supportsLookbehind = false;
}

// prettier-ignore
const firstSegment =
'(' + // OPEN: group for matching camel case words
`[^\\s${escaped}]` + // words can start with any word character
'(?:' + // OPEN: group for characters after initial char
`(?:(?<=[A-Z_])[A-Z](?=[\\sA-Z0-9${escaped}_]))+` + // If first char was a capital
// the word can continue with all caps
`(?:${supportsLookbehind ? '(?<=[A-Z_])' : ''}` + // If first char was a capital
`[A-Z](?=[\\sA-Z0-9${escaped}_]))+` + // the word can continue with all caps
'|' + // OR
`(?:(?<=[0-9_])[0-9](?=[\\sA-Z0-9${escaped}_]))+` + // If first char was a digit
// the word can continue with all digits
`(?:${supportsLookbehind ? '(?<=[0-9_])' : ''}` + // If first char was a digit
`[0-9](?=[\\sA-Z0-9${escaped}_]))+` + // the word can continue with all digits
'|' + // OR
`(?:(?<=[_])[_](?=[\\s${escaped}_]))+` + // Continue with all underscores
`(?:${supportsLookbehind ? '(?<=[_])' : ''}` + // If first char was an underscore
`[_](?=[\\s${escaped}_]))+` + // the word can continue with all underscores
'|' + // OR
`[^\\sA-Z0-9${escaped}_]*` + // Continue with regular characters
')' + // END: group for characters after initial char
Expand Down