Skip to content

[Lua] Fix merge conflict markers in comments #4384

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

[Lua] Fix merge conflict markers in comments #4384

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
2 changes: 2 additions & 0 deletions Lua/Lua.sublime-syntax
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,15 @@ contexts:
- match: ^\s*({{doc_comment_custom_tag}})
captures:
1: entity.name.tag.documentation.custom.lua
- include: merge-conflict-markers

block-comment-body:
- meta_include_prototype: false
- meta_scope: comment.block.lua
- match: \]\1\]
scope: punctuation.definition.comment.end.lua
pop: 1
- include: merge-conflict-markers

line-comments:
- match: -{3,}
Expand Down
46 changes: 46 additions & 0 deletions Lua/tests/syntax_test_lua.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,52 @@
-- Merge Conflict Marker Tests
--

--[[ 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
]]

--[=[ Merge conflicts in docblock 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
]=]

-- Top-level merge conflicts

<<<<<<< HEAD
-- <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff
--^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff
Expand Down