[Common] Add git conflict marker highlighting

ASP/ASP.sublime-syntax

@@ -59,6 +59,25 @@ contexts:
         - include: root_asp
         - match: \n
           pop: true
+    - include: merge-conflict-markers
+
+  merge-conflict-markers:
+    # see also: Diff.sublime-syntax#conflict-markers
+    - match: ^(<{7})(?:\s+(\S.*?))?$\n?
+      scope: meta.block.conflict.begin.diff
+      captures:
+        1: punctuation.section.block.begin.diff
+        2: entity.name.section.diff
+    - match: ^(>{7})(?:\s+(\S.*?))?$\n?
+      scope: meta.block.conflict.end.diff
+      captures:
+        1: punctuation.section.block.end.diff
+        2: entity.name.section.diff
+    - match: ^(\|{7}|={7})(?:\s+(\S.*?))?$\n?
+      scope: meta.block.conflict.separator.diff
+      captures:
+        1: punctuation.section.block.diff
+        2: entity.name.section.diff
 
   line_continuation_char:
     - match: '\b_'

ASP/syntax_test_asp.asp

@@ -1422,6 +1422,52 @@ test = "hello%>
 '                             ^^ punctuation.section.embedded.end.asp
 '                               ^^ punctuation.definition.tag.end.html
 
+<!-- 
+ --- Git Conflict Marker Tests 
+ -->
+
+<<<<<<< HEAD
+'  <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
+' ^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
+'      ^ meta.block.conflict.begin.diff - entity - punctuation
+'       ^^^^ meta.block.conflict.begin.diff entity.name.section.diff
+'           ^ meta.block.conflict.begin.diff - entity - punctuation
+
+=======
+'  <- meta.block.conflict.separator.diff punctuation.section.block.diff
+' ^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff
+'      ^ meta.block.conflict.separator.diff - punctuation
+
+>>>>>>> master
+'  <- meta.block.conflict.end.diff punctuation.section.block.end.diff
+' ^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff
+'      ^ meta.block.conflict.end.diff - entity - punctuation
+'       ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff
+'             ^ meta.block.conflict.end.diff - entity - punctuation
+
+<%
+
+<<<<<<< HEAD
+'  <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
+' ^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
+'      ^ meta.block.conflict.begin.diff - entity - punctuation
+'       ^^^^ meta.block.conflict.begin.diff entity.name.section.diff
+'           ^ meta.block.conflict.begin.diff - entity - punctuation
+
+=======
+'  <- meta.block.conflict.separator.diff punctuation.section.block.diff
+' ^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff
+'      ^ meta.block.conflict.separator.diff - punctuation
+
+>>>>>>> master
+'  <- meta.block.conflict.end.diff punctuation.section.block.end.diff
+' ^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff
+'      ^ meta.block.conflict.end.diff - entity - punctuation
+'       ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff
+'             ^ meta.block.conflict.end.diff - entity - punctuation
+
+%>
+
  </body>
 '^^^^^^^ meta.tag.structure.any.html
 <script type="text/javascript">

ActionScript/ActionScript.sublime-syntax

@@ -36,6 +36,7 @@ contexts:
   comments:
     - include: line-comments
     - include: block-comments
+    - include: merge-conflict-markers
 
 ###[ COMMENTS / LINE COMMENTS ]################################################
 
@@ -69,6 +70,26 @@ contexts:
       captures:
         1: punctuation.definition.comment.actionscript
 
+###[ MERGE CONFLICT MARKERS ]##################################################
+
+  merge-conflict-markers:
+    # see also: Diff.sublime-syntax#conflict-markers
+    - match: ^(<{7})(?:\s+(\S.*?))?$\n?
+      scope: meta.block.conflict.begin.diff
+      captures:
+        1: punctuation.section.block.begin.diff
+        2: entity.name.section.diff
+    - match: ^(>{7})(?:\s+(\S.*?))?$\n?
+      scope: meta.block.conflict.end.diff
+      captures:
+        1: punctuation.section.block.end.diff
+        2: entity.name.section.diff
+    - match: ^(\|{7}|={7})(?:\s+(\S.*?))?$\n?
+      scope: meta.block.conflict.separator.diff
+      captures:
+        1: punctuation.section.block.diff
+        2: entity.name.section.diff
+
 ###[ STRINGS ]#################################################################
 
   strings:

