From c8147de80e706deea322d109262e4ae7699beb4b Mon Sep 17 00:00:00 2001
From: phannebohm <phannebohm@hsbi.de>
Date: Thu, 18 Apr 2024 23:38:07 +0200
Subject: [PATCH] Fix Doc string for if-expression with string

Fixes #30
---
 syntaxes/metamodelica.tmGrammar.yaml | 2 +-
 syntaxes/modelica.tmGrammar.yaml     | 2 +-
 test/modelica/Comments.test.mo       | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/syntaxes/metamodelica.tmGrammar.yaml b/syntaxes/metamodelica.tmGrammar.yaml
index 9003d1c..f129fe9 100644
--- 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
index 6bb87eb..49d46cc 100644
--- 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
index 20bf03c..f5f59b8 100644
--- 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