Skip to content

JSON: Add support for merge conflict markers #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 21, 2025
Merged

JSON: Add support for merge conflict markers #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions Package/Sublime JSON/Sublime JSON.sublime-syntax
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,39 @@ contexts:
- match: \*/
scope: punctuation.definition.comment.end.json
pop: true
- include: merge-conflict-markers
- match: (//).*$\n?
scope: comment.line.double-slash.js
captures:
1: punctuation.definition.comment.json
- include: merge-conflict-markers

only-comments:
- include: comments
- match: '[^/\s]+'
scope: invalid.illegal.expected-comment-or-eof.sublime

#################################################
# Merge Conflict Markers
#################################################

merge-conflict-markers:
# see also: Diff.sublime-syntax#conflict-markers
- match: ^(<{7})(?:\s+(\S.*?))?$\n?
scope: meta.block.conflict.begin.diff
captures:
1: punctuation.section.block.begin.diff
2: entity.name.section.diff
- match: ^(>{7})(?:\s+(\S.*?))?$\n?
scope: meta.block.conflict.end.diff
captures:
1: punctuation.section.block.end.diff
2: entity.name.section.diff
- match: ^(\|{7}|={7})(?:\s+(\S.*?))?$\n?
scope: meta.block.conflict.separator.diff
captures:
1: punctuation.section.block.diff
2: entity.name.section.diff

#################################################
# Any
Expand Down
108 changes: 108 additions & 0 deletions Package/Sublime JSON/syntax_test_sublime_json.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,111 @@
// ^^^^^^^^^^^^ meta.mapping.value.json meta.mapping - meta.mapping meta.mapping meta.mapping
// ^^^^ meta.mapping.value.json meta.mapping.key.json string.quoted.double.json
//

/*
* Merge Conflict Marker Tests
*/

<<<<<<< HEAD
// <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
//^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation
// ^^^^ meta.block.conflict.begin.diff entity.name.section.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation

=======
// <- meta.block.conflict.separator.diff punctuation.section.block.diff
//^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff
// ^ meta.block.conflict.separator.diff - punctuation

>>>>>>> master
// <- meta.block.conflict.end.diff punctuation.section.block.end.diff
//^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff
// ^ meta.block.conflict.end.diff - entity - punctuation
// ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff
// ^ meta.block.conflict.end.diff - entity - punctuation

{ /* Merge conflictes in objects */
<<<<<<< HEAD
// <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
//^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation
// ^^^^ meta.block.conflict.begin.diff entity.name.section.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation

=======
// <- meta.block.conflict.separator.diff punctuation.section.block.diff
//^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff
// ^ meta.block.conflict.separator.diff - punctuation

>>>>>>> master
// <- meta.block.conflict.end.diff punctuation.section.block.end.diff
//^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff
// ^ meta.block.conflict.end.diff - entity - punctuation
// ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff
// ^ meta.block.conflict.end.diff - entity - punctuation

"key":
// ^^^^^ meta.mapping.key.json string.quoted.double.json
<<<<<<< HEAD
// <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
//^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation
// ^^^^ meta.block.conflict.begin.diff entity.name.section.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation
"value"
// ^^^^^^^ meta.mapping.value.json string.quoted.double.json
=======
// <- meta.block.conflict.separator.diff punctuation.section.block.diff
//^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff
// ^ meta.block.conflict.separator.diff - punctuation

>>>>>>> master
// <- meta.block.conflict.end.diff punctuation.section.block.end.diff
//^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff
// ^ meta.block.conflict.end.diff - entity - punctuation
// ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff
}

[ /* Merge conflictes in lists */
<<<<<<< HEAD
// <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
//^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation
// ^^^^ meta.block.conflict.begin.diff entity.name.section.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation

=======
// <- meta.block.conflict.separator.diff punctuation.section.block.diff
//^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff
// ^ meta.block.conflict.separator.diff - punctuation

>>>>>>> master
// <- meta.block.conflict.end.diff punctuation.section.block.end.diff
//^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff
// ^ meta.block.conflict.end.diff - entity - punctuation
// ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff
// ^ meta.block.conflict.end.diff - entity - punctuation
]

/* Merge conflicts in comments

<<<<<<< HEAD
// <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
//^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation
// ^^^^ meta.block.conflict.begin.diff entity.name.section.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation

=======
// <- meta.block.conflict.separator.diff punctuation.section.block.diff
//^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff
// ^ meta.block.conflict.separator.diff - punctuation

>>>>>>> master
// <- meta.block.conflict.end.diff punctuation.section.block.end.diff
//^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff
// ^ meta.block.conflict.end.diff - entity - punctuation
// ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff
// ^ meta.block.conflict.end.diff - entity - punctuation
*/
72 changes: 72 additions & 0 deletions Package/Sublime Text Commands/syntax_test_commands.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,78 @@
abc
// ^^^ invalid.illegal.expected-mapping.sublime-commands

/*
* Merge Conflict Marker Tests
*/

<<<<<<< HEAD
// <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
//^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation
// ^^^^ meta.block.conflict.begin.diff entity.name.section.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation

=======
// <- meta.block.conflict.separator.diff punctuation.section.block.diff
//^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff
// ^ meta.block.conflict.separator.diff - punctuation

>>>>>>> master
// <- meta.block.conflict.end.diff punctuation.section.block.end.diff
//^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff
// ^ meta.block.conflict.end.diff - entity - punctuation
// ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff
// ^ meta.block.conflict.end.diff - entity - punctuation

{ /* Merge conflictes in objects */
<<<<<<< HEAD
// <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
//^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation
// ^^^^ meta.block.conflict.begin.diff entity.name.section.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation

=======
// <- meta.block.conflict.separator.diff punctuation.section.block.diff
//^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff
// ^ meta.block.conflict.separator.diff - punctuation

>>>>>>> master
// <- meta.block.conflict.end.diff punctuation.section.block.end.diff
//^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff
// ^ meta.block.conflict.end.diff - entity - punctuation
// ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff
// ^ meta.block.conflict.end.diff - entity - punctuation

"args": {
"list": [
<<<<<<< HEAD
// <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
//^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation
// ^^^^ meta.block.conflict.begin.diff entity.name.section.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation
"ours",
// ^^^^^^ string.quoted.double.json
// ^ punctuation.definition.string.begin.json
// ^ punctuation.definition.string.end.json
=======
// <- meta.block.conflict.separator.diff punctuation.section.block.diff
//^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff
// ^ meta.block.conflict.separator.diff - punctuation
"theirs",
// ^^^^^^^^ string.quoted.double.json
// ^ punctuation.definition.string.begin.json
// ^ punctuation.definition.string.end.json
>>>>>>> master
// <- meta.block.conflict.end.diff punctuation.section.block.end.diff
//^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff
// ^ meta.block.conflict.end.diff - entity - punctuation
// ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff
// ^ meta.block.conflict.end.diff - entity - punctuation
]
}
}
]
,[]//fgfg
// <- - invalid.illegal
Expand Down
111 changes: 111 additions & 0 deletions Package/Sublime Text Settings/syntax_test_settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,118 @@ s

