Fixing string and doc string detection (#34)

Co-authored-by: phannebohm <[email protected]>

.vscode/launch.json

@@ -12,7 +12,7 @@
             "args": [
                 "--extensionDevelopmentPath=${workspaceFolder}"
             ],
-            "preLaunchTask": "npm: prebuild"
+            "preLaunchTask": "Build"
         }
     ]
 }

.vscode/tasks.json

@@ -3,8 +3,18 @@
   // for the documentation about the tasks.json format
   "version": "2.0.0",
   "tasks": [
+    {
+      "label": "Build",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "type": "npm",
+      "script": "prebuild"
+    },
     {
       "label": "tmGrammar tests",
+      "dependsOn": ["Build"],
       "type": "shell",
       "command": "npx vscode-tmgrammar-test -c 'test/**/*.test.*'",
       "group": "test",

README.md

@@ -81,6 +81,7 @@ npm install
 ```
 
 Translate the `*tmGrammar.yaml` files to `*.tmGrammar.json` JSON files.
+Start build task (Ctrl+Shift+B)
 
 ```bash
 npm run prebuild
@@ -96,7 +97,7 @@ Run the `tmGrammer tests` task:
 or run it manually:
 
 ```bash
-npx vscode-tmgrammar-test test/**/*.test.*
+npm run test
 ```
 
 ### Build Package

syntaxes/modelica.tmGrammar.yaml

@@ -76,15 +76,15 @@ patterns:
       - include: '#annotations'
 
   # Strings
+  - match: (?<![=+]\s*)((?<!\\)"([^"]*|\\")*(?<!\\)")\s*;
+    captures:
+      1:
+        name: comment.line
   - begin: \"
     end: \"
     name: string.quoted.double
     patterns:
       - include: '#escapes'
-  - match: '["\w\)\]](\s+"[^"]*"\s*);'
-    captures:
-      1:
-        name: comment.line
 
 repository:
   escapes:

test/modelica/Comments.test.mo

@@ -2,10 +2,26 @@
 
 model M "Documentation"
 //      ^^^^^^^^^^^^^^^ comment.line
-  Real x "Variable x";
+  Real x "Variable \"x\"";
 //       ^^^^^^^^^^^^ comment.line
   Real y = 1.0 "Variable y";
-  String z = "hello" "Variable z";
+//             ^^^^^^^^^^^^ comment.line
+  String z1 = "hello" "Variable z1";
+//                    ^^^^^^^^^^^^^ comment.line
+  String z2 = "hello";
+//            ^^^^^^^ string.quoted.double
   Foo foo(x=1) "Variable foo";
 //             ^^^^^^^^^^^^^^ comment.line
+  Real a = foo("hello") "Function foo";
+//             ^^^^^^^ string.quoted.double
+//                      ^^^^^^^^^^^^^^ comment.line
+  Real b = bar("hello");
+//             ^^^^^^^ string.quoted.double
+  String v = "a" + "b" "Variable v";
+//           ^^^ string.quoted.double
+//                 ^^^ string.quoted.double
+//                     ^^^^^^^^^^^^ comment.line
+  String w = "a" + "b";
+//           ^^^ string.quoted.double
+//                 ^^^ string.quoted.double
 end M;