Skip to content

Fix braces pattern to support more than 2 choices #348

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

Merged
mrmlnc merged 3 commits into from
Jan 9, 2022
Merged

Fix braces pattern to support more than 2 choices #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92a7fcb
Fix braces pattern to support more than 2 choices
amitdahan Jan 9, 2022
57700a5
Adjust braces regex
amitdahan Jan 9, 2022
7b4d738
Add tests for nested braces
amitdahan Jan 9, 2022
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
5 changes: 5 additions & 0 deletions src/utils/pattern.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ describe('Utils → Pattern', () => {
assert.ok(util.isDynamicPattern('{a,}'));
assert.ok(util.isDynamicPattern('{,b}'));
assert.ok(util.isDynamicPattern('{a,b}'));
assert.ok(util.isDynamicPattern('{a,b,c}'));
assert.ok(util.isDynamicPattern('{a' + ','.repeat(999999) + 'b}'));
assert.ok(util.isDynamicPattern('{a,b,{c,d}}'));
// The second braces pass
assert.ok(util.isDynamicPattern('{a,b,{c,d}'));
assert.ok(util.isDynamicPattern('{1..3}'));
});

Expand Down
2 changes: 1 addition & 1 deletion src/utils/pattern.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const COMMON_GLOB_SYMBOLS_RE = /[*?]|^!/;
const REGEX_CHARACTER_CLASS_SYMBOLS_RE = /\[[^[]*]/;
const REGEX_GROUP_SYMBOLS_RE = /(?:^|[^!*+?@])\([^(]*\|[^|]*\)/;
const GLOB_EXTENSION_SYMBOLS_RE = /[!*+?@]\([^(]*\)/;
const BRACE_EXPANSIONS_SYMBOLS_RE = /{[^,.{]*(?:,|\.\.)[^,.{]*}/;
const BRACE_EXPANSIONS_SYMBOLS_RE = /{[^,.{]*(?:,|\.\.)[^{]*}/;

type PatternTypeOptions = {
braceExpansion?: boolean;
Expand Down