ActionScript/syntax_test_as.as

@@ -40,16 +40,39 @@
      */
 
 
+///[ DIFF MERGE CONFLICTS ]////////////////////////////////////////////////////
+
+
+<<<<<<< HEAD
+// <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
+//^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
+//     ^ meta.block.conflict.begin.diff - entity - punctuation
+//      ^^^^ meta.block.conflict.begin.diff entity.name.section.diff
+//          ^ meta.block.conflict.begin.diff - entity - punctuation
+
+=======
+// <- meta.block.conflict.separator.diff punctuation.section.block.diff
+//^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff
+//     ^ meta.block.conflict.separator.diff - punctuation
+
+>>>>>>> master
+// <- meta.block.conflict.end.diff punctuation.section.block.end.diff
+//^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff
+//     ^ meta.block.conflict.end.diff - entity - punctuation
+//      ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff
+//            ^ meta.block.conflict.end.diff - entity - punctuation
+
 
 ///[ PREPROCESSOR ]////////////////////////////////////////////////////////////
 
+
 #initclip
 #endinitclip
 
 #include "relative_path.as"
 
-///[ STRINGS ]/////////////////////////////////////////////////////////////////
 
+///[ STRINGS ]/////////////////////////////////////////////////////////////////
 
 
     var strDouble = "...\"...";
@@ -61,11 +84,9 @@
 //                      ^^ constant.character.escape
 
 
-
 ///[ TYPES ]///////////////////////////////////////////////////////////////////
 
 
-
     var typeBoolean:Boolean = true;
 //                  ^^^^^^^ storage.type
 
@@ -85,11 +106,9 @@
 //                 ^^^^^^ storage.type
 
 
-
 ///[ CONSTANTS ]///////////////////////////////////////////////////////////////
 
 
-
     var isFalse:Boolean = false;
 //                        ^^^^^ constant.language.boolean
 
@@ -120,11 +139,9 @@
 //                       ^^^^^^^^ constant.language.infinity
 
 
-
 ///[ NUMBERS ]/////////////////////////////////////////////////////////////////
 
 
-
     var intZero:Number = 0;
 //                       ^ meta.number constant.numeric
     var intNine:Number = 9;
@@ -146,11 +163,9 @@
 //                             ^^^ meta.number constant.numeric
 
 
-
 ///[ KEYWORDS ]////////////////////////////////////////////////////////////////
 
 
-
     case
 //  ^^^^ keyword.control.conditional.case
     default

AppleScript/AppleScript.sublime-syntax

@@ -543,6 +543,8 @@ contexts:
             0: punctuation.definition.comment.applescript
           pop: true
         - include: comments.nested
