fix comment after string

hetalang · Sep 18, 2024 · 30d1b33 · 30d1b33
1 parent ba08d6d
commit 30d1b33
Showing 3 changed files with 51 additions and 142 deletions.
diff --git a/src/index.js b/src/index.js
diff --git a/src/pegjs/heta.pegjs b/src/pegjs/heta.pegjs
@@ -83,7 +83,7 @@ Dict "Dict" = "{" (Break/Space/Comment)* item: DictPair* (Break/Space/Comment)*
     return res;
   }
 
-DictPair = (Break/Space)* key: KeyName (Break/Space)* ":" (Break/Space)* value: ValueTypes ","? Comment?
+DictPair = (Break/Space)* key: KeyName (Break/Space)* ":" (Break/Space)* value: ValueTypes ","? Comment*
   {
     return [key, value];
   }
@@ -227,9 +227,10 @@ KeyName = symbol: $([A-Za-z_][A-Za-z0-9_]*)
     return symbol;
   }
 
-String "String" = (Break/Space)* s: $([^,[\]{};] !"//" !"/*")+ Comment?
+//String "String" = (Break/Space)* s: $([^,[\]{};] !"//" !"/*")+ (Comment)*
+String "String" = (Break/Space)* s: (Comment/[^,[\]{};])+
   {
-    let str = s.trim()
+    let str = s.join('').trim()
 
     if (str === 'null') {
       res = null;

diff --git a/test/syntax/index.js b/test/syntax/index.js
@@ -537,11 +537,26 @@ let to_test = [
     source: '{aux: a,//b\n};',
     expectation: [{action: 'upsert', aux: 'a'}]
   },
-  /*{
+  {
     description: 'complex strings with // as comment',
     source: '{aux: a//comment\n};',
     expectation: [{action: 'upsert', aux: 'a'}]
-  }*/
+  },
+  {
+    descrition: 'complex strings with /* */as comment',
+    source: '{aux: a/*b*/};',
+    expectation: [{action: 'upsert', aux: 'a'}]
+  },
+  {
+    description: 'no strings with /* */ as comment',
+    source: '{aux: /*b */a};',
+    expectation: [{action: 'upsert', aux: 'a'}]
+  },
+  {
+    description: 'no strings with /* */ as comment',
+    source: '{aux: /*b */};',
+    expectation: [{action: 'upsert', aux: ''}]
+  }
 ];
 
 describe('Single object parsing.', () => {