mirror of
https://github.com/ckaczor/vscode-gitlens.git
synced 2026-02-16 10:58:34 -05:00
Fixes off-by-one issues with blame annotations without caching and when diffing with a previous version
This commit is contained in:
@@ -56,6 +56,10 @@ Must be using Git and it must be in your path.
|
|||||||
---
|
---
|
||||||
## Release Notes
|
## Release Notes
|
||||||
|
|
||||||
|
### 0.5.4
|
||||||
|
|
||||||
|
- Fixes off-by-one issues with blame annotations without caching and when diffing with a previous version
|
||||||
|
|
||||||
### 0.5.3
|
### 0.5.3
|
||||||
|
|
||||||
- Adds better uncommitted hover message in blame annotations
|
- Adds better uncommitted hover message in blame annotations
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "gitlens",
|
"name": "gitlens",
|
||||||
"version": "0.5.3",
|
"version": "0.5.4",
|
||||||
"author": {
|
"author": {
|
||||||
"name": "Eric Amodio",
|
"name": "Eric Amodio",
|
||||||
"email": "eamodio@gmail.com"
|
"email": "eamodio@gmail.com"
|
||||||
|
|||||||
@@ -214,7 +214,7 @@ export default class GitProvider extends Disposable {
|
|||||||
|
|
||||||
fileName = Git.normalizePath(fileName);
|
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(data => new GitBlameParserEnricher(GitProvider.BlameFormat).enrich(data, fileName))
|
||||||
.then(blame => {
|
.then(blame => {
|
||||||
if (!blame) return null;
|
if (!blame) return null;
|
||||||
@@ -226,7 +226,7 @@ export default class GitProvider extends Disposable {
|
|||||||
return <IGitBlameLine>{
|
return <IGitBlameLine>{
|
||||||
author: blame.authors.values().next().value,
|
author: blame.authors.values().next().value,
|
||||||
commit: commit,
|
commit: commit,
|
||||||
line: blame.lines[line - 1]
|
line: blame.lines[line]
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
.catch(ex => null);
|
.catch(ex => null);
|
||||||
|
|||||||
Reference in New Issue
Block a user