+    - include: merge-conflict-markers
+
   comments.nested:
     - match: \(\*
       captures:
@@ -554,6 +556,26 @@ contexts:
             0: punctuation.definition.comment.applescript
           pop: true
         - include: comments.nested
+    - include: merge-conflict-markers
+
+  merge-conflict-markers:
+    # see also: Diff.sublime-syntax#conflict-markers
+    - match: ^(<{7})(?:\s+(\S.*?))?$\n?
+      scope: meta.block.conflict.begin.diff
+      captures:
+        1: punctuation.section.block.begin.diff
+        2: entity.name.section.diff
+    - match: ^(>{7})(?:\s+(\S.*?))?$\n?
+      scope: meta.block.conflict.end.diff
+      captures:
+        1: punctuation.section.block.end.diff
+        2: entity.name.section.diff
+    - match: ^(\|{7}|={7})(?:\s+(\S.*?))?$\n?
+      scope: meta.block.conflict.separator.diff
+      captures:
+        1: punctuation.section.block.diff
+        2: entity.name.section.diff
+
   data-structures:
     - match: '(\{)'
       comment: We cannot necessarily distinguish "records" from "arrays", and so this could be either.

AppleScript/tests/syntax_test_applescript.applescript

@@ -0,0 +1,83 @@
+-- SYNTAX TEST "Packages/AppleScript/AppleScript.sublime-syntax"
+
+<<<<<<< HEAD
+-- <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
+--^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
+--     ^ meta.block.conflict.begin.diff - entity - punctuation
+--      ^^^^ meta.block.conflict.begin.diff entity.name.section.diff
+--          ^ meta.block.conflict.begin.diff - entity - punctuation
+
+=======
+-- <- meta.block.conflict.separator.diff punctuation.section.block.diff
+--^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff
+--     ^ meta.block.conflict.separator.diff - punctuation
+
+>>>>>>> master
+-- <- meta.block.conflict.end.diff punctuation.section.block.end.diff
+--^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff
+--     ^ meta.block.conflict.end.diff - entity - punctuation
+--      ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff
+--            ^ meta.block.conflict.end.diff - entity - punctuation
+
+(* Conflict in block comment
+<<<<<<< HEAD
+-- <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
+--^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
+--     ^ meta.block.conflict.begin.diff - entity - punctuation
+--      ^^^^ meta.block.conflict.begin.diff entity.name.section.diff
+--          ^ meta.block.conflict.begin.diff - entity - punctuation
+
+=======
+-- <- meta.block.conflict.separator.diff punctuation.section.block.diff
+--^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff
+--     ^ meta.block.conflict.separator.diff - punctuation
+
+>>>>>>> master
+-- <- meta.block.conflict.end.diff punctuation.section.block.end.diff
+--^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff
+--     ^ meta.block.conflict.end.diff - entity - punctuation
+--      ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff
+--            ^ meta.block.conflict.end.diff - entity - punctuation
+*)
+
+{ (* conflict in block *)
+<<<<<<< HEAD
+-- <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
+--^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
+--     ^ meta.block.conflict.begin.diff - entity - punctuation
+--      ^^^^ meta.block.conflict.begin.diff entity.name.section.diff
+--          ^ meta.block.conflict.begin.diff - entity - punctuation
+
+=======
+-- <- meta.block.conflict.separator.diff punctuation.section.block.diff
+--^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff
+--     ^ meta.block.conflict.separator.diff - punctuation
+
+>>>>>>> master
+-- <- meta.block.conflict.end.diff punctuation.section.block.end.diff
+--^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff
+--     ^ meta.block.conflict.end.diff - entity - punctuation
+--      ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff
+--            ^ meta.block.conflict.end.diff - entity - punctuation
+}
+
+( (* conflict in group *)
+<<<<<<< HEAD
+-- <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
+--^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
+--     ^ meta.block.conflict.begin.diff - entity - punctuation
+--      ^^^^ meta.block.conflict.begin.diff entity.name.section.diff
+--          ^ meta.block.conflict.begin.diff - entity - punctuation
+
+=======
+-- <- meta.block.conflict.separator.diff punctuation.section.block.diff
+--^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff
+--     ^ meta.block.conflict.separator.diff - punctuation
+
+>>>>>>> master
+-- <- meta.block.conflict.end.diff punctuation.section.block.end.diff
+--^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff
+--     ^ meta.block.conflict.end.diff - entity - punctuation
+--      ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff
+--            ^ meta.block.conflict.end.diff - entity - punctuation
+)

Batch File/Batch File.sublime-syntax

@@ -173,6 +173,7 @@ contexts:
     - match: '{{label_comment}}'
       scope: punctuation.definition.comment.dosbatch
       push: comment-body
+    - include: merge-conflict-markers
 
   comment-body:
     - meta_scope: comment.line.colon.dosbatch
@@ -199,6 +200,26 @@ contexts:
     - match: '{{unquoted_word_begin}}'
       push: unquoted-word-end
 
+###[ MERGE CONFLICT MARKERS ]##################################################
+
+  merge-conflict-markers:
+    # see also: Diff.sublime-syntax#conflict-markers
+    - match: ^(<{7})(?:\s+(\S.*?))?$\n?
+      scope: meta.block.conflict.begin.diff
+      captures:
+        1: punctuation.section.block.begin.diff
+        2: entity.name.section.diff
+    - match: ^(>{7})(?:\s+(\S.*?))?$\n?
+      scope: meta.block.conflict.end.diff
+      captures:
+        1: punctuation.section.block.end.diff
+        2: entity.name.section.diff
+    - match: ^(\|{7}|={7})(?:\s+(\S.*?))?$\n?
+      scope: meta.block.conflict.separator.diff
+      captures:
+        1: punctuation.section.block.diff
+        2: entity.name.section.diff
+
 ###[ LABELS ]#################################################################
 
   labels: