Merge pull request #664 from BetterThanTomorrow/fix/var_quote_lexing

Fix higlight of var quote before open token

CHANGELOG.md

@@ -3,7 +3,8 @@
 Changes to Calva.
 
 ## [Unreleased]
-- Fix [Stream output messages to Calva Says as they're received](https://github.com/BetterThanTomorrow/calva/pull/662)
+- Fix [Stream output messages to Calva Says as they're received](https://github.com/BetterThanTomorrow/calva/issues/638)
+- Fix [highlighting of var quote before open token](https://github.com/BetterThanTomorrow/calva/issues/663)
 
 ## [2.0.102] - 2020-06-04
 - Fix [Format Document sometimes causes Calva to stop working](https://github.com/BetterThanTomorrow/calva/issues/651)

src/cursor-doc/clojure-lexer.ts

@@ -57,7 +57,7 @@ toplevel.terminal(/;.*/, (l, m) => ({ type: "comment" }))
 // (#[^\(\)\[\]\{\}"_@~\s,]+[\s,]*)*
 
 // open parens
-toplevel.terminal(/(#[^\(\)\[\]\{\}"_@~\s,]+[\s,]*)*((?<=(^|[\(\)\[\]\{\}\s,]))['`~#@?^]\s*)*['`~#@?^]*[\(\[\{"]/, (l, m) => ({ type: "open" }))
+toplevel.terminal(/(#[^\(\)\[\]\{\}'"_@~\s,]+[\s,]*)*((?<=(^|[\(\)\[\]\{\}\s,]))['`~#@?^]\s*)*['`~#@?^]*[\(\[\{"]/, (l, m) => ({ type: "open" }))
 // close parens
 toplevel.terminal(/\)|\]|\}/, (l, m) => ({ type: "close" }))
 

src/extension-test/unit/cursor-doc/clojure-lexer-test.ts

@@ -218,6 +218,17 @@ describe('Scanner', () => {
             expect(tokens[2].type).equals('close');
             expect(tokens[2].raw).equals(')');
         });
+        it('does not treat var quote plus open token as reader tag plus open token', () => {
+            const tokens = scanner.processLine("#'foo []")
+            expect(tokens[0].type).equals('id');
+            expect(tokens[0].raw).equals("#'foo");
+            expect(tokens[1].type).equals('ws');
+            expect(tokens[1].raw).equals(' ');
+            expect(tokens[2].type).equals('open');
+            expect(tokens[2].raw).equals('[');
+            expect(tokens[3].type).equals('close');
+            expect(tokens[3].raw).equals(']');
+        });
     });
     describe('strings', () => {
         it('tokenizes words in strings', () => {