Fix rescue token without explicit class

Shopify · Sep 19, 2024 · fc4698c · fc4698c
1 parent a4be389
commit fc4698c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/vscode/grammars/ruby.cson.json b/vscode/grammars/ruby.cson.json
@@ -142,7 +142,7 @@
           "name": "variable.ruby"
         }
       },
-      "match": "^\\s*([a-z]([A-Za-z0-9_])*)\\s*=[^=]",
+      "match": "^\\s*([a-z]([A-Za-z0-9_])*)\\s*=[^=>]",
       "comment": "A local variable assignment"
     },
     {

diff --git a/vscode/src/test/suite/grammars.test.ts b/vscode/src/test/suite/grammars.test.ts
@@ -325,6 +325,20 @@ suite("Grammars", () => {
       });
     });
 
+    suite("Local variables", () => {
+      test("rescue is not confused", () => {
+        const ruby = "rescue => e";
+        const expectedTokens = [
+          ["rescue", ["source.ruby", "keyword.control.ruby"]],
+          [" ", ["source.ruby"]],
+          ["=>", ["source.ruby", "punctuation.separator.key-value"]],
+          [" e", ["source.ruby"]],
+        ];
+        const actualTokens = tokenizeRuby(ruby);
+        assert.deepStrictEqual(actualTokens, expectedTokens);
+      });
+    });
+
     function tokenizeRuby(ruby: string): [string, string[]][] {
       if (!rubyGrammar) {
         throw new Error("Ruby grammar not loaded");