fix: capture inline block comments in strings

Author: traunts

syntaxes/ccini.tmLanguage.json

@@ -45,16 +45,24 @@
         }
       }
     },
-    "comments": {
+    "commentBlock": {
       "patterns": [
         {
           "name": "comment.block",
           "begin": "\\/\\*",
-          "end": "\\*\\/"
-        },
+          "end": "\\*\\/",
+          "patterns": [
+            {
+              "include": "#commentBlock"
+            }
+          ]
+        }
+      ]
+    },
+    "comments": {
+      "patterns": [
         {
-          "name": "comment.block.inline",
-          "match": "(\\/\\*).*?(?=\\*\\/)(\\*\\/)"
+          "include": "#commentBlock"
         },
         {
           "name": "comment.line.double-slash",
@@ -90,8 +98,8 @@
     },
     "strings": {
       "name": "string.unquoted",
-      "begin": "(?=\\w)",
-      "end": "(?=\\n|$|(\\/\\*)|(\\/\\/))",
+      "begin": "(?=[\\w\\-])",
+      "end": "(?=\\n|$|(\\/\\*(?!.*\\*\\/))|(\\/\\/))",
       "patterns": [
         {
           "include": "#comments"

syntaxes/ccini.tmLanguage.yaml

@@ -40,14 +40,20 @@ repository:
           - { include: "#numbers" }
           - { include: "#strings" }
 
-  comments:
+  commentBlock:
     patterns:
       - name: comment.block
         begin: \/\*
         end: \*\/
+        patterns:
+          - include: "#commentBlock"
+
+  comments:
+    patterns:
+      - include: "#commentBlock"
 
-      - name: comment.block.inline
-        match: (\/\*).*?(?=\*\/)(\*\/)
+      # - name: comment.block.inline
+      #   match: (\/\*).*?(?=\*\/)(\*\/)
 
       - name: comment.line.double-slash
         begin: (^[ \t]+)?(?=//)
@@ -73,8 +79,8 @@ repository:
 
   strings:
     name: string.unquoted
-    begin: (?=\w)
-    end: (?=\n|$|(\/\*)|(\/\/))
+    begin: (?=[\w\-])
+    end: (?=\n|$|(\/\*(?!.*\*\/))|(\/\/))
     patterns:
       - include: "#comments"
       - include: "#modulePath"

testcases/test1.ini

@@ -15,20 +15,23 @@ AddSoundC/*ontainer = SoundContainer
 		FilePath = DarkStorm.rte/D22Bushi/D2TenguDeviceSwitch.wav
 */
 
+/*
+/* // adsdsa */
+welcome to hell	*/
 		// asdasd
 
 AddEffect = MOSParticle
-	PresetName = D22Bushi Gib Blue Tiny /* */ dasdsadasd  /*
+	PresetName = D22Bushi Gib Blue Tiny /**/ dasdsadasd  /*
 	Mass = 0.92
 	Sharpness = 1     
 	HitsMOs = 1
 	*/
 	GetsHitByMOs = 0
-	SpriteFile = ContentFile
+	SpriteFile = ContentFile // dasdsa
 		FilePath = DarkStorm.rte/D22Bushi/D22BushiBlueGib.png
 	FrameCount = 1
 	SpriteOffset = Vector
-		X = -2
+		X = -2 /**/
 		Y = -2
 	AngularVel = 6
 	Atom = Atom