ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-02-16 18:48:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Reverses diff ordering

Browse Source 
Only adds blame code lens within the specified range
This commit is contained in:
Eric Amodio
2016-09-02 00:53:13 -04:00
parent ea33560f14
commit f4d3d1718d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/commands.ts
View File

@@ -54,7 +54,7 @@ export class DiffWithPreviousCommand extends Command {
return this.git.getVersionedFile(uri.path, sha).then(source => { return this.git.getVersionedFile(uri.path, sha).then(source => {
this.git.getVersionedFile(uri.path, compareWithSha).then(compare => { this.git.getVersionedFile(uri.path, compareWithSha).then(compare => {
const fileName = basename(uri.path); const fileName = basename(uri.path);
return commands.executeCommand(VsCodeCommands.Diff, Uri.file(source), Uri.file(compare), `${fileName} (${sha}) ↔ ${fileName} (${compareWithSha})`); return commands.executeCommand(VsCodeCommands.Diff, Uri.file(compare), Uri.file(source), `${fileName} (${compareWithSha}) ↔ ${fileName} (${sha})`);
}) })
}); });
} }
@@ -68,7 +68,7 @@ export class DiffWithWorkingCommand extends Command {
execute(uri?: Uri, sha?: string) { execute(uri?: Uri, sha?: string) {
return this.git.getVersionedFile(uri.path, sha).then(compare => { return this.git.getVersionedFile(uri.path, sha).then(compare => {
const fileName = basename(uri.path); const fileName = basename(uri.path);
return commands.executeCommand(VsCodeCommands.Diff, uri, Uri.file(compare), `${fileName} (index) ↔ ${fileName} (${sha})`); return commands.executeCommand(VsCodeCommands.Diff, Uri.file(compare), uri, `${fileName} (${sha}) ↔ ${fileName} (index)`);
}); });
} }
} }

2
src/gitBlameCodeLensProvider.ts
View File

@@ -38,7 +38,7 @@ export default class GitBlameCodeLensProvider implements CodeLensProvider {
const lenses: CodeLens[] = []; const lenses: CodeLens[] = [];
// Add codelens to each "group" of blame lines // Add codelens to each "group" of blame lines
const lines = blame.lines.filter(l => l.sha === data.sha); const lines = blame.lines.filter(l => l.sha === data.sha && l.originalLine >= data.range.start.line && l.originalLine <= data.range.end.line);
let lastLine = lines[0].originalLine; let lastLine = lines[0].originalLine;
lines.forEach(l => { lines.forEach(l => {
if (l.originalLine !== lastLine + 1) { if (l.originalLine !== lastLine + 1) {