misc fixups

gdamore · Jul 29, 2024 · adcee93 · adcee93
1 parent 20fb336
commit adcee93
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 36 deletions.
diff --git a/grammar.js b/grammar.js
@@ -1201,27 +1201,27 @@ module.exports = grammar({
       choice(
         seq(
           "`",
-          field("content", token.immediate(prec(1, /[^`]*/))),
+          token.immediate(prec(1, /[^`]*/)),
           token.immediate(/`[cdw]?/),
         ),
         seq(
           'r"',
-          field("content", token.immediate(prec(1, /[^"]*/))),
+          token.immediate(prec(1, /[^"]*/)),
           token.immediate(/"[cdw]?/),
         ),
       ),
 
     hex_string: ($) =>
       seq(
         'x"',
-        field("content", token.immediate(prec(1, /[0-9A-Fa-f\s]*/))),
+        token.immediate(prec(1, /[0-9A-Fa-f\s]*/)),
         token.immediate(/"[cdw]?/),
       ),
 
     quoted_string: ($) =>
       seq(
         '"',
-        field("content", repeat(choice(/[^"\\]+/, $.escape_sequence))),
+        repeat(choice(/[^"\\]+/, $.escape_sequence)),
         token.immediate(/"[cdw]?/),
       ),
 

diff --git a/queries/nova-highlights.scm b/queries/nova-highlights.scm
@@ -25,7 +25,7 @@
 (float_literal) @value.number
 (char_literal) @value.number ; not sure what is best for this
 (special_keyword) @value.symbols
-(htmlenttity) @value.entity
+(htmlentity) @value.entity
 (escape_sequence) @value.entity
 
 [
@@ -254,7 +254,7 @@
 (version_specification (version) (int_literal) @invalid) ; deprecated in 2.101
 (version_condition (identifier) @value.symbol)
 
-(module_fqn) @cdata ; this is a crummy workaround since we don't have anything for imports
+(module_fqn) @processing ; this is a crummy workaround since we don't have anything for imports
 (module_declaration (module_fqn)) @definition.package
 (class_declaration (identifier) @identifier.type.class)
 (struct_declaration (identifier) @identifier.type.struct)

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/node-types.json b/src/node-types.json
diff --git a/src/parser.c b/src/parser.c
diff --git a/test/corpus/quotedstring.scm b/test/corpus/quotedstring.scm
@@ -47,7 +47,7 @@ auto s3 = "a\u1234b\\";
 ================================================================================
 Quoted String with Character Entity
 ================================================================================
-auto s3 = "a\&trademark;";
+auto s3 = "a\&trademark;over";
 
 --------------------------------------------------------------------------------
 
@@ -91,3 +91,21 @@ auto s10 = "🥂"w;
     (identifier)
     (string_literal
       (quoted_string))))
+
+================================================================================
+Quoted String with Entity
+================================================================================
+
+auto s10 = "alpha\&nbsp;beta"w;
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (auto_declaration
+    (storage_class
+      (auto))
+    (identifier)
+    (string_literal
+      (quoted_string
+        (escape_sequence
+          (htmlentity))))))