[Common] Add diff conflict markers to ShellScript

sublimehq · Oct 25, 2024 · fc3b713 · fc3b713
1 parent 7e3eb9b
commit fc3b713
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 1 deletion.
diff --git a/ShellScript/Bash.sublime-syntax b/ShellScript/Bash.sublime-syntax
@@ -91,6 +91,7 @@ contexts:
     - match: \#+
       scope: punctuation.definition.comment.shell
       push: comments-body
+    - include: scope:text.diff3#conflicts  # merge conflict marker
 
   comments-body:
     - meta_scope: comment.line.number-sign.shell
@@ -2081,7 +2082,8 @@ contexts:
 
   # for use by inheriting syntaxes to easily inject string interpolation
   # in any kind of quoted or unquoted string
-  string-prototype: []
+  string-prototype:
+    - include: scope:text.diff3#conflicts  # merge conflict marker
 
 ###[ STRING PATH PATTERN MATCHING ]############################################
 

diff --git a/ShellScript/Bash/tests/syntax_test_scope.bash b/ShellScript/Bash/tests/syntax_test_scope.bash
@@ -98,6 +98,77 @@ $((
 ))
 
 
+###############################################################################
+# Git Conflict Marker Tests
+###############################################################################
+
+<<<<<<< HEAD
+# <- markup.conflict.begin.diff3 punctuation.section.conflict.diff3
+#^^^^^^ markup.conflict.begin.diff3 punctuation.section.conflict.diff3
+#      ^ markup.conflict.begin.diff3 - entity - punctuation
+#       ^^^^ markup.conflict.begin.diff3 entity.name.section.conflict.diff3
+#           ^ markup.conflict.begin.diff3 - entity - punctuation
+
+=======
+# <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3
+#^^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3
+#      ^ markup.conflict.separator.diff3 - punctuation
+
+>>>>>>> master
+# <- markup.conflict.end.diff3 punctuation.section.conflict.diff3
+#^^^^^^ markup.conflict.end.diff3 punctuation.section.conflict.diff3
+#      ^ markup.conflict.end.diff3 - entity - punctuation
+#       ^^^^^^ markup.conflict.end.diff3 entity.name.section.conflict.diff3
+#             ^ markup.conflict.end.diff3 - entity - punctuation
+
+## in braces
+
+{
+<<<<<<< HEAD
+# <- markup.conflict.begin.diff3 punctuation.section.conflict.diff3
+#^^^^^^ markup.conflict.begin.diff3 punctuation.section.conflict.diff3
+#      ^ markup.conflict.begin.diff3 - entity - punctuation
+#       ^^^^ markup.conflict.begin.diff3 entity.name.section.conflict.diff3
+#           ^ markup.conflict.begin.diff3 - entity - punctuation
+
+=======
+# <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3
+#^^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3
+#      ^ markup.conflict.separator.diff3 - punctuation
+
+>>>>>>> master
+# <- markup.conflict.end.diff3 punctuation.section.conflict.diff3
+#^^^^^^ markup.conflict.end.diff3 punctuation.section.conflict.diff3
+#      ^ markup.conflict.end.diff3 - entity - punctuation
+#       ^^^^^^ markup.conflict.end.diff3 entity.name.section.conflict.diff3
+#             ^ markup.conflict.end.diff3 - entity - punctuation
+}
+
+## heredoc
+
+var=<<EOF
+<<<<<<< HEAD
+# <- markup.conflict.begin.diff3 punctuation.section.conflict.diff3
+#^^^^^^ markup.conflict.begin.diff3 punctuation.section.conflict.diff3
+#      ^ markup.conflict.begin.diff3 - entity - punctuation
+#       ^^^^ markup.conflict.begin.diff3 entity.name.section.conflict.diff3
+#           ^ markup.conflict.begin.diff3 - entity - punctuation
+
+=======
+# <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3
+#^^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3
+#      ^ markup.conflict.separator.diff3 - punctuation
+
+>>>>>>> master
+# <- markup.conflict.end.diff3 punctuation.section.conflict.diff3
+#^^^^^^ markup.conflict.end.diff3 punctuation.section.conflict.diff3
+#      ^ markup.conflict.end.diff3 - entity - punctuation
+#       ^^^^^^ markup.conflict.end.diff3 entity.name.section.conflict.diff3
+#             ^ markup.conflict.end.diff3 - entity - punctuation
+}
+EOF
+
+
 ###############################################################################
 # 3.1.2 Quoting                                                               #
 # https://www.gnu.org/software/bash/manual/bash.html#Quoting                  #