Skip to content

Search results for "UTF-8 with BOM" files shifted on first line by a character #66189

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
roblourens merged 3 commits into from Jan 10, 2019
Merged

Search results for "UTF-8 with BOM" files shifted on first line by a character #66189

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c22caf6
Fix #66188
Jan 8, 2019
4f151da
Strip utf-8 bom from matchText
Jan 10, 2019
0be5df1
Index can't be negative
Jan 10, 2019
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
18 changes: 11 additions & 7 deletions src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,12 @@ export class RipgrepParser extends EventEmitter {

private createTextSearchMatch(data: IRgMatch, uri: vscode.Uri): vscode.TextSearchMatch {
const lineNumber = data.line_number - 1;
const fullText = bytesOrTextToString(data.lines);
let isBOMStripped = false;
let fullText = bytesOrTextToString(data.lines);
if (lineNumber === 0 && startsWithUTF8BOM(fullText)) {
isBOMStripped = true;
fullText = stripUTF8BOM(fullText);
}
const fullTextBytes = Buffer.from(fullText);

let prevMatchEnd = 0;
Expand All @@ -255,6 +260,11 @@ export class RipgrepParser extends EventEmitter {
}

let matchText = bytesOrTextToString(match.match);
if (lineNumber === 0 && i === 0 && isBOMStripped) {
matchText = stripUTF8BOM(matchText);
match.start = match.start <= 3 ? 0 : match.start - 3;
match.end = match.end <= 3 ? 0 : match.end - 3;
}
const inBetweenChars = fullTextBytes.slice(prevMatchEnd, match.start).toString().length;
let startCol = prevMatchEndCol + inBetweenChars;

Expand All @@ -265,12 +275,6 @@ export class RipgrepParser extends EventEmitter {
stats.lastLineLength :
stats.lastLineLength + startCol;

if (lineNumber === 0 && i === 0 && startsWithUTF8BOM(matchText)) {
matchText = stripUTF8BOM(matchText);
startCol -= 3;
endCol -= 3;
}

prevMatchEnd = match.end;
prevMatchEndCol = endCol;
prevMatchEndLine = endLineNumber;
Expand Down