[Batch File] Fix comment scope around newlines

I wish I knew what I was doing.
sublimehq · Jun 17, 2024 · 717adef · 717adef
1 parent 3c25c09
commit 717adef
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 4 deletions.
diff --git a/Batch File/Batch File.sublime-syntax b/Batch File/Batch File.sublime-syntax
@@ -161,7 +161,7 @@ contexts:
   comment-body:
     - meta_scope: comment.line.colon.dosbatch
     - include: line-continuations
-    - match: \n
+    - match: $\n?
       pop: 1
 
   ignored-tail-inner:

diff --git a/Batch File/tests/syntax_test_batch_file.bat b/Batch File/tests/syntax_test_batch_file.bat
@@ -63,38 +63,98 @@ continuation
 :: ^^^ punctuation.definition.comment.dosbatch
 :: ^^^^^^^^^^^ comment.line.colon.dosbatch
 
+   :::
+   Not me, though.
+:: ^^^^^^^^^^^^^^^^ - comment
+
    :: Me too!
 :: ^^ punctuation.definition.comment.dosbatch
 :: ^^^^^^^^^^ comment.line.colon.dosbatch
 
+   ::
+   Not me, though.
+:: ^^^^^^^^^^^^^^^^ - comment
+
    :+ Me too!
 :: ^^ punctuation.definition.comment.dosbatch
 
+   :+
+   Not me, though.
+:: ^^^^^^^^^^^^^^^^ - comment
+
    := Me too!
 :: ^^ punctuation.definition.comment.dosbatch
 
+   :=
+   Not me, though.
+:: ^^^^^^^^^^^^^^^^ - comment
+
    :, Me too!
 :: ^^ punctuation.definition.comment.dosbatch
 
+   :,
+   Not me, though.
+:: ^^^^^^^^^^^^^^^^ - comment
+
    :; Me too!
 :: ^^ punctuation.definition.comment.dosbatch
 
+   :;
+   Not me, though.
+:: ^^^^^^^^^^^^^^^^ - comment
+
    : Me too!
 :: ^^ punctuation.definition.comment.dosbatch
 
+   :
+   Not me, though.
+:: ^^^^^^^^^^^^^^^^ - comment
+
+   ::^
+   Me too!
+:: ^^^^^^^ comment.line.colon.dosbatch
+
+   ::^
+
+   Me too!
+:: ^^^^^^^ comment.line.colon.dosbatch
+
    ::^
+
+
+   Not me, though.
+:: ^^^^^^^^^^^^^^^^ - comment
+
+   : ^
    Me too!
 :: ^^^^^^^ comment.line.colon.dosbatch
 
    : ^
+
    Me too!
 :: ^^^^^^^ comment.line.colon.dosbatch
 
    : ^
+
+
+   Not me, though.
+:: ^^^^^^^^^^^^^^^^ - comment
+
+   : ^
    A continued comment.^
    Me too!
 :: ^^^^^^^ comment.line.colon.dosbatch
 
+   : ^
+
+   Me too!
+:: ^^^^^^^ comment.line.colon.dosbatch
+
+   : ^
+^
+   Not me, though.
+:: ^^^^^^^^^^^^^^^^ - comment
+
    :> ignored content ( & | )
 :: ^^^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.colon.dosbatch
 :: ^^ punctuation.definition.comment.dosbatch
@@ -114,17 +174,17 @@ continuation
 ECHO &&:: A comment
 ::   ^^ keyword.operator.logical.dosbatch
 ::     ^^ punctuation.definition.comment.dosbatch
-::     ^^^^^^^^^^^^ comment.line.colon.dosbatch
+::     ^^^^^^^^^^^^^ comment.line.colon.dosbatch
 
 ECHO &:: A comment
 ::   ^ keyword.operator.logical.dosbatch
 ::    ^^ punctuation.definition.comment.dosbatch
-::    ^^^^^^^^^^^^ comment.line.colon.dosbatch
+::    ^^^^^^^^^^^^^ comment.line.colon.dosbatch
 
 ECHO ||:: A comment
 ::   ^^ keyword.operator.logical.dosbatch
 ::     ^^ punctuation.definition.comment.dosbatch
-::     ^^^^^^^^^^^^ comment.line.colon.dosbatch
+::     ^^^^^^^^^^^^^ comment.line.colon.dosbatch
 
 ECHO |:: Not a comment
 ::   ^ keyword.operator.assignment.pipe.dosbatch