Merge pull request #130 from JelleInfinity/fix-comments

fix: Ignore comments in line continuation
renpy · May 30, 2022 · 073f9af · 073f9af
2 parents 39b0b54 + d0f59ee
commit 073f9af
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/examples/game/script.rpy b/examples/game/script.rpy
@@ -124,6 +124,7 @@ init python hide early in Namespace:
         """
         This is a sample function.
         """
+# test
         renpy.pause(delay)
         return name
 

diff --git a/src/tokenizer/token-patterns.ts b/src/tokenizer/token-patterns.ts
@@ -597,7 +597,7 @@ const pythonStatements: TokenPattern = {
                 },
             },
             // eslint-disable-next-line no-useless-escape
-            end: /(?:(?<!\1|[^ \t])|^)(?=(?:[ \t]|^)(?!$)[^ \t])|\Z/gm,
+            end: /(?:(?<!\1|[^ \t])|^)(?=(?:[ \t]|^)(?!$|#)[^ \t])|\Z/gm,
             patterns: [pythonSource],
         },
         {

diff --git a/syntaxes/renpy.tmLanguage_2.json b/syntaxes/renpy.tmLanguage_2.json
@@ -46,7 +46,7 @@
             },
             "7": { "name": "punctuation.section.python.begin.renpy" }
           },
-          "end": "(?:(?<!\\1|[^ \\t])|^)(?=(?:[ \\t]|^)(?!$)[^ \\t])",
+          "end": "(?:(?<!\\1|[^ \\t])|^)(?=(?:[ \\t]|^)(?!$|#)[^ \\t])",
           "patterns": [{ "include": "source.python" }]
         },
         {
-Original file line number
+Diff line change
@@ Expand Up / @@ -124,6 +124,7 @@ init python hide early in Namespace: @@
             """
             This is a sample function.
             """
+    # test
             renpy.pause(delay)
             return name
@@ Expand Down @@