Fix: Handle triple quotes correctly

savoirfairelinux · Nov 28, 2023 · 23a724f · 23a724f
1 parent f78bdb0
commit 23a724f
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 0 deletions.
diff --git a/client/syntaxes/bitbake.tmLanguage.json b/client/syntaxes/bitbake.tmLanguage.json
@@ -100,6 +100,25 @@
         },
         "string": {
             "patterns": [
+                {
+                    "name": "string.quoted.triple.bb",
+                    "begin": "(\"\"\")",
+                    "end": "(\"\"\")",
+                    "patterns": [
+                        {
+                            "include": "#escaped-single-quote"
+                        },
+                        {
+                            "include": "#escaped-double-quote"
+                        },
+                        {
+                            "include": "#inline-python"
+                        },
+                        {
+                            "include": "#variable-expansion"
+                        }
+                    ]
+                },
                 {
                     "name": "string.quoted.double.bb",
                     "begin": "(\")",

diff --git a/client/test/grammars/snaps/strings.bb b/client/test/grammars/snaps/strings.bb
@@ -51,3 +51,9 @@ INHERIT += "autotools pkgconfig"
 MYVAR = "This string contains escaped double quote \" and it should not break the highlight"
 
 MYVAR = 'This string contains escaped single quote \' and it should not break the highlight'
+
+MYVAR = """
+nested " quotes shoudn't change the highlighting
+"""
+
+TEST_TRIPLE_QUOTES = 'the highlighting for this line which follows the triple quotes should still work correctly'
diff --git a/client/test/grammars/test-cases/strings.bb b/client/test/grammars/test-cases/strings.bb
@@ -143,3 +143,18 @@
 #                                                   ^^ source.bb string.quoted.single.bb constant.character.escape.bb
 #                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.bb string.quoted.single.bb
 #                                                                                           ^ source.bb string.quoted.single.bb
+
+>MYVAR = """
+#        ^^^ source.bb string.quoted.triple.bb
+>nested " quotes shoudn't change the highlighting
+#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.bb string.quoted.triple.bb
+>"""
+#^^^ source.bb string.quoted.triple.bb
+>
+>TEST_TRIPLE_QUOTES = 'the highlighting for this line which follows the triple quotes should still work correctly'
+#^^^^^^^^^^^^^^^^^^ source.bb variable.other.names.bb
+#                   ^ source.bb keyword.operator.bb
+#                     ^ source.bb string.quoted.single.bb
+#                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.bb string.quoted.single.bb
+#                                                                                                                ^ source.bb string.quoted.single.bb
+>