Skip to content

Fix issue with formatter attempting to format merge conflict markers (#850) #851

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

Open
paco3346 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix issue with formatter attempting to format merge conflict markers (#850) #851

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1207fcb
Fix issue with formatter attempting to format merge conflict markers …
paco3346 Apr 23, 2025
c6dae3c
Fix issue where string checks are run on vsCode TextLine object and n…
paco3346 Apr 24, 2025
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
9 changes: 9 additions & 0 deletions src/formatter/textmate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,10 @@ function is_comment(line: TextLine): boolean {
return line.text[line.firstNonWhitespaceCharacterIndex] === "#";
}

function is_merge_conflict(line: TextLine): boolean {
return (line.text.startsWith('<<<<<<<') || line.text.startsWith('=======') || line.text.startsWith('>>>>>>>'));
}

export function format_document(document: TextDocument, _options?: FormatterOptions): TextEdit[] {
// quit early if grammar is not loaded
if (!grammar) {
Expand Down Expand Up @@ -295,6 +299,11 @@ export function format_document(document: TextDocument, _options?: FormatterOpti
continue;
}

// skip merge conflicts markers
if (is_merge_conflict(line)) {
continue;
}

let nextLine = "";
lineTokens = grammar.tokenizeLine(line.text, lineTokens?.ruleStack ?? vsctm.INITIAL);

Expand Down