development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add temporary timing logging to merge conflict scanning

Browse source
This commit is contained in:
Phil Price 2017-05-22 17:06:07 -07:00
parent fd94a29f3a
commit f4c0e976e2
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
extensions/merge-conflict/src/documentTracker.ts
View file

@ -53,7 +53,23 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
}
private getConflictsOrEmpty(document: vscode.TextDocument): interfaces.IDocumentMergeConflict[] {
return MergeConflictParser.containsConflict(document) ? MergeConflictParser.scanDocument(document) : [];
let stepStart = process.hrtime();
const containsConflict = MergeConflictParser.containsConflict(document);
let stepEnd = process.hrtime(stepStart);
console.info('%s -> Check document execution time: %dms', document.uri.toString(), stepEnd[1] / 1000000);
if(!containsConflict) {
return [];
}
stepStart = process.hrtime();
const conflicts = MergeConflictParser.scanDocument(document);
stepEnd = process.hrtime(stepStart);
console.info('%s -> Find conflict regions execution time: %dms', document.uri.toString(), stepEnd[1] / 1000000);
return conflicts;
}
private getCacheKey(document: vscode.TextDocument): string | null {