Fix Doc string for if-expression with string (#50)

Fixes #30
AnHeuermann · Jul 4, 2024 · 2a541fa · 2a541fa
1 parent d166962
commit 2a541fa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/syntaxes/metamodelica.tmGrammar.yaml b/syntaxes/metamodelica.tmGrammar.yaml
@@ -116,7 +116,7 @@ patterns:
     end: \)\s*;
 
   # Documentation Strings
-  - match: (?<![=+]\s*)((?<!\\)"([^"]|\\")*(?<!\\)")\s*;
+  - match: (?<!else\s*)(?<![=+]\s*)((?<!\\)"([^"]|\\")*(?<!\\)")\s*;
     captures:
       1:
         name: comment.line

diff --git a/syntaxes/modelica.tmGrammar.yaml b/syntaxes/modelica.tmGrammar.yaml
@@ -81,7 +81,7 @@ patterns:
       - include: '#annotations'
 
   # Documentation Strings
-  - match: (?<![=+]\s*)((?<!\\)"([^"]|\\")*(?<!\\)")\s*;
+  - match: (?<!else\s*)(?<![=+]\s*)((?<!\\)"([^"]|\\")*(?<!\\)")\s*;
     captures:
       1:
         name: comment.line

diff --git a/test/modelica/Comments.test.mo b/test/modelica/Comments.test.mo
@@ -29,6 +29,13 @@ model M "Documentation"
   String w = "a" + "b";
 //           ^^^ source.modelica string.quoted.double
 //                 ^^^ source.modelica string.quoted.double
+  String s = if true then "yes" else "no" "doc";
+//                        ^^^^^ source.modelica string.quoted.double
+//                                   ^^^^ source.modelica string.quoted.double
+//                                        ^^^^^ source.modelica comment.line
+  String t = if false then "yes" else "no";
+//                         ^^^^^ source.modelica string.quoted.double
+//                                    ^^^^ source.modelica string.quoted.double
 end M;
 //<-- source.modelica keyword
 //  ^ source.modelica entity.name.type