Fix '#' inside string literals being lexed as a comment

grammar.js

@@ -352,9 +352,13 @@ module.exports = grammar({
     ),
 
     // quoted-string   = '"' { CHAR } '"'
+    // String content needs lexical precedence over the comment token:
+    // without it, a '#' in the content lets the comment (which runs to end
+    // of line) win the longest-match rule, so `"#fff"` lexed as a comment
+    // and corrupted the rest of the parse.
     quoted_string: $ => seq(
       '"',
-      optional(alias(token.immediate(/([^\\"\n]|\\["\\/bfnrt]|\\u[0-9a-fA-F]{4})+/), 'string_content')),
+      optional(alias(token.immediate(prec(1, /([^\\"\n]|\\["\\/bfnrt]|\\u[0-9a-fA-F]{4})+/)), 'string_content')),
       '"',
     ),
 
@@ -363,7 +367,7 @@ module.exports = grammar({
       seq(
         '`',
         repeat(
-          token.immediate(/[^`]+/),
+          token.immediate(prec(1, /[^`]+/)),
         ),
         '`',
       ),

test/corpus/strings.txt

@@ -0,0 +1,75 @@
+================================================================================
+hash inside quoted string
+================================================================================
+
+package test
+
+color := "#fff"
+
+--------------------------------------------------------------------------------
+(source_file
+  (module
+    (package)
+    (ref
+      (var))
+    (policy
+      (rule
+        (rule_head
+          (var))
+        (rule_body
+          (assignment)
+          (term
+            (scalar
+              (string
+                (quoted_string)))))))))
+
+================================================================================
+hash inside raw string
+================================================================================
+
+package test
+
+tag := `#hash`
+
+--------------------------------------------------------------------------------
+(source_file
+  (module
+    (package)
+    (ref
+      (var))
+    (policy
+      (rule
+        (rule_head
+          (var))
+        (rule_body
+          (assignment)
+          (term
+            (scalar
+              (string
+                (raw_string)))))))))
+
+================================================================================
+comment after string containing hash
+================================================================================
+
+package test
+
+x := "#a" # real comment
+
+--------------------------------------------------------------------------------
+(source_file
+  (module
+    (package)
+    (ref
+      (var))
+    (policy
+      (rule
+        (rule_head
+          (var))
+        (rule_body
+          (assignment)
+          (term
+            (scalar
+              (string
+                (quoted_string))))))))
+  (comment))