fix(grammar): capture end of python|init python blocks

renpy · Apr 3, 2022 · 944d852 · 944d852
1 parent 082a13f
commit 944d852
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
                 "scopeName": "source.renpy",
                 "path": "./syntaxes/renpy.tmLanguage_2.json",
                 "embeddedLanguages": {
-                    "embedded.python": "python"
+                    "meta.embedded.python": "python"
                 }
             }
         ],

diff --git a/syntaxes/renpy.tmLanguage_2.json b/syntaxes/renpy.tmLanguage_2.json
@@ -14,19 +14,19 @@
       "patterns": [
         {
           "comments": "[TODO: REDO] Renpy python block",
-          "name": "embedded.python.block",
-          "begin": "^(init\\s-?\\d?\\s?)?(python:)",
+          "name": "meta.embedded.python.block",
+          "begin": "^(\\s*)(init\\s-?\\d*\\s?)?(python(\\searly)?(\\sin\\s\\w+)?)",
           "beginCaptures": {
             "0": {
               "patterns": [{ "include": "#renpy-keywords" }]
             }
           },
-          "end": "^(?=\\S)",
+          "end": "^\\1(?=\\S)|^(?=\\S)",
           "patterns": [{ "include": "source.python" }]
         },
         {
           "comment": "Match begin and end of python one line statements",
-          "name": "embedded.python.one-line",
+          "name": "meta.embedded.python.single-line",
           "begin": "(?<=(\\$|define|default)\\s)",
           "end": "\\R$",
           "patterns": [{ "include": "source.python" }]