Skip to content

Fix syntax highlighting for line-ending forward slashes #3902

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

Open
reese wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix syntax highlighting for line-ending forward slashes #3902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion vscode/grammars/ruby.cson.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@
]
},
{
"begin": "(?x)\n(?<![\\w)])((/))(?![?*+])\n(?=\n (?:\\\\/|[^/])*+ # Do NOT change the order\n /[eimnosux]*\\s*\n (?:\n [)\\]}#.,?:]|\\|\\||&&|<=>|=>|==|=~|!~|!=|;|$|\n if|else|elsif|then|do|end|unless|while|until|or|and\n )\n |\n $\n)",
"begin": "(?x)\n(?<![\\w)])((/))(?![?*+])(?!\\s*$)\n(?=\n (?:\\\\/|[^/])*+ # Do NOT change the order\n /[eimnosux]*\\s*\n (?:\n [)\\]}#.,?:]|\\|\\||&&|<=>|=>|==|=~|!~|!=|;|$|\n if|else|elsif|then|do|end|unless|while|until|or|and\n )\n)",
"captures": {
"1": {
"name": "string.regexp.interpolated.ruby"
Expand Down
89 changes: 89 additions & 0 deletions vscode/src/test/suite/grammars.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,95 @@ suite("Grammars", () => {
});
});

suite("regex", () => {
test("division at end of line is not treated as regex", () => {
const ruby = "a = 1 /\n 2\nb = 3";
const expectedTokens = [
["a", ["source.ruby", "variable.ruby"]],
[" ", ["source.ruby"]],
["=", ["source.ruby", "keyword.operator.assignment.ruby"]],
[" ", ["source.ruby"]],
["1", ["source.ruby", "constant.numeric.ruby"]],
[" ", ["source.ruby"]],
["/", ["source.ruby", "keyword.operator.arithmetic.ruby"]],
[" ", ["source.ruby"]],
["2", ["source.ruby", "constant.numeric.ruby"]],
["b", ["source.ruby", "variable.ruby"]],
[" ", ["source.ruby"]],
["=", ["source.ruby", "keyword.operator.assignment.ruby"]],
[" ", ["source.ruby"]],
["3", ["source.ruby", "constant.numeric.ruby"]],
];
const actualTokens = tokenizeRuby(ruby);
assert.deepStrictEqual(actualTokens, expectedTokens);
});

test("regex literal is still recognized", () => {
const ruby = "a = /foo/";
const expectedTokens = [
["a", ["source.ruby", "variable.ruby"]],
[" ", ["source.ruby"]],
["=", ["source.ruby", "keyword.operator.assignment.ruby"]],
[" ", ["source.ruby"]],
["/", ["source.ruby", "string.regexp.interpolated.ruby", "punctuation.section.regexp.ruby"]],
["foo", ["source.ruby", "string.regexp.interpolated.ruby"]],
["/", ["source.ruby", "string.regexp.interpolated.ruby", "punctuation.section.regexp.ruby"]],
];
const actualTokens = tokenizeRuby(ruby);
assert.deepStrictEqual(actualTokens, expectedTokens);
});

test("regex with flags is still recognized", () => {
const ruby = "a = /foo/i";
const expectedTokens = [
["a", ["source.ruby", "variable.ruby"]],
[" ", ["source.ruby"]],
["=", ["source.ruby", "keyword.operator.assignment.ruby"]],
[" ", ["source.ruby"]],
["/", ["source.ruby", "string.regexp.interpolated.ruby", "punctuation.section.regexp.ruby"]],
["foo", ["source.ruby", "string.regexp.interpolated.ruby"]],
["/i", ["source.ruby", "string.regexp.interpolated.ruby", "punctuation.section.regexp.ruby"]],
];
const actualTokens = tokenizeRuby(ruby);
assert.deepStrictEqual(actualTokens, expectedTokens);
});

test("regex followed by keyword is still recognized", () => {
const ruby = "a = /foo/ if bar";
const expectedTokens = [
["a", ["source.ruby", "variable.ruby"]],
[" ", ["source.ruby"]],
["=", ["source.ruby", "keyword.operator.assignment.ruby"]],
[" ", ["source.ruby"]],
["/", ["source.ruby", "string.regexp.interpolated.ruby", "punctuation.section.regexp.ruby"]],
["foo", ["source.ruby", "string.regexp.interpolated.ruby"]],
["/", ["source.ruby", "string.regexp.interpolated.ruby", "punctuation.section.regexp.ruby"]],
[" ", ["source.ruby"]],
["if", ["source.ruby", "keyword.control.ruby"]],
[" bar", ["source.ruby"]],
];
const actualTokens = tokenizeRuby(ruby);
assert.deepStrictEqual(actualTokens, expectedTokens);
});

test("string containing slash does not break subsequent highlighting", () => {
const ruby = '"foo /\nbar"\nb = 3';
const expectedTokens = [
['"', ["source.ruby", "string.quoted.double.interpolated.ruby", "punctuation.definition.string.begin.ruby"]],
["foo /", ["source.ruby", "string.quoted.double.interpolated.ruby"]],
["bar", ["source.ruby", "string.quoted.double.interpolated.ruby"]],
['"', ["source.ruby", "string.quoted.double.interpolated.ruby", "punctuation.definition.string.end.ruby"]],
["b", ["source.ruby", "variable.ruby"]],
[" ", ["source.ruby"]],
["=", ["source.ruby", "keyword.operator.assignment.ruby"]],
[" ", ["source.ruby"]],
["3", ["source.ruby", "constant.numeric.ruby"]],
];
const actualTokens = tokenizeRuby(ruby);
assert.deepStrictEqual(actualTokens, expectedTokens);
});
});

function tokenizeRBS(rbs: string): [string, string[]][] {
if (!rbsGrammar) {
throw new Error("RBS grammar not loaded");
Expand Down