, // but not two consecutive commas
// ^ invalid.illegal.expected-key.json


/*
* Merge Conflict Marker Tests
*/

<<<<<<< HEAD
// <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
//^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation
// ^^^^ meta.block.conflict.begin.diff entity.name.section.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation

=======
// <- meta.block.conflict.separator.diff punctuation.section.block.diff
//^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff
// ^ meta.block.conflict.separator.diff - punctuation

>>>>>>> master
// <- meta.block.conflict.end.diff punctuation.section.block.end.diff
//^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff
// ^ meta.block.conflict.end.diff - entity - punctuation
// ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff
// ^ meta.block.conflict.end.diff - entity - punctuation

"dict": { /* Merge conflictes in objects */
<<<<<<< HEAD
// <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
//^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation
// ^^^^ meta.block.conflict.begin.diff entity.name.section.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation

=======
// <- meta.block.conflict.separator.diff punctuation.section.block.diff
//^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff
// ^ meta.block.conflict.separator.diff - punctuation

>>>>>>> master
// <- meta.block.conflict.end.diff punctuation.section.block.end.diff
//^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff
// ^ meta.block.conflict.end.diff - entity - punctuation
// ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff
// ^ meta.block.conflict.end.diff - entity - punctuation
}

"list": [ /* Merge conflictes in lists */
<<<<<<< HEAD
// <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
//^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation
// ^^^^ meta.block.conflict.begin.diff entity.name.section.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation

=======
// <- meta.block.conflict.separator.diff punctuation.section.block.diff
//^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff
// ^ meta.block.conflict.separator.diff - punctuation

>>>>>>> master
// <- meta.block.conflict.end.diff punctuation.section.block.end.diff
//^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff
// ^ meta.block.conflict.end.diff - entity - punctuation
// ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff
// ^ meta.block.conflict.end.diff - entity - punctuation
]

"scalar":
// ^^^^^^^^ meta.mapping.key.json string.quoted.double.json
<<<<<<< HEAD
// <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
//^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation
// ^^^^ meta.block.conflict.begin.diff entity.name.section.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation
"value",
// ^^^^^^^ meta.mapping.value.json string.quoted.double.json
=======
// <- meta.block.conflict.separator.diff punctuation.section.block.diff
//^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff
// ^ meta.block.conflict.separator.diff - punctuation

>>>>>>> master
// <- meta.block.conflict.end.diff punctuation.section.block.end.diff
//^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff
// ^ meta.block.conflict.end.diff - entity - punctuation
// ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff

/* Merge conflicts in comments

<<<<<<< HEAD
// <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
//^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation
// ^^^^ meta.block.conflict.begin.diff entity.name.section.diff
// ^ meta.block.conflict.begin.diff - entity - punctuation

=======
// <- meta.block.conflict.separator.diff punctuation.section.block.diff
//^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff
// ^ meta.block.conflict.separator.diff - punctuation

>>>>>>> master
// <- meta.block.conflict.end.diff punctuation.section.block.end.diff
//^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff
// ^ meta.block.conflict.end.diff - entity - punctuation
// ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff
// ^ meta.block.conflict.end.diff - entity - punctuation
*/

}
// <- meta.settings-mapping.sublime-settings meta.mapping.json punctuation.section.mapping.end.json

not-a-comment // but this is
// <- invalid.illegal.expected-comment-or-eof.sublime
Expand Down
Loading