Browse Source

Reverses diff ordering

Only adds blame code lens within the specified range
main
Eric Amodio 8 years ago
parent
commit
f4d3d1718d
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      src/commands.ts
  2. +1
    -1
      src/gitBlameCodeLensProvider.ts

+ 2
- 2
src/commands.ts View File

@ -54,7 +54,7 @@ export class DiffWithPreviousCommand extends Command {
return this.git.getVersionedFile(uri.path, sha).then(source => {
this.git.getVersionedFile(uri.path, compareWithSha).then(compare => {
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) {
return this.git.getVersionedFile(uri.path, sha).then(compare => {
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)`);
});
}
}

+ 1
- 1
src/gitBlameCodeLensProvider.ts View File

@ -38,7 +38,7 @@ export default class GitBlameCodeLensProvider implements CodeLensProvider {
const lenses: CodeLens[] = [];
// 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;
lines.forEach(l => {
if (l.originalLine !== lastLine + 1) {

Loading…
Cancel
Save