Fixes off-by-one issues with blame annotations without caching and when diffing with a previous version

This commit is contained in:
Eric Amodio
2016-09-22 23:00:09 -06:00
parent 157928311e
commit 23b2c679a9
3 changed files with 7 additions and 3 deletions

View File

@@ -214,7 +214,7 @@ export default class GitProvider extends Disposable {
fileName = Git.normalizePath(fileName);
return Git.blameLines(GitProvider.BlameFormat, fileName, line, line, sha, repoPath)
return Git.blameLines(GitProvider.BlameFormat, fileName, line + 1, line + 1, sha, repoPath)
.then(data => new GitBlameParserEnricher(GitProvider.BlameFormat).enrich(data, fileName))
.then(blame => {
if (!blame) return null;
@@ -226,7 +226,7 @@ export default class GitProvider extends Disposable {
return <IGitBlameLine>{
author: blame.authors.values().next().value,
commit: commit,
line: blame.lines[line - 1]
line: blame.lines[line]
};
})
.catch(ex => null);