Merge branch 'fix-strings' into fix-runaway-regex

.vscode/tasks.json

@@ -20,7 +20,7 @@
       "group": "test",
       "presentation": {
         "reveal": "always",
-        "panel": "new",
+        "panel": "dedicated",
       },
       "problemMatcher": {
         "owner": "vscode-tmgrammar-test",

README.md

@@ -75,7 +75,7 @@ for more details on the publishing process.
 npm install
 ```
 
-Translate the `*tmGrammar.yaml` files to `*.tmGrammar.json` JSON files.
+Translate the `*.tmGrammar.yaml` files to `*.tmGrammar.json` JSON files.
 Start build task (Ctrl+Shift+B)
 
 ```bash

syntaxes/metamodelica.tmGrammar.yaml

@@ -92,11 +92,13 @@ patterns:
       - name: keyword
     end: \)\s*;
 
-  # Strings
-  - match: (?<![=+]\s*)((?<!\\)"([^"]*|\\")*(?<!\\)")\s*;
+  # Documentation Strings
+  - match: (?<![=+]\s*)((?<!\\)"([^"]|\\")*(?<!\\)")\s*;
     captures:
       1:
         name: comment.line
+
+  # Strings
   - begin: \"
     end: \"
     name: string.quoted.double

syntaxes/modelica.tmGrammar.yaml

@@ -85,6 +85,8 @@ patterns:
     captures:
       1:
         name: comment.line
+
+  # Strings
   - begin: \"
     end: \"
     name: string.quoted.double

test/metamodelica/FunctionDoc.test.mo

@@ -0,0 +1,15 @@
+// SYNTAX TEST "source.metamodelica" "Function with doc string"
+
+public function foo
+  "Function does crazy stuff --fmiFlags
+   and creates an awesome record for stuff.
+   Author: ItIsI"
+  input Boolean isAwesome = true;
+//^^^^^ source.metamodelica keyword.control
+//      ^^^^^^^ source.metamodelica storage.type
+//                          ^^^^ source.metamodelica constant.language
+  output Option<SimCode.Awesome> awesome;
+//^^^^^^ source.metamodelica keyword.control
+//       ^^^^^^^^^^^^^^^^^^^^^^^ source.metamodelica storage.type
+// [...]
+end foo;

test/modelica/Comments.test.mo

@@ -1,6 +1,8 @@
 // SYNTAX TEST "source.modelica" "Comments"
 
 model M "Documentation"
+//<-- source.modelica keyword
+//    ^ source.modelica entity.name.type
 //      ^^^^^^^^^^^^^^^ source.modelica comment.line
   Real x "Variable \"x\"";
 //       ^^^^^^^^^^^^^^^^ source.modelica comment.line
@@ -28,3 +30,5 @@ model M "Documentation"
 //           ^^^ source.modelica string.quoted.double
 //                 ^^^ source.modelica string.quoted.double
 end M;
+//<-- source.modelica keyword
+//  ^ source.modelica entity.name.type

test/modelica/Function.test.mo

@@ -0,0 +1,18 @@
+// SYNTAX TEST "source.modelica" "Function with doc string"
+
+public function foo
+  "Function does crazy stuff --fmiFlags
+   and creates an awesome record for stuff.
+   Author: ItIsI"
+  input Boolean isAwesome = true;
+//^^^^^ source.modelica keyword.control
+//      ^^^^^^^ source.modelica storage.type
+//                          ^^^^ source.modelica constant.language
+  output MyRecord awesome;
+//^^^^^^ source.modelica keyword.control
+// [...]
+//<--- source.modelica comment.line
+//^^^^^^ source.modelica comment.line
+end foo;
+//<--- source.modelica keyword
+//  ^^^ source.modelica entity.name.type