From 789f839081657300b5b5d4a21202c708b20e45f8 Mon Sep 17 00:00:00 2001 From: deathaxe Date: Fri, 4 Oct 2024 18:00:07 +0200 Subject: [PATCH] [Common] Refactor scopes and syntax This commit... 1. applies more generic text.diff3 scope as those markers are not tight to git 2. renames and moves syntax definition to Packages/Text/Diff3.sublime-syntax --- ASP/ASP.sublime-syntax | 2 +- ASP/syntax_test_asp.asp | 52 ++-- AppleScript/AppleScript.sublime-syntax | 4 +- AppleScript/tests/syntax_test.applescript | 104 ++++---- Batch File/Batch File.sublime-syntax | 2 +- Batch File/tests/syntax_test_batch_file.bat | 26 +- C#/C#.sublime-syntax | 2 +- C#/tests/syntax_test_Comments.cs | 26 +- C++/C.sublime-syntax | 2 +- C++/syntax_test_c.c | 26 +- C++/syntax_test_cpp.cpp | 26 +- CSS/CSS.sublime-syntax | 4 +- CSS/tests/syntax_test_merge.css | 156 ++++++------ Clojure/Clojure.sublime-syntax | 2 +- Clojure/tests/syntax_test_clojure.clj | 26 +- D/D.sublime-syntax | 2 +- D/tests/syntax_test_d.d | 26 +- Erlang/Erlang.sublime-syntax | 2 +- Erlang/syntax_test_erlang.erl | 26 +- .../Git Merge - Symbol List.tmPreferences | 2 +- .../tests/syntax_test_git_merge_conflict | 95 ------- Go/Go.sublime-syntax | 2 +- Go/tests/syntax_test_go.go | 26 +- Go/tests/syntax_test_template.html | 26 +- Go/tests/syntax_test_template.md | 26 +- Go/tests/syntax_test_template.yaml | 26 +- Graphviz/DOT.sublime-syntax | 2 +- Graphviz/syntax_test_dot.dot | 52 ++-- Groovy/Groovy.sublime-syntax | 2 +- Groovy/syntax_test_groovy.groovy | 26 +- HTML/HTML (Plain).sublime-syntax | 16 +- HTML/syntax_test_html.html | 26 +- Haskell/Cabal.sublime-syntax | 2 +- Haskell/Haskell.sublime-syntax | 2 +- Haskell/tests/syntax_test_cabal.cabal | 52 ++-- Haskell/tests/syntax_test_haskell.hs | 26 +- Haskell/tests/syntax_test_literate.lhs | 26 +- JSON/JSON.sublime-syntax | 2 +- JSON/syntax_test_json.json | 26 +- Java/Java.sublime-syntax | 2 +- Java/tests/syntax_test_java.java | 26 +- JavaScript/JavaScript.sublime-syntax | 2 +- JavaScript/tests/syntax_test_js.js | 26 +- LaTeX/Bibtex.sublime-syntax | 2 +- LaTeX/TeX.sublime-syntax | 2 +- LaTeX/tests/syntax_test_bibtex.bib | 26 +- LaTeX/tests/syntax_test_docstrip.ins | 26 +- LaTeX/tests/syntax_test_latex.tex | 26 +- LaTeX/tests/syntax_test_tex.tex | 26 +- Lisp/Lisp.sublime-syntax | 2 +- Lisp/tests/syntax_test_lisp.lisp | 26 +- Lua/Lua.sublime-syntax | 2 +- Lua/tests/syntax_test_lua.lua | 26 +- Makefile/Makefile.sublime-syntax | 2 +- Makefile/syntax_test_makefile.mak | 26 +- Markdown/Markdown.sublime-syntax | 6 +- Markdown/tests/syntax_test_markdown.md | 78 +++--- Matlab/Matlab.sublime-syntax | 2 +- Matlab/syntax_test_matlab.matlab | 26 +- OCaml/OCaml.sublime-syntax | 2 +- OCaml/OCamllex.sublime-syntax | 2 +- OCaml/OCamlyacc.sublime-syntax | 2 +- OCaml/syntax_test_ml.ml | 26 +- OCaml/syntax_test_mly.mly | 26 +- Objective-C/syntax_test_objc++.mm | 26 +- Objective-C/syntax_test_objc.m | 26 +- PHP/PHP Source.sublime-syntax | 12 +- PHP/tests/syntax_test_php.php | 104 ++++---- Pascal/Pascal.sublime-syntax | 2 +- Pascal/syntax_test.pas | 26 +- Perl/Perl.sublime-syntax | 2 +- Perl/syntax_test_perl.pl | 78 +++--- Python/Python.sublime-syntax | 4 +- Python/tests/syntax_test_merge.py | 234 +++++++++--------- R/R.sublime-syntax | 2 +- R/syntax_test_r.R | 24 +- Rails/HAML.sublime-syntax | 2 +- Rails/tests/syntax_test_rails.haml | 26 +- .../reStructuredText.sublime-syntax | 2 +- .../syntax_test_restructuredtext.rst | 26 +- Ruby/Ruby.sublime-syntax | 10 +- Ruby/syntax_test_ruby.rb | 52 ++-- Rust/Rust.sublime-syntax | 2 +- Rust/tests/syntax_test_conflicts.rs | 78 +++--- Scala/Scala.sublime-syntax | 2 +- Scala/syntax_test_scala.scala | 26 +- .../Diff3.sublime-syntax | 22 +- Text/tests/syntax_test_merge_conflict | 95 +++++++ Textile/syntax_test_textile.textile | 26 +- XML/XML.sublime-syntax | 8 +- XML/syntax_test_xml.xml | 104 ++++---- YAML/YAML.sublime-syntax | 2 +- YAML/tests/syntax_test_general.yaml | 52 ++-- 93 files changed, 1236 insertions(+), 1236 deletions(-) delete mode 100644 Git Formats/tests/syntax_test_git_merge_conflict rename Git Formats/Git Merge.sublime-syntax => Text/Diff3.sublime-syntax (65%) create mode 100644 Text/tests/syntax_test_merge_conflict diff --git a/ASP/ASP.sublime-syntax b/ASP/ASP.sublime-syntax index 8e795ba765..ad902bfc8f 100644 --- a/ASP/ASP.sublime-syntax +++ b/ASP/ASP.sublime-syntax @@ -59,7 +59,7 @@ contexts: - include: root_asp - match: \n pop: true - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker line_continuation_char: - match: '\b_' diff --git a/ASP/syntax_test_asp.asp b/ASP/syntax_test_asp.asp index 6d82e5eea6..0bcc1b5122 100644 --- a/ASP/syntax_test_asp.asp +++ b/ASP/syntax_test_asp.asp @@ -1423,44 +1423,44 @@ test = "hello%> --> <<<<<<< HEAD -' <- markup.conflict.begin.git punctuation.section.conflict.git -' ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -' ^ markup.conflict.begin.git - entity - punctuation -' ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -' ^ markup.conflict.begin.git - entity - punctuation +' <- 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.git punctuation.section.conflict.git -' ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -' ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -' ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -' ^ markup.conflict.end.git - entity - punctuation -' ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -' ^ markup.conflict.end.git - entity - punctuation +' <- 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 <% <<<<<<< HEAD -' <- markup.conflict.begin.git punctuation.section.conflict.git -' ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -' ^ markup.conflict.begin.git - entity - punctuation -' ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -' ^ markup.conflict.begin.git - entity - punctuation +' <- 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.git punctuation.section.conflict.git -' ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -' ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -' ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -' ^ markup.conflict.end.git - entity - punctuation -' ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -' ^ markup.conflict.end.git - entity - punctuation +' <- 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 %> diff --git a/AppleScript/AppleScript.sublime-syntax b/AppleScript/AppleScript.sublime-syntax index 4c2bdd6a57..438826d77d 100644 --- a/AppleScript/AppleScript.sublime-syntax +++ b/AppleScript/AppleScript.sublime-syntax @@ -543,7 +543,7 @@ contexts: 0: punctuation.definition.comment.applescript pop: true - include: comments.nested - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker comments.nested: - match: \(\* @@ -556,7 +556,7 @@ contexts: 0: punctuation.definition.comment.applescript pop: true - include: comments.nested - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker data-structures: - match: '(\{)' diff --git a/AppleScript/tests/syntax_test.applescript b/AppleScript/tests/syntax_test.applescript index 69f1c91f06..9f7ea45066 100644 --- a/AppleScript/tests/syntax_test.applescript +++ b/AppleScript/tests/syntax_test.applescript @@ -1,83 +1,83 @@ -- SYNTAX TEST "Packages/AppleScript/AppleScript.sublime-syntax" <<<<<<< HEAD --- <- markup.conflict.begin.git punctuation.section.conflict.git ---^^^^^ markup.conflict.begin.git punctuation.section.conflict.git --- ^ markup.conflict.begin.git - entity - punctuation --- ^^^^ markup.conflict.begin.git entity.name.section.conflict.git --- ^ markup.conflict.begin.git - entity - punctuation +-- <- 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.git punctuation.section.conflict.git ---^^^^^ markup.conflict.separator.git punctuation.section.conflict.git --- ^ markup.conflict.separator.git - punctuation +-- <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +--^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +-- ^ markup.conflict.separator.diff3 - punctuation >>>>>>> foo/bar --- <- markup.conflict.end.git punctuation.section.conflict.git ---^^^^^ markup.conflict.end.git punctuation.section.conflict.git --- ^ markup.conflict.end.git - entity - punctuation --- ^^^^^^^ markup.conflict.end.git entity.name.section.conflict.git --- ^ markup.conflict.end.git - entity - punctuation +-- <- 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 (* Conflict in block comment <<<<<<< HEAD --- <- markup.conflict.begin.git punctuation.section.conflict.git ---^^^^^ markup.conflict.begin.git punctuation.section.conflict.git --- ^ markup.conflict.begin.git - entity - punctuation --- ^^^^ markup.conflict.begin.git entity.name.section.conflict.git --- ^ markup.conflict.begin.git - entity - punctuation +-- <- 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.git punctuation.section.conflict.git ---^^^^^ markup.conflict.separator.git punctuation.section.conflict.git --- ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git ---^^^^^ markup.conflict.end.git punctuation.section.conflict.git --- ^ markup.conflict.end.git - entity - punctuation --- ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git --- ^ markup.conflict.end.git - entity - punctuation +-- <- 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 *) { (* conflict in block *) <<<<<<< HEAD --- <- markup.conflict.begin.git punctuation.section.conflict.git ---^^^^^ markup.conflict.begin.git punctuation.section.conflict.git --- ^ markup.conflict.begin.git - entity - punctuation --- ^^^^ markup.conflict.begin.git entity.name.section.conflict.git --- ^ markup.conflict.begin.git - entity - punctuation +-- <- 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.git punctuation.section.conflict.git ---^^^^^ markup.conflict.separator.git punctuation.section.conflict.git --- ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git ---^^^^^ markup.conflict.end.git punctuation.section.conflict.git --- ^ markup.conflict.end.git - entity - punctuation --- ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git --- ^ markup.conflict.end.git - entity - punctuation +-- <- 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 } ( (* conflict in group *) <<<<<<< HEAD --- <- markup.conflict.begin.git punctuation.section.conflict.git ---^^^^^ markup.conflict.begin.git punctuation.section.conflict.git --- ^ markup.conflict.begin.git - entity - punctuation --- ^^^^ markup.conflict.begin.git entity.name.section.conflict.git --- ^ markup.conflict.begin.git - entity - punctuation +-- <- 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.git punctuation.section.conflict.git ---^^^^^ markup.conflict.separator.git punctuation.section.conflict.git --- ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git ---^^^^^ markup.conflict.end.git punctuation.section.conflict.git --- ^ markup.conflict.end.git - entity - punctuation --- ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git --- ^ markup.conflict.end.git - entity - punctuation +-- <- 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 ) diff --git a/Batch File/Batch File.sublime-syntax b/Batch File/Batch File.sublime-syntax index 2b72e35886..5cc28173e5 100644 --- a/Batch File/Batch File.sublime-syntax +++ b/Batch File/Batch File.sublime-syntax @@ -173,7 +173,7 @@ contexts: - match: '{{label_comment}}' scope: punctuation.definition.comment.dosbatch push: comment-body - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker comment-body: - meta_scope: comment.line.colon.dosbatch diff --git a/Batch File/tests/syntax_test_batch_file.bat b/Batch File/tests/syntax_test_batch_file.bat index 5e6a3ff04e..611e4f19c2 100644 --- a/Batch File/tests/syntax_test_batch_file.bat +++ b/Batch File/tests/syntax_test_batch_file.bat @@ -265,23 +265,23 @@ ECHO : Not a comment ^ :::: [ Git Conflict Marker Tests ]::::::::::::::::::::::::::::::::::::::::::::: <<<<<<< HEAD -:: <- markup.conflict.begin.git punctuation.section.conflict.git -::^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -:: ^ markup.conflict.begin.git - entity - punctuation -:: ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -:: ^ markup.conflict.begin.git - entity - punctuation +:: <- 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.git punctuation.section.conflict.git -::^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -:: ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -::^^^^^ markup.conflict.end.git punctuation.section.conflict.git -:: ^ markup.conflict.end.git - entity - punctuation -:: ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -:: ^ markup.conflict.end.git - entity - punctuation +:: <- 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 :::: [ @ Operator ] ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/C#/C#.sublime-syntax b/C#/C#.sublime-syntax index 1bca7575d8..5b12de5c0b 100644 --- a/C#/C#.sublime-syntax +++ b/C#/C#.sublime-syntax @@ -83,7 +83,7 @@ contexts: captures: 1: punctuation.definition.comment.cs - include: comments_in - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker comments_in: - match: \b(?i:todo|hack|xxx)\b diff --git a/C#/tests/syntax_test_Comments.cs b/C#/tests/syntax_test_Comments.cs index 0f800ece6c..8e04792170 100755 --- a/C#/tests/syntax_test_Comments.cs +++ b/C#/tests/syntax_test_Comments.cs @@ -54,22 +54,22 @@ void dcscmm(Transpose TransA, int m, int n, int k, class MergeConflict { <<<<<<< HEAD -// <- markup.conflict.begin.git punctuation.section.conflict.git -//^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation -// ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation +// <- 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 void main(int foo) { ======= -// <- markup.conflict.separator.git punctuation.section.conflict.git -//^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -// ^ markup.conflict.separator.git - punctuation +// <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +//^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +// ^ markup.conflict.separator.diff3 - punctuation void main(bool bar) { >>>>>>> master -// <- markup.conflict.end.git punctuation.section.conflict.git -//^^^^^ markup.conflict.end.git punctuation.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation -// ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation +// <- 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 } } \ No newline at end of file diff --git a/C++/C.sublime-syntax b/C++/C.sublime-syntax index 391045dc49..fee1b378b8 100644 --- a/C++/C.sublime-syntax +++ b/C++/C.sublime-syntax @@ -67,7 +67,7 @@ contexts: comments: - include: block-comments - include: line-comments - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker block-comments: - match: ^(/\*) =\s*(.*?)\s*= (\*/)$\n? diff --git a/C++/syntax_test_c.c b/C++/syntax_test_c.c index 41b3873cfd..4f29fa3bcd 100644 --- a/C++/syntax_test_c.c +++ b/C++/syntax_test_c.c @@ -86,23 +86,23 @@ */ <<<<<<< HEAD -/* <- markup.conflict.begin.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.begin.git punctuation.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ -/* ^^^^ markup.conflict.begin.git entity.name.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ +/* <- 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.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.separator.git punctuation.section.conflict.git */ -/* ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.end.git punctuation.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ -/* ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ +/* <- 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 */ int main(){ int a=5,b=0; diff --git a/C++/syntax_test_cpp.cpp b/C++/syntax_test_cpp.cpp index 1b4deaa213..2b1d444551 100644 --- a/C++/syntax_test_cpp.cpp +++ b/C++/syntax_test_cpp.cpp @@ -86,23 +86,23 @@ */ <<<<<<< HEAD -/* <- markup.conflict.begin.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.begin.git punctuation.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ -/* ^^^^ markup.conflict.begin.git entity.name.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ +/* <- 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.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.separator.git punctuation.section.conflict.git */ -/* ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.end.git punctuation.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ -/* ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ +/* <- 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 */ Task natural_numbers() { diff --git a/CSS/CSS.sublime-syntax b/CSS/CSS.sublime-syntax index e76d8872cc..deedf188e3 100644 --- a/CSS/CSS.sublime-syntax +++ b/CSS/CSS.sublime-syntax @@ -376,7 +376,7 @@ contexts: - match: /\*+ scope: punctuation.definition.comment.begin.css push: block-comment-body - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker block-comment-body: - meta_scope: comment.block.css @@ -386,7 +386,7 @@ contexts: - match: ^\s*(\*)(?!/) captures: 1: punctuation.definition.comment.css - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker ###[ AT RULES ]################################################################ diff --git a/CSS/tests/syntax_test_merge.css b/CSS/tests/syntax_test_merge.css index f6e601261b..929d9af636 100644 --- a/CSS/tests/syntax_test_merge.css +++ b/CSS/tests/syntax_test_merge.css @@ -1,126 +1,126 @@ /* SYNTAX TEST "Packages/CSS/CSS.sublime-syntax" */ <<<<<<< HEAD -/* <- markup.conflict.begin.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.begin.git punctuation.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ -/* ^^^^ markup.conflict.begin.git entity.name.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ +/* <- 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.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.separator.git punctuation.section.conflict.git */ -/* ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.end.git punctuation.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ -/* ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ +/* <- 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 block comments <<<<<<< HEAD -/* <- markup.conflict.begin.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.begin.git punctuation.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ -/* ^^^^ markup.conflict.begin.git entity.name.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ +/* <- 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 */ /* in block comments ======= -/* <- markup.conflict.separator.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.separator.git punctuation.section.conflict.git */ -/* ^ markup.conflict.separator.git - punctuation */ +/* <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3 */ +/*^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3 */ +/* ^ markup.conflict.separator.diff3 - punctuation */ /* in block comments >>>>>>> master -/* <- markup.conflict.end.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.end.git punctuation.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ -/* ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ +/* <- 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 */ @media { <<<<<<< HEAD -/* <- markup.conflict.begin.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.begin.git punctuation.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ -/* ^^^^ markup.conflict.begin.git entity.name.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ +/* <- 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.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.separator.git punctuation.section.conflict.git */ -/* ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.end.git punctuation.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ -/* ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ +/* <- 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 */ } > .class { <<<<<<< HEAD -/* <- markup.conflict.begin.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.begin.git punctuation.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ -/* ^^^^ markup.conflict.begin.git entity.name.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ +/* <- 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 */ color: ours; ======= -/* <- markup.conflict.separator.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.separator.git punctuation.section.conflict.git */ -/* ^ markup.conflict.separator.git - punctuation */ +/* <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3 */ +/*^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3 */ +/* ^ markup.conflict.separator.diff3 - punctuation */ color: theirs; >>>>>>> master -/* <- markup.conflict.end.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.end.git punctuation.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ -/* ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ +/* <- 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 */ > .nested { <<<<<<< HEAD -/* <- markup.conflict.begin.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.begin.git punctuation.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ -/* ^^^^ markup.conflict.begin.git entity.name.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ +/* <- 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 */ color: ours; ======= -/* <- markup.conflict.separator.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.separator.git punctuation.section.conflict.git */ -/* ^ markup.conflict.separator.git - punctuation */ +/* <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3 */ +/*^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3 */ +/* ^ markup.conflict.separator.diff3 - punctuation */ color: theirs; >>>>>>> master -/* <- markup.conflict.end.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.end.git punctuation.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ -/* ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ +/* <- 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 */ } } > [ <<<<<<< HEAD -/* <- markup.conflict.begin.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.begin.git punctuation.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ -/* ^^^^ markup.conflict.begin.git entity.name.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ +/* <- 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.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.separator.git punctuation.section.conflict.git */ -/* ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.end.git punctuation.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ -/* ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ +/* <- 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 */ ]; \ No newline at end of file diff --git a/Clojure/Clojure.sublime-syntax b/Clojure/Clojure.sublime-syntax index 054afb77d5..f59bc17a36 100644 --- a/Clojure/Clojure.sublime-syntax +++ b/Clojure/Clojure.sublime-syntax @@ -226,7 +226,7 @@ contexts: - match: \^ scope: keyword.operator.macro.clojure push: pop-expr - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker pop-dispatch-expr: - match: (?=\s) diff --git a/Clojure/tests/syntax_test_clojure.clj b/Clojure/tests/syntax_test_clojure.clj index 18d8fb1dee..c532d5a9e7 100644 --- a/Clojure/tests/syntax_test_clojure.clj +++ b/Clojure/tests/syntax_test_clojure.clj @@ -42,23 +42,23 @@ ; <<<<<<< HEAD -; <- markup.conflict.begin.git punctuation.section.conflict.git -; ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -; ^ markup.conflict.begin.git - entity - punctuation -; ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -; ^ markup.conflict.begin.git - entity - punctuation +; <- 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.git punctuation.section.conflict.git -; ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -; ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -; ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -; ^ markup.conflict.end.git - entity - punctuation -; ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -; ^ markup.conflict.end.git - entity - punctuation +; <- 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 ; # Constants diff --git a/D/D.sublime-syntax b/D/D.sublime-syntax index 7b0fc7a288..a8484f30f7 100644 --- a/D/D.sublime-syntax +++ b/D/D.sublime-syntax @@ -195,7 +195,7 @@ contexts: captures: 1: punctuation.definition.comment.d - include: nested-comment - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker nested-comment: - match: /\+(\+(?!/))? scope: punctuation.definition.comment.d diff --git a/D/tests/syntax_test_d.d b/D/tests/syntax_test_d.d index 0dd8e61619..fe575f2247 100644 --- a/D/tests/syntax_test_d.d +++ b/D/tests/syntax_test_d.d @@ -53,23 +53,23 @@ module foo.a.b1_3; */ <<<<<<< HEAD -// <- markup.conflict.begin.git punctuation.section.conflict.git -//^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation -// ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation +// <- 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -// ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.end.git punctuation.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation -// ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation +// <- 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 auto wysiwyg = r"f// \n\"; // ^^^^^^^^^^ meta.string.d string.quoted.double.raw.d diff --git a/Erlang/Erlang.sublime-syntax b/Erlang/Erlang.sublime-syntax index b15cf1b4e7..f070fb4785 100644 --- a/Erlang/Erlang.sublime-syntax +++ b/Erlang/Erlang.sublime-syntax @@ -238,7 +238,7 @@ contexts: - match: \%+ scope: punctuation.definition.comment.erlang push: comment-body - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker comment-body: - meta_include_prototype: false diff --git a/Erlang/syntax_test_erlang.erl b/Erlang/syntax_test_erlang.erl index f8eb97b991..19b56981ea 100644 --- a/Erlang/syntax_test_erlang.erl +++ b/Erlang/syntax_test_erlang.erl @@ -12,23 +12,23 @@ % <<<<<<< HEAD -% <- markup.conflict.begin.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -% ^ markup.conflict.begin.git - entity - punctuation -% ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -% ^ markup.conflict.begin.git - entity - punctuation +% <- 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.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -% ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -% ^ markup.conflict.end.git - entity - punctuation -% ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -% ^ markup.conflict.end.git - entity - punctuation +% <- 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 % Atom tests diff --git a/Git Formats/Git Merge - Symbol List.tmPreferences b/Git Formats/Git Merge - Symbol List.tmPreferences index b2e15785cf..5cb726030c 100644 --- a/Git Formats/Git Merge - Symbol List.tmPreferences +++ b/Git Formats/Git Merge - Symbol List.tmPreferences @@ -2,7 +2,7 @@ scope - markup.conflict.begin.git entity.name.section.conflict + markup.conflict.begin.diff3 entity.name.section.conflict settings showInSymbolList diff --git a/Git Formats/tests/syntax_test_git_merge_conflict b/Git Formats/tests/syntax_test_git_merge_conflict deleted file mode 100644 index d8242afe0e..0000000000 --- a/Git Formats/tests/syntax_test_git_merge_conflict +++ /dev/null @@ -1,95 +0,0 @@ -# SYNTAX TEST "Git Merge.sublime-syntax" - -<<<<<<< HEAD -# <- markup.conflict.begin.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation - -<<<<<<< path-like/branch -# <- markup.conflict.begin.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^^^^^^^^^^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation - -<<<<<<< b709551881dedb723fa6d621e51585ecb9856fb5 -# <- markup.conflict.begin.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation - -<<<<<<< v1.0.5-beta.5 -# <- markup.conflict.begin.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^^^^^^^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation - -<<<<<<< Updated upstream -# <- markup.conflict.begin.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^^^^^^^^^^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation - -||||||| -# <- markup.conflict.separator.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - punctuation - -||||||| name -# <- markup.conflict.separator.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - punctuation - entity -# ^^^^ markup.conflict.separator.git entity.name.section.conflict.git -# ^ markup.conflict.separator.git - punctuation - entity - -======= -# <- markup.conflict.separator.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - punctuation - -======= name -# <- markup.conflict.separator.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - punctuation - entity -# ^^^^ markup.conflict.separator.git entity.name.section.conflict.git -# ^ markup.conflict.separator.git - punctuation - entity - ->>>>>>> HEAD -# <- markup.conflict.end.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation - ->>>>>>> path-like/branch -# <- markup.conflict.end.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^^^^^^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation - ->>>>>>> b709551881dedb723fa6d621e51585ecb9856fb5 -# <- markup.conflict.end.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation - ->>>>>>> v1.0.5-beta.5 -# <- markup.conflict.end.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^^^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation - ->>>>>>> Stashed changes -# <- markup.conflict.end.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^^^^^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation diff --git a/Go/Go.sublime-syntax b/Go/Go.sublime-syntax index 13391f8c08..4b87d74958 100644 --- a/Go/Go.sublime-syntax +++ b/Go/Go.sublime-syntax @@ -153,7 +153,7 @@ contexts: - include: match-comment-magic - include: match-comment-line - include: match-comment-general - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker match-comment-magic: - include: match-comment-magic-general diff --git a/Go/tests/syntax_test_go.go b/Go/tests/syntax_test_go.go index 2b967bf715..397dc378ad 100644 --- a/Go/tests/syntax_test_go.go +++ b/Go/tests/syntax_test_go.go @@ -196,23 +196,23 @@ You may have to disable Go-specific linters when working on this file. */ <<<<<<< HEAD -// <- markup.conflict.begin.git punctuation.section.conflict.git -//^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation -// ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation +// <- 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -// ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.end.git punctuation.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation -// ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation +// <- 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 /* # Imports */ diff --git a/Go/tests/syntax_test_template.html b/Go/tests/syntax_test_template.html index 4ba9ce4e0b..d763e845b1 100644 --- a/Go/tests/syntax_test_template.html +++ b/Go/tests/syntax_test_template.html @@ -73,23 +73,23 @@ */ <<<<<<< HEAD -| <- markup.conflict.begin.git punctuation.section.conflict.git -| ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -| ^ markup.conflict.begin.git - entity - punctuation -| ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -| ^ markup.conflict.begin.git - entity - punctuation +| <- 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.git punctuation.section.conflict.git -| ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -| ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -| ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -| ^ markup.conflict.end.git - entity - punctuation -| ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -| ^ markup.conflict.end.git - entity - punctuation +| <- 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 {{/* | ^ - meta.interpolation diff --git a/Go/tests/syntax_test_template.md b/Go/tests/syntax_test_template.md index 81c341d021..07773aa23c 100644 --- a/Go/tests/syntax_test_template.md +++ b/Go/tests/syntax_test_template.md @@ -5,23 +5,23 @@ --> <<<<<<< HEAD -| <- markup.conflict.begin.git punctuation.section.conflict.git -| ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -| ^ markup.conflict.begin.git - entity - punctuation -| ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -| ^ markup.conflict.begin.git - entity - punctuation +| <- 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.git punctuation.section.conflict.git -| ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -| ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -| ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -| ^ markup.conflict.end.git - entity - punctuation -| ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -| ^ markup.conflict.end.git - entity - punctuation +| <- 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 diff --git a/Go/tests/syntax_test_template.yaml b/Go/tests/syntax_test_template.yaml index b99b32f490..764af0fe8d 100644 --- a/Go/tests/syntax_test_template.yaml +++ b/Go/tests/syntax_test_template.yaml @@ -3,23 +3,23 @@ # Merge Conflict Marker Tests <<<<<<< HEAD -# <- markup.conflict.begin.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation +# <- 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.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation +# <- 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 {{/* #^ - meta.string - meta.interpolation diff --git a/Graphviz/DOT.sublime-syntax b/Graphviz/DOT.sublime-syntax index b79ee3313a..3b10116b3f 100644 --- a/Graphviz/DOT.sublime-syntax +++ b/Graphviz/DOT.sublime-syntax @@ -18,7 +18,7 @@ contexts: - include: expressions expressions: - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker - match: \b((sub|di)?graph)\b\s+((cluster_)?\w+)\b captures: 1: storage.type.dot diff --git a/Graphviz/syntax_test_dot.dot b/Graphviz/syntax_test_dot.dot index b28ee73e71..1504821f0d 100644 --- a/Graphviz/syntax_test_dot.dot +++ b/Graphviz/syntax_test_dot.dot @@ -22,43 +22,43 @@ // ^^^^^^^ comment.line.number-sign.dot <<<<<<< HEAD -// <- markup.conflict.begin.git punctuation.section.conflict.git -//^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation -// ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation +// <- 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -// ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.end.git punctuation.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation -// ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation +// <- 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 graph n { <<<<<<< HEAD -// <- markup.conflict.begin.git punctuation.section.conflict.git -//^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation -// ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation +// <- 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -// ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.end.git punctuation.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation -// ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation +// <- 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 } graph n {} diff --git a/Groovy/Groovy.sublime-syntax b/Groovy/Groovy.sublime-syntax index 61d41166aa..eea30f59a1 100644 --- a/Groovy/Groovy.sublime-syntax +++ b/Groovy/Groovy.sublime-syntax @@ -117,7 +117,7 @@ contexts: - match: // scope: punctuation.definition.comment.groovy push: inside-line-comment - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker inside-line-comment: - meta_scope: comment.line.double-slash.groovy - match: $\n? diff --git a/Groovy/syntax_test_groovy.groovy b/Groovy/syntax_test_groovy.groovy index 71f69979d6..7a95fc8d28 100644 --- a/Groovy/syntax_test_groovy.groovy +++ b/Groovy/syntax_test_groovy.groovy @@ -3,23 +3,23 @@ // Merge Conflict Marker Tests <<<<<<< HEAD -// <- markup.conflict.begin.git punctuation.section.conflict.git -//^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation -// ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation +// <- 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -// ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.end.git punctuation.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation -// ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation +// <- 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 // Tests for issue 1260 diff --git a/HTML/HTML (Plain).sublime-syntax b/HTML/HTML (Plain).sublime-syntax index ce6ef58d60..2c5e49857e 100644 --- a/HTML/HTML (Plain).sublime-syntax +++ b/HTML/HTML (Plain).sublime-syntax @@ -167,19 +167,19 @@ contexts: # - reduce risk for them to break syntax highlighting # - and add first class support for Sublime Text as git merge tool - match: ^\s*(<{7}) ([-/\w]+)$\n? - scope: markup.conflict.begin.git + scope: markup.conflict.begin.diff3 captures: - 1: punctuation.section.conflict.git - 2: entity.name.section.conflict.git + 1: punctuation.section.conflict.diff3 + 2: entity.name.section.conflict.diff3 - match: ^\s*(>{7}) ([-/\w]+)$\n? - scope: markup.conflict.end.git + scope: markup.conflict.end.diff3 captures: - 1: punctuation.section.conflict.git - 2: entity.name.section.conflict.git + 1: punctuation.section.conflict.diff3 + 2: entity.name.section.conflict.diff3 - match: ^\s*(={7})$\n? - scope: markup.conflict.separator.git + scope: markup.conflict.separator.diff3 captures: - 1: punctuation.section.conflict.git + 1: punctuation.section.conflict.diff3 ###[ DOCTYPE DECLARATION ]#################################################### diff --git a/HTML/syntax_test_html.html b/HTML/syntax_test_html.html index 9da5b9deb8..a3c6056b3b 100644 --- a/HTML/syntax_test_html.html +++ b/HTML/syntax_test_html.html @@ -30,23 +30,23 @@ ## Merge Conflict Marker Tests <<<<<<< HEAD -## <- markup.conflict.begin.git punctuation.section.conflict.git -##^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -## ^ markup.conflict.begin.git - entity - punctuation -## ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -## ^ markup.conflict.begin.git - entity - punctuation +## <- 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.git punctuation.section.conflict.git -##^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -## ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -##^^^^^ markup.conflict.end.git punctuation.section.conflict.git -## ^ markup.conflict.end.git - entity - punctuation -## ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -## ^ markup.conflict.end.git - entity - punctuation +## <- 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 diff --git a/Haskell/Cabal.sublime-syntax b/Haskell/Cabal.sublime-syntax index 8a1d0248ee..0ab4ae469a 100644 --- a/Haskell/Cabal.sublime-syntax +++ b/Haskell/Cabal.sublime-syntax @@ -82,7 +82,7 @@ contexts: scope: comment.line.double-dash.cabal captures: 1: punctuation.definition.comment.cabal - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker ###[ SECTIONS ]################################################################ diff --git a/Haskell/Haskell.sublime-syntax b/Haskell/Haskell.sublime-syntax index 70b1a6d893..b4456ebeab 100644 --- a/Haskell/Haskell.sublime-syntax +++ b/Haskell/Haskell.sublime-syntax @@ -271,7 +271,7 @@ contexts: # https://www.haskell.org/onlinereport/haskell2010/haskellch2.html#x7-170002.3 - include: line-comments - include: block-comments - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker block-comments: - match: \{-(?!#) diff --git a/Haskell/tests/syntax_test_cabal.cabal b/Haskell/tests/syntax_test_cabal.cabal index c12651231e..9aed644ffb 100644 --- a/Haskell/tests/syntax_test_cabal.cabal +++ b/Haskell/tests/syntax_test_cabal.cabal @@ -1,23 +1,23 @@ -- SYNTAX TEST "Packages/Haskell/Cabal.sublime-syntax" <<<<<<< HEAD --- <- markup.conflict.begin.git punctuation.section.conflict.git ---^^^^^ markup.conflict.begin.git punctuation.section.conflict.git --- ^ markup.conflict.begin.git - entity - punctuation --- ^^^^ markup.conflict.begin.git entity.name.section.conflict.git --- ^ markup.conflict.begin.git - entity - punctuation +-- <- 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.git punctuation.section.conflict.git ---^^^^^ markup.conflict.separator.git punctuation.section.conflict.git --- ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git ---^^^^^ markup.conflict.end.git punctuation.section.conflict.git --- ^ markup.conflict.end.git - entity - punctuation --- ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git --- ^ markup.conflict.end.git - entity - punctuation +-- <- 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 cabal-version: >=2.2 -- <- meta.mapping.key.cabal entity.name.tag.cabal @@ -249,11 +249,11 @@ data-files: -- ^ punctuation.separator.sequence.cabal <<<<<<< HEAD --- <- markup.conflict.begin.git punctuation.section.conflict.git ---^^^^^ markup.conflict.begin.git punctuation.section.conflict.git --- ^ markup.conflict.begin.git - entity - punctuation --- ^^^^ markup.conflict.begin.git entity.name.section.conflict.git --- ^ markup.conflict.begin.git - entity - punctuation +-- <- 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 -- templates ../data/template?.../**/styles.html @@ -271,9 +271,9 @@ data-files: -- ^ - meta.path - markup.underline.link - string ======= --- <- markup.conflict.separator.git punctuation.section.conflict.git ---^^^^^ markup.conflict.separator.git punctuation.section.conflict.git --- ^ markup.conflict.separator.git - punctuation +-- <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +--^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +-- ^ markup.conflict.separator.diff3 - punctuation -- templates ../data/styles.html @@ -286,11 +286,11 @@ data-files: -- ^ - meta.path - markup.underline.link - string >>>>>>> master --- <- markup.conflict.end.git punctuation.section.conflict.git ---^^^^^ markup.conflict.end.git punctuation.section.conflict.git --- ^ markup.conflict.end.git - entity - punctuation --- ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git --- ^ markup.conflict.end.git - entity - punctuation +-- <- 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 build-depends: pandoc, -- <- meta.mapping.key.cabal entity.name.tag.cabal diff --git a/Haskell/tests/syntax_test_haskell.hs b/Haskell/tests/syntax_test_haskell.hs index af9e01b2ad..6c2d3b7d14 100644 --- a/Haskell/tests/syntax_test_haskell.hs +++ b/Haskell/tests/syntax_test_haskell.hs @@ -125,23 +125,23 @@ -- [ MERGE CONFLICT MARKER TESTS ]--------------------------------------------- <<<<<<< HEAD --- <- markup.conflict.begin.git punctuation.section.conflict.git ---^^^^^ markup.conflict.begin.git punctuation.section.conflict.git --- ^ markup.conflict.begin.git - entity - punctuation --- ^^^^ markup.conflict.begin.git entity.name.section.conflict.git --- ^ markup.conflict.begin.git - entity - punctuation +-- <- 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.git punctuation.section.conflict.git ---^^^^^ markup.conflict.separator.git punctuation.section.conflict.git --- ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git ---^^^^^ markup.conflict.end.git punctuation.section.conflict.git --- ^ markup.conflict.end.git - entity - punctuation --- ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git --- ^ markup.conflict.end.git - entity - punctuation +-- <- 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 -- [ PREPROCESSOR ] ----------------------------------------------------------- diff --git a/Haskell/tests/syntax_test_literate.lhs b/Haskell/tests/syntax_test_literate.lhs index f6931448da..2bb193cf07 100644 --- a/Haskell/tests/syntax_test_literate.lhs +++ b/Haskell/tests/syntax_test_literate.lhs @@ -1,23 +1,23 @@ % SYNTAX TEST "Packages/Haskell/Literate Haskell.sublime-syntax" <<<<<<< HEAD -% <- markup.conflict.begin.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -% ^ markup.conflict.begin.git - entity - punctuation -% ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -% ^ markup.conflict.begin.git - entity - punctuation +% <- 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.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -% ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -% ^ markup.conflict.end.git - entity - punctuation -% ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -% ^ markup.conflict.end.git - entity - punctuation +% <- 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 \begin{code} % ^^^^^^^^^^^^^ - source.haskell diff --git a/JSON/JSON.sublime-syntax b/JSON/JSON.sublime-syntax index d4c33a066a..7310cdd743 100644 --- a/JSON/JSON.sublime-syntax +++ b/JSON/JSON.sublime-syntax @@ -55,7 +55,7 @@ contexts: comments: - include: block-comments - include: line-comments - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker block-comments: # empty block comments diff --git a/JSON/syntax_test_json.json b/JSON/syntax_test_json.json index 1f6dd649ff..30918ce9a9 100644 --- a/JSON/syntax_test_json.json +++ b/JSON/syntax_test_json.json @@ -32,23 +32,23 @@ */ <<<<<<< HEAD -// <- markup.conflict.begin.git punctuation.section.conflict.git -//^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation -// ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation +// <- 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -// ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.end.git punctuation.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation -// ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation +// <- 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 { // <- meta.mapping.json punctuation.section.mapping.begin.json diff --git a/Java/Java.sublime-syntax b/Java/Java.sublime-syntax index 9affa27488..119ae4108e 100644 --- a/Java/Java.sublime-syntax +++ b/Java/Java.sublime-syntax @@ -174,7 +174,7 @@ contexts: comments: - include: line-comments - include: block-comments - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker block-comments: # empty block comments diff --git a/Java/tests/syntax_test_java.java b/Java/tests/syntax_test_java.java index 55b87b0166..5d4651d62e 100644 --- a/Java/tests/syntax_test_java.java +++ b/Java/tests/syntax_test_java.java @@ -471,23 +471,23 @@ *****************************************************************************/ <<<<<<< HEAD -// <- markup.conflict.begin.git punctuation.section.conflict.git -//^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation -// ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation +// <- 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -// ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.end.git punctuation.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation -// ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation +// <- 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 /****************************************************************************** diff --git a/JavaScript/JavaScript.sublime-syntax b/JavaScript/JavaScript.sublime-syntax index e76ad62825..3128b03d95 100644 --- a/JavaScript/JavaScript.sublime-syntax +++ b/JavaScript/JavaScript.sublime-syntax @@ -129,7 +129,7 @@ contexts: comments: - include: line-comments - include: block-comments - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker block-comments: # empty block comments diff --git a/JavaScript/tests/syntax_test_js.js b/JavaScript/tests/syntax_test_js.js index 30521de28d..29f3282a9f 100644 --- a/JavaScript/tests/syntax_test_js.js +++ b/JavaScript/tests/syntax_test_js.js @@ -84,23 +84,23 @@ //^^^^^^^^^^^^^^^^^^^^ comment.line.other.js - meta.preprocessor <<<<<<< HEAD -// <- markup.conflict.begin.git punctuation.section.conflict.git -//^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation -// ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation +// <- 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -// ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.end.git punctuation.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation -// ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation +// <- 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 // This object literal is technically broken since foo() does not have a // method body, but we include it here to ensure that highlighting is not diff --git a/LaTeX/Bibtex.sublime-syntax b/LaTeX/Bibtex.sublime-syntax index 898274018b..e3833aff58 100644 --- a/LaTeX/Bibtex.sublime-syntax +++ b/LaTeX/Bibtex.sublime-syntax @@ -23,7 +23,7 @@ contexts: - include: bibtex bibtex: - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker - include: line-comments - include: comments - include: declarations diff --git a/LaTeX/TeX.sublime-syntax b/LaTeX/TeX.sublime-syntax index 39e1fef594..ae5ae0b16f 100644 --- a/LaTeX/TeX.sublime-syntax +++ b/LaTeX/TeX.sublime-syntax @@ -145,7 +145,7 @@ contexts: comments: - match: '%.*$\n?' scope: comment.line.percentage.tex - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker ###[ BLOCKS ]################################################################### diff --git a/LaTeX/tests/syntax_test_bibtex.bib b/LaTeX/tests/syntax_test_bibtex.bib index 93dd31b170..3d07b8bc09 100644 --- a/LaTeX/tests/syntax_test_bibtex.bib +++ b/LaTeX/tests/syntax_test_bibtex.bib @@ -1,23 +1,23 @@ % SYNTAX TEST "Packages/LaTeX/Bibtex.sublime-syntax" <<<<<<< HEAD -% <- markup.conflict.begin.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -% ^ markup.conflict.begin.git - entity - punctuation -% ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -% ^ markup.conflict.begin.git - entity - punctuation +% <- 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.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -% ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -% ^ markup.conflict.end.git - entity - punctuation -% ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -% ^ markup.conflict.end.git - entity - punctuation +% <- 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 @string{mar = "march"} % <- meta.declaration.bibtex keyword.declaration.constant.bibtex punctuation.definition.keyword.bibtex diff --git a/LaTeX/tests/syntax_test_docstrip.ins b/LaTeX/tests/syntax_test_docstrip.ins index f74624dc9e..41bbabd06a 100644 --- a/LaTeX/tests/syntax_test_docstrip.ins +++ b/LaTeX/tests/syntax_test_docstrip.ins @@ -1,23 +1,23 @@ % SYNTAX TEST "Packages/LaTeX/DocStrip.sublime-syntax" <<<<<<< HEAD -% <- markup.conflict.begin.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -% ^ markup.conflict.begin.git - entity - punctuation -% ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -% ^ markup.conflict.begin.git - entity - punctuation +% <- 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.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -% ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -% ^ markup.conflict.end.git - entity - punctuation -% ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -% ^ markup.conflict.end.git - entity - punctuation +% <- 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 \input docstrip.tex diff --git a/LaTeX/tests/syntax_test_latex.tex b/LaTeX/tests/syntax_test_latex.tex index c9f20537a1..8a0eb878ef 100644 --- a/LaTeX/tests/syntax_test_latex.tex +++ b/LaTeX/tests/syntax_test_latex.tex @@ -3,23 +3,23 @@ % <- text.tex.latex <<<<<<< HEAD -% <- markup.conflict.begin.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -% ^ markup.conflict.begin.git - entity - punctuation -% ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -% ^ markup.conflict.begin.git - entity - punctuation +% <- 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.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -% ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -% ^ markup.conflict.end.git - entity - punctuation -% ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -% ^ markup.conflict.end.git - entity - punctuation +% <- 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 \documentclass[12pt]{article} diff --git a/LaTeX/tests/syntax_test_tex.tex b/LaTeX/tests/syntax_test_tex.tex index 899dab097e..aeebb1e8f2 100644 --- a/LaTeX/tests/syntax_test_tex.tex +++ b/LaTeX/tests/syntax_test_tex.tex @@ -5,23 +5,23 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% <<<<<<< HEAD -% <- markup.conflict.begin.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -% ^ markup.conflict.begin.git - entity - punctuation -% ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -% ^ markup.conflict.begin.git - entity - punctuation +% <- 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.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -% ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -% ^ markup.conflict.end.git - entity - punctuation -% ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -% ^ markup.conflict.end.git - entity - punctuation +% <- 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 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Macro definitions - \def, \gdef, \edef, \xdef diff --git a/Lisp/Lisp.sublime-syntax b/Lisp/Lisp.sublime-syntax index e7c543dc6f..ae99312897 100644 --- a/Lisp/Lisp.sublime-syntax +++ b/Lisp/Lisp.sublime-syntax @@ -55,7 +55,7 @@ contexts: comments: - include: line-comments - include: block-comments - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker - match: \|# scope: invalid.illegal.stray-comment-end.lisp diff --git a/Lisp/tests/syntax_test_lisp.lisp b/Lisp/tests/syntax_test_lisp.lisp index f414747c9d..e608726ed2 100644 --- a/Lisp/tests/syntax_test_lisp.lisp +++ b/Lisp/tests/syntax_test_lisp.lisp @@ -50,23 +50,23 @@ ;################## <<<<<<< HEAD -; <- markup.conflict.begin.git punctuation.section.conflict.git -; ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -; ^ markup.conflict.begin.git - entity - punctuation -; ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -; ^ markup.conflict.begin.git - entity - punctuation +; <- 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.git punctuation.section.conflict.git -; ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -; ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -; ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -; ^ markup.conflict.end.git - entity - punctuation -; ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -; ^ markup.conflict.end.git - entity - punctuation +; <- 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 ;######### ; ARRAYS # diff --git a/Lua/Lua.sublime-syntax b/Lua/Lua.sublime-syntax index 76ce37f109..378780ffaf 100644 --- a/Lua/Lua.sublime-syntax +++ b/Lua/Lua.sublime-syntax @@ -82,7 +82,7 @@ contexts: comments: - include: block-comments - include: line-comments - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker block-comments: - match: --\[\[-- diff --git a/Lua/tests/syntax_test_lua.lua b/Lua/tests/syntax_test_lua.lua index cba8b696cb..afcecfd82e 100644 --- a/Lua/tests/syntax_test_lua.lua +++ b/Lua/tests/syntax_test_lua.lua @@ -140,23 +140,23 @@ -- <<<<<<< HEAD --- <- markup.conflict.begin.git punctuation.section.conflict.git ---^^^^^ markup.conflict.begin.git punctuation.section.conflict.git --- ^ markup.conflict.begin.git - entity - punctuation --- ^^^^ markup.conflict.begin.git entity.name.section.conflict.git --- ^ markup.conflict.begin.git - entity - punctuation +-- <- 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.git punctuation.section.conflict.git ---^^^^^ markup.conflict.separator.git punctuation.section.conflict.git --- ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git ---^^^^^ markup.conflict.end.git punctuation.section.conflict.git --- ^ markup.conflict.end.git - entity - punctuation --- ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git --- ^ markup.conflict.end.git - entity - punctuation +-- <- 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 --VARIABLES diff --git a/Makefile/Makefile.sublime-syntax b/Makefile/Makefile.sublime-syntax index 934fb78ad8..d6e2474e35 100644 --- a/Makefile/Makefile.sublime-syntax +++ b/Makefile/Makefile.sublime-syntax @@ -377,7 +377,7 @@ contexts: - match: \# scope: punctuation.definition.comment.makefile push: comment-body - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker comment: - match: \# diff --git a/Makefile/syntax_test_makefile.mak b/Makefile/syntax_test_makefile.mak index 2d43c290bc..f242fe5760 100644 --- a/Makefile/syntax_test_makefile.mak +++ b/Makefile/syntax_test_makefile.mak @@ -28,23 +28,23 @@ multiline comment ################################# <<<<<<< HEAD -# <- markup.conflict.begin.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation +# <- 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.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation +# <- 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 ################################# # 6.3.1 substitution references # diff --git a/Markdown/Markdown.sublime-syntax b/Markdown/Markdown.sublime-syntax index cb82a51bf6..0f5fdf601d 100644 --- a/Markdown/Markdown.sublime-syntax +++ b/Markdown/Markdown.sublime-syntax @@ -338,7 +338,7 @@ contexts: 1: punctuation.section.frontmatter.end.markdown markdown: - - include: scope:text.git.merge#conflicts + - include: scope:text.diff3#conflicts - include: indented-code-blocks - include: thematic-breaks - include: block-quotes @@ -757,7 +757,7 @@ contexts: pop: 1 list-block-content: - - include: scope:text.git.merge#conflicts + - include: scope:text.diff3#conflicts - include: fenced-code-blocks - include: html-blocks - include: reference-definitions @@ -2476,7 +2476,7 @@ contexts: - include: link-ref markups: - - include: scope:text.git.merge#conflicts + - include: scope:text.diff3#conflicts # Markdown will convert this for us. We match it so that the # HTML grammar will not mark it up as invalid. - match: '[<>](-+|=+)[<>]?' diff --git a/Markdown/tests/syntax_test_markdown.md b/Markdown/tests/syntax_test_markdown.md index 8751897b44..3eebb161c6 100644 --- a/Markdown/tests/syntax_test_markdown.md +++ b/Markdown/tests/syntax_test_markdown.md @@ -8834,68 +8834,68 @@ Handle incomplete $\sqrt{b$ expressions well. Conflict in SETEXT heading <<<<<<< HEAD -| <- markup.conflict.begin.git punctuation.section.conflict.git -| ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -| ^ markup.conflict.begin.git - punctuation -| ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -| ^ markup.conflict.begin.git - punctuation +| <- markup.conflict.begin.diff3 punctuation.section.conflict.diff3 +| ^^^^^ markup.conflict.begin.diff3 punctuation.section.conflict.diff3 +| ^ markup.conflict.begin.diff3 - punctuation +| ^^^^ markup.conflict.begin.diff3 entity.name.section.conflict.diff3 +| ^ markup.conflict.begin.diff3 - punctuation ==== ======= -| <- markup.conflict.separator.git punctuation.section.conflict.git -| ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -| ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -| ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -| ^ markup.conflict.end.git - entity - punctuation -| ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -| ^ markup.conflict.end.git - entity - punctuation +| <- 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 <<<<<<< HEAD -| <- markup.conflict.begin.git punctuation.section.conflict.git -| ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -| ^ markup.conflict.begin.git - punctuation -| ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -| ^ markup.conflict.begin.git - punctuation +| <- markup.conflict.begin.diff3 punctuation.section.conflict.diff3 +| ^^^^^ markup.conflict.begin.diff3 punctuation.section.conflict.diff3 +| ^ markup.conflict.begin.diff3 - punctuation +| ^^^^ markup.conflict.begin.diff3 entity.name.section.conflict.diff3 +| ^ markup.conflict.begin.diff3 - punctuation # Conflicting in ATX Heading ======= -| <- markup.conflict.separator.git punctuation.section.conflict.git -| ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -| ^ markup.conflict.separator.git - punctuation +| <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +| ^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +| ^ markup.conflict.separator.diff3 - punctuation # Conflicting in ATX Heading >>>>>>> master -| <- markup.conflict.end.git punctuation.section.conflict.git -| ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -| ^ markup.conflict.end.git - entity - punctuation -| ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -| ^ markup.conflict.end.git - entity - punctuation +| <- 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 <<<<<<< HEAD -| <- markup.conflict.begin.git punctuation.section.conflict.git -| ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -| ^ markup.conflict.begin.git - entity - punctuation -| ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -| ^ markup.conflict.begin.git - entity - punctuation +| <- 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 our paragraph ======= -| <- markup.conflict.separator.git punctuation.section.conflict.git -| ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -| ^ markup.conflict.separator.git - punctuation +| <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +| ^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +| ^ markup.conflict.separator.diff3 - punctuation their paragraph >>>>>>> master -| <- markup.conflict.end.git punctuation.section.conflict.git -| ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -| ^ markup.conflict.end.git - entity - punctuation -| ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -| ^ markup.conflict.end.git - entity - punctuation +| <- 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 diff --git a/Matlab/Matlab.sublime-syntax b/Matlab/Matlab.sublime-syntax index ce6c34f5d2..8f504d9d19 100644 --- a/Matlab/Matlab.sublime-syntax +++ b/Matlab/Matlab.sublime-syntax @@ -461,7 +461,7 @@ contexts: comments: - include: block-comments - include: line-comments - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker block-comments: - match: ^\s*(%\{)\s*\n diff --git a/Matlab/syntax_test_matlab.matlab b/Matlab/syntax_test_matlab.matlab index 0c3c1d9dd0..12b714308b 100644 --- a/Matlab/syntax_test_matlab.matlab +++ b/Matlab/syntax_test_matlab.matlab @@ -4,23 +4,23 @@ % Merge Conflict Markers <<<<<<< HEAD -% <- markup.conflict.begin.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -% ^ markup.conflict.begin.git - entity - punctuation -% ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -% ^ markup.conflict.begin.git - entity - punctuation +% <- 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.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -% ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -% ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -% ^ markup.conflict.end.git - entity - punctuation -% ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -% ^ markup.conflict.end.git - entity - punctuation +% <- 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 %--------------------------------------------- % Matlab OOP diff --git a/OCaml/OCaml.sublime-syntax b/OCaml/OCaml.sublime-syntax index 9a62166446..855cb7f7a0 100644 --- a/OCaml/OCaml.sublime-syntax +++ b/OCaml/OCaml.sublime-syntax @@ -384,7 +384,7 @@ contexts: pop: true - match: '\\(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\d\d|[bnrt''"\\])' scope: comment.block.string.constant.character.escape.ocaml - - include: scope:text.git.merge#conflicts # merge conflict marker constants: + - include: scope:text.diff3#conflicts # merge conflict marker constants: constants: - match: '(?:\[\s*(\])|\((\))|\(\s*(\)))' scope: constant.language.pseudo-variable.ocaml diff --git a/OCaml/OCamllex.sublime-syntax b/OCaml/OCamllex.sublime-syntax index 46f2b7e916..894b10cfaf 100644 --- a/OCaml/OCamllex.sublime-syntax +++ b/OCaml/OCamllex.sublime-syntax @@ -96,7 +96,7 @@ contexts: pop: true - match: '\\(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\d\d|[bnrt''"\\])' scope: comment.block.string.constant.character.escape.ocaml - - include: scope:text.git.merge#conflicts # merge conflict marker match-patterns: + - include: scope:text.diff3#conflicts # merge conflict marker match-patterns: declaration-matches: - match: (\() captures: diff --git a/OCaml/OCamlyacc.sublime-syntax b/OCaml/OCamlyacc.sublime-syntax index 82ba46ab90..77fb8667ca 100644 --- a/OCaml/OCamlyacc.sublime-syntax +++ b/OCaml/OCamlyacc.sublime-syntax @@ -60,7 +60,7 @@ contexts: pop: true - match: '\\(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\d\d|[bnrt''"\\])' scope: comment.block.string.constant.character.escape.ocamlyacc - - include: scope:text.git.merge#conflicts # merge conflict marker declaration-matches: + - include: scope:text.diff3#conflicts # merge conflict marker declaration-matches: declaration-matches: - match: (%)(token) captures: diff --git a/OCaml/syntax_test_ml.ml b/OCaml/syntax_test_ml.ml index 01544f2ac5..1145e0b600 100644 --- a/OCaml/syntax_test_ml.ml +++ b/OCaml/syntax_test_ml.ml @@ -5,23 +5,23 @@ *) <<<<<<< HEAD -(* <- markup.conflict.begin.git punctuation.section.conflict.git *) -(*^^^^^ markup.conflict.begin.git punctuation.section.conflict.git *) -(* ^ markup.conflict.begin.git - entity - punctuation *) -(* ^^^^ markup.conflict.begin.git entity.name.section.conflict.git *) -(* ^ markup.conflict.begin.git - entity - punctuation *) +(* <- 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.git punctuation.section.conflict.git *) -(*^^^^^ markup.conflict.separator.git punctuation.section.conflict.git *) -(* ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git *) -(*^^^^^ markup.conflict.end.git punctuation.section.conflict.git *) -(* ^ markup.conflict.end.git - entity - punctuation *) -(* ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git *) -(* ^ markup.conflict.end.git - entity - punctuation *) +(* <- 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 *) let open Core.Std (*^^^ keyword.other.ocaml *) diff --git a/OCaml/syntax_test_mly.mly b/OCaml/syntax_test_mly.mly index cdf8bd45ad..894f5e2026 100644 --- a/OCaml/syntax_test_mly.mly +++ b/OCaml/syntax_test_mly.mly @@ -14,21 +14,21 @@ open Support.Error */ <<<<<<< HEAD -/* <- markup.conflict.begin.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.begin.git punctuation.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ -/* ^^^^ markup.conflict.begin.git entity.name.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ +/* <- 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.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.separator.git punctuation.section.conflict.git */ -/* ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.end.git punctuation.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ -/* ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ +/* <- 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 */ diff --git a/Objective-C/syntax_test_objc++.mm b/Objective-C/syntax_test_objc++.mm index c28333e5d9..62b41f4b5c 100644 --- a/Objective-C/syntax_test_objc++.mm +++ b/Objective-C/syntax_test_objc++.mm @@ -87,23 +87,23 @@ */ <<<<<<< HEAD -/* <- markup.conflict.begin.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.begin.git punctuation.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ -/* ^^^^ markup.conflict.begin.git entity.name.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ +/* <- 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.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.separator.git punctuation.section.conflict.git */ -/* ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.end.git punctuation.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ -/* ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ +/* <- 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 */ Task natural_numbers() { diff --git a/Objective-C/syntax_test_objc.m b/Objective-C/syntax_test_objc.m index bb79db7c9f..5ede45e09e 100644 --- a/Objective-C/syntax_test_objc.m +++ b/Objective-C/syntax_test_objc.m @@ -86,23 +86,23 @@ */ <<<<<<< HEAD -/* <- markup.conflict.begin.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.begin.git punctuation.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ -/* ^^^^ markup.conflict.begin.git entity.name.section.conflict.git */ -/* ^ markup.conflict.begin.git - entity - punctuation */ +/* <- 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.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.separator.git punctuation.section.conflict.git */ -/* ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git */ -/*^^^^^ markup.conflict.end.git punctuation.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ -/* ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git */ -/* ^ markup.conflict.end.git - entity - punctuation */ +/* <- 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 */ int main(){ int a=5,b=0; diff --git a/PHP/PHP Source.sublime-syntax b/PHP/PHP Source.sublime-syntax index eada2c4cd0..cd4844b580 100644 --- a/PHP/PHP Source.sublime-syntax +++ b/PHP/PHP Source.sublime-syntax @@ -595,7 +595,7 @@ contexts: - match: '#' scope: punctuation.definition.comment.php push: comment-line-number-sign-body - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker comment-block-body: - meta_include_prototype: false @@ -2508,7 +2508,7 @@ contexts: - meta_content_scope: meta.string.heredoc.php string.unquoted.heredoc.php - match: '{{heredoc_unquoted_end}}' pop: 1 - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker - include: string-escapes - include: string-placeholders - include: string-interpolations @@ -2517,7 +2517,7 @@ contexts: - meta_content_scope: meta.string.heredoc.php string.unquoted.heredoc.php - match: '{{heredoc_quoted_end}}' pop: 1 - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker - include: string-placeholders ###[ STRINGS ]################################################################ @@ -2538,7 +2538,7 @@ contexts: - match: \` scope: punctuation.definition.string.end.php pop: 1 - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker - include: string-escapes - include: string-interpolations - match: \\. @@ -2609,7 +2609,7 @@ contexts: - meta_include_prototype: false - meta_scope: meta.string.php - meta_content_scope: string.quoted.double.php - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker - include: string-double-quoted-end - include: string-escapes - include: string-placeholders @@ -2691,7 +2691,7 @@ contexts: - meta_include_prototype: false - meta_scope: meta.string.php - meta_content_scope: string.quoted.single.php - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker - include: string-single-quoted-end - include: string-single-quoted-placeholders - match: \\[\\''] diff --git a/PHP/tests/syntax_test_php.php b/PHP/tests/syntax_test_php.php index e1fb558b8b..45bbf467f9 100644 --- a/PHP/tests/syntax_test_php.php +++ b/PHP/tests/syntax_test_php.php @@ -439,85 +439,85 @@ // ^ - comment <<<<<<< HEAD -// <- markup.conflict.begin.git punctuation.section.conflict.git -//^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation -// ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation +// <- 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -// ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.end.git punctuation.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation -// ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation +// <- 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 { <<<<<<< HEAD -// <- markup.conflict.begin.git punctuation.section.conflict.git -//^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation -// ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation +// <- 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -// ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.end.git punctuation.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation -// ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation +// <- 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 } [ <<<<<<< HEAD -// <- markup.conflict.begin.git punctuation.section.conflict.git -//^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation -// ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation +// <- 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -// ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.end.git punctuation.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation -// ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation +// <- 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 ] <<>>>>>> master -// <- markup.conflict.end.git punctuation.section.conflict.git -//^^^^^ markup.conflict.end.git punctuation.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation -// ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation +// <- 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 /****************************************************************************** diff --git a/Pascal/Pascal.sublime-syntax b/Pascal/Pascal.sublime-syntax index 4abb17e0d5..af799f9339 100644 --- a/Pascal/Pascal.sublime-syntax +++ b/Pascal/Pascal.sublime-syntax @@ -16,7 +16,7 @@ first_line_match: |- contexts: prototype: - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker main: - match: \b(?i:(absolute|abstract|all|and|and_then|array|as|asm|attribute|begin|bindable|case|class|const|constructor|destructor|div|do|do|else|end|except|export|exports|external|far|file|finalization|finally|for|forward|goto|if|implementation|import|in|inherited|initialization|interface|interrupt|is|label|library|mod|module|name|near|nil|not|object|of|only|operator|or|or_else|otherwise|packed|pow|private|program|property|protected|public|published|qualified|record|repeat|resident|restricted|segment|set|shl|shr|then|to|try|type|unit|until|uses|value|var|view|virtual|while|with|xor))\b diff --git a/Pascal/syntax_test.pas b/Pascal/syntax_test.pas index 779a02a4b0..edd2f72110 100644 --- a/Pascal/syntax_test.pas +++ b/Pascal/syntax_test.pas @@ -27,20 +27,20 @@ procedure bar; // <- keyword.control.pascal <<<<<<< HEAD -// <- markup.conflict.begin.git punctuation.section.conflict.git -//^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation -// ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation +// <- 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -// ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.end.git punctuation.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation -// ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation +// <- 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 diff --git a/Perl/Perl.sublime-syntax b/Perl/Perl.sublime-syntax index 218e3e8f1c..22baaac7df 100644 --- a/Perl/Perl.sublime-syntax +++ b/Perl/Perl.sublime-syntax @@ -137,7 +137,7 @@ contexts: - include: expressions-common expressions-common: - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker - include: sub - include: quoted-like - include: label diff --git a/Perl/syntax_test_perl.pl b/Perl/syntax_test_perl.pl index 9eff876d2f..7ac373fb8f 100644 --- a/Perl/syntax_test_perl.pl +++ b/Perl/syntax_test_perl.pl @@ -147,67 +147,67 @@ =head1 B<--param> ###[ MERGE CONFLICT MARKERS ]################################################# <<<<<<< HEAD -# <- markup.conflict.begin.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation +# <- 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.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation +# <- 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 { # conflicts in blocks <<<<<<< HEAD -# <- markup.conflict.begin.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation +# <- 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.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation +# <- 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 } ( # conflicts in blocks <<<<<<< HEAD -# <- markup.conflict.begin.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation +# <- 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.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation +# <- 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 ) diff --git a/Python/Python.sublime-syntax b/Python/Python.sublime-syntax index 1d2c98e42b..0e2a9b093d 100644 --- a/Python/Python.sublime-syntax +++ b/Python/Python.sublime-syntax @@ -376,7 +376,7 @@ contexts: push: - comment-body - type-hint - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker comment-body: - meta_scope: comment.line.number-sign.python @@ -4165,7 +4165,7 @@ contexts: # for use by inheriting syntaxes to easily inject string interpolation # in any kind of quoted or unquoted string string-prototype: - - include: scope:text.git.merge#conflicts + - include: scope:text.diff3#conflicts ###[ PROTOTYPES ]############################################################# diff --git a/Python/tests/syntax_test_merge.py b/Python/tests/syntax_test_merge.py index 928baf7442..9e352adf46 100644 --- a/Python/tests/syntax_test_merge.py +++ b/Python/tests/syntax_test_merge.py @@ -3,31 +3,31 @@ ## Top-level <<<<<<< HEAD -# <- markup.conflict.begin.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation +# <- 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.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation +# <- 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_dicts = { <<<<<<< HEAD -# <- markup.conflict.begin.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation +# <- 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 "ours": "val", #^^^ meta.mapping.python # ^^^^^^ meta.mapping.key.python meta.string.python string.quoted.double.python @@ -40,9 +40,9 @@ # ^ punctuation.definition.string.end.python # ^ meta.mapping.python punctuation.separator.sequence.python ======= -# <- markup.conflict.separator.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - punctuation +# <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +# ^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +# ^ markup.conflict.separator.diff3 - punctuation "theirs": "bar" #^^^ meta.mapping.python # ^^^^^^^^ meta.mapping.key.python meta.string.python string.quoted.double.python @@ -54,197 +54,197 @@ # ^ punctuation.definition.string.begin.python # ^ punctuation.definition.string.end.python >>>>>>> master -# <- markup.conflict.end.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation +# <- 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_lists = [ <<<<<<< HEAD -# <- markup.conflict.begin.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation +# <- 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 "ours", # ^^^^^^ meta.sequence.list.python meta.string.python string.quoted.double.python # ^ punctuation.definition.string.begin.python # ^ punctuation.definition.string.end.python # ^ punctuation.separator.sequence.python ======= -# <- markup.conflict.separator.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - punctuation +# <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +# ^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +# ^ markup.conflict.separator.diff3 - punctuation "theirs" # ^^^^^^^^ meta.sequence.list.python meta.string.python string.quoted.double.python # ^ punctuation.definition.string.begin.python # ^ punctuation.definition.string.end.python >>>>>>> master -# <- markup.conflict.end.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation +# <- 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_sets = { <<<<<<< HEAD -# <- markup.conflict.begin.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation +# <- 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 "ours", # ^^^^^^ meta.set.python meta.string.python string.quoted.double.python # ^ punctuation.definition.string.begin.python # ^ punctuation.definition.string.end.python # ^ punctuation.separator.set.python ======= -# <- markup.conflict.separator.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - punctuation +# <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +# ^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +# ^ markup.conflict.separator.diff3 - punctuation "theirs" # ^^^^^^^^ meta.set.python meta.string.python string.quoted.double.python # ^ punctuation.definition.string.begin.python # ^ punctuation.definition.string.end.python >>>>>>> master -# <- markup.conflict.end.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation +# <- 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_tuples = ( <<<<<<< HEAD -# <- markup.conflict.begin.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation +# <- 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 "ours", # ^^^^^^ meta.sequence.tuple.python meta.string.python string.quoted.double.python # ^ punctuation.definition.string.begin.python # ^ punctuation.definition.string.end.python # ^ punctuation.separator.sequence.python ======= -# <- markup.conflict.separator.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - punctuation +# <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +# ^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +# ^ markup.conflict.separator.diff3 - punctuation "theirs" # ^^^^^^^^ meta.sequence.tuple.python meta.string.python string.quoted.double.python # ^ punctuation.definition.string.begin.python # ^ punctuation.definition.string.end.python >>>>>>> master -# <- markup.conflict.end.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation +# <- 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_strings = """ <<<<<<< HEAD -# <- markup.conflict.begin.git punctuation.section.conflict.git +# <- markup.conflict.begin.diff3 punctuation.section.conflict.diff3 #^^^^^^^^^^^^ meta.string.python string.quoted.double.block.python -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation +# ^^^^^ 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 ours #^^^^^^^ meta.string.python string.quoted.double.block.python ======= -# <- markup.conflict.separator.git punctuation.section.conflict.git +# <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3 #^^^^^^^ meta.string.python string.quoted.double.block.python -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - punctuation +# ^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +# ^ markup.conflict.separator.diff3 - punctuation theirs #^^^^^^^^^^ meta.string.python string.quoted.double.block.python >>>>>>> master -# <- markup.conflict.end.git punctuation.section.conflict.git +# <- markup.conflict.end.diff3 punctuation.section.conflict.diff3 #^^^^^^^^^^^^^^ meta.string.python string.quoted.double.block.python -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation +# ^^^^^ 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_strings = b""" <<<<<<< HEAD -# <- markup.conflict.begin.git punctuation.section.conflict.git +# <- markup.conflict.begin.diff3 punctuation.section.conflict.diff3 #^^^^^^^^^^^^ meta.string.python string.quoted.double.block.python -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation +# ^^^^^ 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 ours #^^^^^^^ meta.string.python string.quoted.double.block.python ======= -# <- markup.conflict.separator.git punctuation.section.conflict.git +# <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3 #^^^^^^^ meta.string.python string.quoted.double.block.python -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - punctuation +# ^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +# ^ markup.conflict.separator.diff3 - punctuation theirs #^^^^^^^^^^ meta.string.python string.quoted.double.block.python >>>>>>> master -# <- markup.conflict.end.git punctuation.section.conflict.git +# <- markup.conflict.end.diff3 punctuation.section.conflict.diff3 #^^^^^^^^^^^^^^ meta.string.python string.quoted.double.block.python -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation +# ^^^^^ 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_strings = f""" <<<<<<< HEAD -# <- markup.conflict.begin.git punctuation.section.conflict.git +# <- markup.conflict.begin.diff3 punctuation.section.conflict.diff3 #^^^^^^^^^^^^ meta.string.python string.quoted.double.block.python -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation +# ^^^^^ 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 ours #^^^^^^^ meta.string.python string.quoted.double.block.python ======= -# <- markup.conflict.separator.git punctuation.section.conflict.git +# <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3 #^^^^^^^ meta.string.python string.quoted.double.block.python -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - punctuation +# ^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +# ^ markup.conflict.separator.diff3 - punctuation theirs #^^^^^^^^^^ meta.string.python string.quoted.double.block.python >>>>>>> master -# <- markup.conflict.end.git punctuation.section.conflict.git +# <- markup.conflict.end.diff3 punctuation.section.conflict.diff3 #^^^^^^^^^^^^^^ meta.string.python string.quoted.double.block.python -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation +# ^^^^^ 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_strings = r""" <<<<<<< HEAD -# <- markup.conflict.begin.git punctuation.section.conflict.git +# <- markup.conflict.begin.diff3 punctuation.section.conflict.diff3 #^^^^^^^^^^^^ meta.string.python string.quoted.double.block.python -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation +# ^^^^^ 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 ours #^^^^^^^ meta.string.python string.quoted.double.block.python ======= -# <- markup.conflict.separator.git punctuation.section.conflict.git +# <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3 #^^^^^^^ meta.string.python string.quoted.double.block.python -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - punctuation +# ^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +# ^ markup.conflict.separator.diff3 - punctuation theirs #^^^^^^^^^^ meta.string.python string.quoted.double.block.python >>>>>>> master -# <- markup.conflict.end.git punctuation.section.conflict.git +# <- markup.conflict.end.diff3 punctuation.section.conflict.diff3 #^^^^^^^^^^^^^^ meta.string.python string.quoted.double.block.python -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation +# ^^^^^ 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 """ diff --git a/R/R.sublime-syntax b/R/R.sublime-syntax index 2c681ea912..c7e5d119d6 100644 --- a/R/R.sublime-syntax +++ b/R/R.sublime-syntax @@ -55,7 +55,7 @@ contexts: - meta_scope: comment.line.number-sign.r - match: \n pop: true - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker constants: - match: \b(pi|letters|LETTERS|month\.abb|month\.name)\b diff --git a/R/syntax_test_r.R b/R/syntax_test_r.R index bdefac9613..ddf4cd939a 100644 --- a/R/syntax_test_r.R +++ b/R/syntax_test_r.R @@ -73,22 +73,22 @@ # ^^^^^^ comment.line.number-sign.r - entity <<<<<<< HEAD -# <- markup.conflict.begin.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation +# <- 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.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git +# <- 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 # constants diff --git a/Rails/HAML.sublime-syntax b/Rails/HAML.sublime-syntax index 13d0637f52..b4d8d6e159 100644 --- a/Rails/HAML.sublime-syntax +++ b/Rails/HAML.sublime-syntax @@ -52,7 +52,7 @@ contexts: 2: meta.brackets.haml 3: punctuation.section.brackets.begin.haml 4: punctuation.section.brackets.end.haml - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker comment-body: - meta_include_prototype: false diff --git a/Rails/tests/syntax_test_rails.haml b/Rails/tests/syntax_test_rails.haml index 274a58e7c9..fdf8e7ab27 100644 --- a/Rails/tests/syntax_test_rails.haml +++ b/Rails/tests/syntax_test_rails.haml @@ -54,23 +54,23 @@ -# <- comment.block.haml <<<<<<< HEAD -/ <- markup.conflict.begin.git punctuation.section.conflict.git -/ ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -/ ^ markup.conflict.begin.git - entity - punctuation -/ ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -/ ^ markup.conflict.begin.git - entity - punctuation +/ <- 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.git punctuation.section.conflict.git -/ ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -/ ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -/ ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -/ ^ markup.conflict.end.git - entity - punctuation -/ ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -/ ^ markup.conflict.end.git - entity - punctuation +/ <- 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 %foo_bar / <- meta.tag.haml punctuation.definition.tag.haml diff --git a/RestructuredText/reStructuredText.sublime-syntax b/RestructuredText/reStructuredText.sublime-syntax index 92c92ec0f3..15b1d5a6a3 100644 --- a/RestructuredText/reStructuredText.sublime-syntax +++ b/RestructuredText/reStructuredText.sublime-syntax @@ -16,7 +16,7 @@ contexts: pop: true - include: inline inline: - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker - match: '^(\s*)((\.\.)\s+raw(::)) html' comment: directives.html captures: diff --git a/RestructuredText/syntax_test_restructuredtext.rst b/RestructuredText/syntax_test_restructuredtext.rst index 7037a09304..7f9ce32547 100644 --- a/RestructuredText/syntax_test_restructuredtext.rst +++ b/RestructuredText/syntax_test_restructuredtext.rst @@ -23,23 +23,23 @@ This is not a comment <<<<<<< HEAD -.. <- markup.conflict.begin.git punctuation.section.conflict.git -..^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -.. ^ markup.conflict.begin.git - entity - punctuation -.. ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -.. ^ markup.conflict.begin.git - entity - punctuation +.. <- 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.git punctuation.section.conflict.git -..^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -.. ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -..^^^^^ markup.conflict.end.git punctuation.section.conflict.git -.. ^ markup.conflict.end.git - entity - punctuation -.. ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -.. ^ markup.conflict.end.git - entity - punctuation +.. <- 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 Some text diff --git a/Ruby/Ruby.sublime-syntax b/Ruby/Ruby.sublime-syntax index 3288efbe58..16df083c5b 100644 --- a/Ruby/Ruby.sublime-syntax +++ b/Ruby/Ruby.sublime-syntax @@ -122,7 +122,7 @@ contexts: - meta_scope: comment.line.number-sign.ruby - match: \n pop: true - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker class: # Defining a class method @@ -2152,7 +2152,7 @@ contexts: - meta_scope: meta.string.heredoc.ruby - meta_content_scope: string.unquoted.heredoc.ruby - include: indented-heredoc-end - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker - include: interpolated-ruby - include: escaped-char @@ -2160,13 +2160,13 @@ contexts: - meta_scope: meta.string.heredoc.ruby - meta_content_scope: string.unquoted.heredoc.ruby - include: indented-heredoc-end - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker heredoc-plain-unindented-interpolated: - meta_scope: meta.string.heredoc.ruby - meta_content_scope: string.unquoted.heredoc.ruby - include: unindented-heredoc-end - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker - include: interpolated-ruby - include: escaped-char @@ -2174,7 +2174,7 @@ contexts: - meta_scope: meta.string.heredoc.ruby - meta_content_scope: string.unquoted.heredoc.ruby - include: unindented-heredoc-end - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker heredoc-shell: - match: (<<[-~])(["`]?)({{heredoc_type_shell}})(["`]?) diff --git a/Ruby/syntax_test_ruby.rb b/Ruby/syntax_test_ruby.rb index 9ff99efdf2..bc91107e09 100644 --- a/Ruby/syntax_test_ruby.rb +++ b/Ruby/syntax_test_ruby.rb @@ -32,43 +32,43 @@ ################## <<<<<<< HEAD -# <- markup.conflict.begin.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation +# <- 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.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation +# <- 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 puts <<~EOF; # comment <<<<<<< HEAD -# <- markup.conflict.begin.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation +# <- 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.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation +# <- 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 ################## diff --git a/Rust/Rust.sublime-syntax b/Rust/Rust.sublime-syntax index 55e6a184d3..03e071350a 100644 --- a/Rust/Rust.sublime-syntax +++ b/Rust/Rust.sublime-syntax @@ -1280,7 +1280,7 @@ contexts: comments: - include: line-comments - include: block-comments - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker line-comments: - match: //[!/] diff --git a/Rust/tests/syntax_test_conflicts.rs b/Rust/tests/syntax_test_conflicts.rs index a079079a10..2e62795ee9 100644 --- a/Rust/tests/syntax_test_conflicts.rs +++ b/Rust/tests/syntax_test_conflicts.rs @@ -1,62 +1,62 @@ // SYNTAX TEST "Packages/Rust/Rust.sublime-syntax" <<<<<<< HEAD -// <- markup.conflict.begin.git punctuation.section.conflict.git -//^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation -// ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation +// <- 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -// ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.end.git punctuation.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation -// ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation +// <- 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 { <<<<<<< HEAD -// <- markup.conflict.begin.git punctuation.section.conflict.git -//^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation -// ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation +// <- 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -// ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.end.git punctuation.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation -// ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation +// <- 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 } ( <<<<<<< HEAD -// <- markup.conflict.begin.git punctuation.section.conflict.git -//^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation -// ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation +// <- 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -// ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.end.git punctuation.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation -// ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation +// <- 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 ) \ No newline at end of file diff --git a/Scala/Scala.sublime-syntax b/Scala/Scala.sublime-syntax index fe3d2e5710..af949ba428 100644 --- a/Scala/Scala.sublime-syntax +++ b/Scala/Scala.sublime-syntax @@ -94,7 +94,7 @@ contexts: prototype: - include: comments - include: block-comments - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker main: - include: main-pre-lambdas diff --git a/Scala/syntax_test_scala.scala b/Scala/syntax_test_scala.scala index df48e51db9..fe6de4b89a 100644 --- a/Scala/syntax_test_scala.scala +++ b/Scala/syntax_test_scala.scala @@ -2,23 +2,23 @@ // <- source.scala comment.line.double-slash.scala <<<<<<< HEAD -// <- markup.conflict.begin.git punctuation.section.conflict.git -//^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation -// ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -// ^ markup.conflict.begin.git - entity - punctuation +// <- 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -// ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -//^^^^^ markup.conflict.end.git punctuation.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation -// ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -// ^ markup.conflict.end.git - entity - punctuation +// <- 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 package fubar // ^^^^ keyword.declaration.namespace.scala diff --git a/Git Formats/Git Merge.sublime-syntax b/Text/Diff3.sublime-syntax similarity index 65% rename from Git Formats/Git Merge.sublime-syntax rename to Text/Diff3.sublime-syntax index f456a5a9f0..00cde58c27 100644 --- a/Git Formats/Git Merge.sublime-syntax +++ b/Text/Diff3.sublime-syntax @@ -8,8 +8,8 @@ # # The `conflicts` context is included by all bundled syntax definitions # to help maintaining syntax highlighting when resolving merge conflicts. -name: Git Merge -scope: text.git.merge +name: Diff3 +scope: text.diff3 version: 2 contexts: @@ -21,17 +21,17 @@ contexts: # - reduce risk for them to break syntax highlighting # - and add first class support for Sublime Text as git merge tool - match: ^\s*(<{7})(?:[ ]([-/.\w ]+))?$\n? - scope: markup.conflict.begin.git + scope: markup.conflict.begin.diff3 captures: - 1: punctuation.section.conflict.git - 2: entity.name.section.conflict.git + 1: punctuation.section.conflict.diff3 + 2: entity.name.section.conflict.diff3 - match: ^\s*(>{7})(?:[ ]([-/.\w ]+))?$\n? - scope: markup.conflict.end.git + scope: markup.conflict.end.diff3 captures: - 1: punctuation.section.conflict.git - 2: entity.name.section.conflict.git + 1: punctuation.section.conflict.diff3 + 2: entity.name.section.conflict.diff3 - match: ^\s*(={7}|\|{7})(?:[ ]([-/.\w ]+))?$\n? - scope: markup.conflict.separator.git + scope: markup.conflict.separator.diff3 captures: - 1: punctuation.section.conflict.git - 2: entity.name.section.conflict.git + 1: punctuation.section.conflict.diff3 + 2: entity.name.section.conflict.diff3 diff --git a/Text/tests/syntax_test_merge_conflict b/Text/tests/syntax_test_merge_conflict new file mode 100644 index 0000000000..c2ea813434 --- /dev/null +++ b/Text/tests/syntax_test_merge_conflict @@ -0,0 +1,95 @@ +# SYNTAX TEST "Packages/Text/Diff3.sublime-syntax" + +<<<<<<< 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 + +<<<<<<< path-like/branch +# <- 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 + +<<<<<<< b709551881dedb723fa6d621e51585ecb9856fb5 +# <- 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 + +<<<<<<< v1.0.5-beta.5 +# <- 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 + +<<<<<<< Updated upstream +# <- 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 + +||||||| name +# <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +# ^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +# ^ markup.conflict.separator.diff3 - punctuation - entity +# ^^^^ markup.conflict.separator.diff3 entity.name.section.conflict.diff3 +# ^ markup.conflict.separator.diff3 - punctuation - entity + +======= +# <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +# ^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +# ^ markup.conflict.separator.diff3 - punctuation + +======= name +# <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +# ^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +# ^ markup.conflict.separator.diff3 - punctuation - entity +# ^^^^ markup.conflict.separator.diff3 entity.name.section.conflict.diff3 +# ^ markup.conflict.separator.diff3 - punctuation - entity + +>>>>>>> HEAD +# <- 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 + +>>>>>>> path-like/branch +# <- 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 + +>>>>>>> b709551881dedb723fa6d621e51585ecb9856fb5 +# <- 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 + +>>>>>>> v1.0.5-beta.5 +# <- 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 + +>>>>>>> Stashed changes +# <- 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 diff --git a/Textile/syntax_test_textile.textile b/Textile/syntax_test_textile.textile index 67740a11d1..58700d3e00 100644 --- a/Textile/syntax_test_textile.textile +++ b/Textile/syntax_test_textile.textile @@ -46,20 +46,20 @@ fn1. This is the footnote |^^^^^^^^^^^^^^^^^^^^^^^^ markup.other.footnote <<<<<<< HEAD -| <- markup.conflict.begin.git punctuation.section.conflict.git -| ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -| ^ markup.conflict.begin.git - entity - punctuation -| ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -| ^ markup.conflict.begin.git - entity - punctuation +| <- 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.git punctuation.section.conflict.git -| ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -| ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -| ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -| ^ markup.conflict.end.git - entity - punctuation -| ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -| ^ markup.conflict.end.git - entity - punctuation +| <- 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 diff --git a/XML/XML.sublime-syntax b/XML/XML.sublime-syntax index 27f6b30e81..8be4ab439d 100644 --- a/XML/XML.sublime-syntax +++ b/XML/XML.sublime-syntax @@ -145,7 +145,7 @@ variables: contexts: prototype: - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker main: - include: preprocessor @@ -177,7 +177,7 @@ contexts: - match: ']]>' scope: punctuation.definition.tag.end.xml pop: 1 - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker ###[ COMMENT ]################################################################ @@ -194,7 +194,7 @@ contexts: pop: 1 - match: -{2,} scope: invalid.illegal.double-hyphen-within-comment.xml - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker ###[ DOCTYPE DECLARATION ]#################################################### @@ -723,7 +723,7 @@ contexts: - include: string-common-content string-common-content: - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker - include: tag-end-missing-pop - include: entity - include: should-be-entity diff --git a/XML/syntax_test_xml.xml b/XML/syntax_test_xml.xml index a42ec6534c..501ff3a463 100644 --- a/XML/syntax_test_xml.xml +++ b/XML/syntax_test_xml.xml @@ -1943,86 +1943,86 @@ bar="baz" /> ############################################################################### <<<<<<< HEAD -## <- markup.conflict.begin.git punctuation.section.conflict.git -##^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -## ^ markup.conflict.begin.git - entity - punctuation -## ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -## ^ markup.conflict.begin.git - entity - punctuation +## <- 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.git punctuation.section.conflict.git -##^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -## ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -##^^^^^ markup.conflict.end.git punctuation.section.conflict.git -## ^ markup.conflict.end.git - entity - punctuation -## ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -## ^ markup.conflict.end.git - entity - punctuation +## <- 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 >>>>>> master -## <- markup.conflict.end.git punctuation.section.conflict.git -##^^^^^ markup.conflict.end.git punctuation.section.conflict.git -## ^ markup.conflict.end.git - entity - punctuation -## ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -## ^ markup.conflict.end.git - entity - punctuation +## <- 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 > ## <- meta.tag.xml punctuation.definition.tag.end.opening.xml >>>>>> master -## <- markup.conflict.end.git punctuation.section.conflict.git -##^^^^^ markup.conflict.end.git punctuation.section.conflict.git -## ^ markup.conflict.end.git - entity - punctuation -## ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -## ^ markup.conflict.end.git - entity - punctuation +## <- 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 ]]> ## <- meta.tag.sgml.cdata.xml punctuation.definition.tag.end.xml ======= -## <- markup.conflict.separator.git punctuation.section.conflict.git -##^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -## ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -##^^^^^ markup.conflict.end.git punctuation.section.conflict.git -## ^ markup.conflict.end.git - entity - punctuation -## ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -## ^ markup.conflict.end.git - entity - punctuation +## <- 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 ]> diff --git a/YAML/YAML.sublime-syntax b/YAML/YAML.sublime-syntax index adcb236e54..07e7d1481e 100644 --- a/YAML/YAML.sublime-syntax +++ b/YAML/YAML.sublime-syntax @@ -304,7 +304,7 @@ contexts: (?: ^ [ \t]* | [ \t]+ ) (?=\#) push: comment-begin - - include: scope:text.git.merge#conflicts # merge conflict marker + - include: scope:text.diff3#conflicts # merge conflict marker comment-begin: - meta_include_prototype: false diff --git a/YAML/tests/syntax_test_general.yaml b/YAML/tests/syntax_test_general.yaml index a28cda1ee7..d4dd6ee814 100644 --- a/YAML/tests/syntax_test_general.yaml +++ b/YAML/tests/syntax_test_general.yaml @@ -30,46 +30,46 @@ ## Merge Conflict Marker Tests <<<<<<< HEAD -# <- markup.conflict.begin.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation +# <- 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.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - 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.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation +# <- 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 context: context: - key: value <<<<<<< Updated upstream -# <- markup.conflict.begin.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.begin.git punctuation.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation -# ^^^^^^^^^^^^^^^^ markup.conflict.begin.git entity.name.section.conflict.git -# ^ markup.conflict.begin.git - entity - punctuation +# <- 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 - upstream: 'value' # <- punctuation.definition.block.sequence.item.yaml ======= -# <- markup.conflict.separator.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.separator.git punctuation.section.conflict.git -# ^ markup.conflict.separator.git - punctuation +# <- markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +# ^^^^^ markup.conflict.separator.diff3 punctuation.section.conflict.diff3 +# ^ markup.conflict.separator.diff3 - punctuation # current tag incoplete - local: 'value' # <- punctuation.definition.block.sequence.item.yaml >>>>>>> Stashed changes -# <- markup.conflict.end.git punctuation.section.conflict.git -# ^^^^^ markup.conflict.end.git punctuation.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation -# ^^^^^^^^^^^^^^^ markup.conflict.end.git entity.name.section.conflict.git -# ^ markup.conflict.end.git - entity - punctuation +# <- 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