Browse Source

Fixes #2000 File changes fail to display properly

main
Eric Amodio 2 years ago
parent
commit
ee3e5cf960
2 changed files with 3 additions and 4 deletions
  1. +1
    -0
      CHANGELOG.md
  2. +2
    -4
      src/annotations/gutterChangesAnnotationProvider.ts

+ 1
- 0
CHANGELOG.md View File

@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
## Fixed
- Fixes [#2000](https://github.com/gitkraken/vscode-gitlens/issues/1936) - File Changes annotations fail to display in certain cases
- Fixes [#1936](https://github.com/gitkraken/vscode-gitlens/issues/1936) - Broken repositories view
- Fixes [#1882](https://github.com/gitkraken/vscode-gitlens/issues/1882) - Blame annotations not showing anymore after update
- Fixes [#1787](https://github.com/gitkraken/vscode-gitlens/issues/1787) - Remove '-review' from Gerrit Remote reviewDomain() — thanks to [PR #1954](https://github.com/gitkraken/vscode-gitlens/pull/1954) by Felipe Santos ([@felipecrs](https://github.com/felipecrs))

+ 2
- 4
src/annotations/gutterChangesAnnotationProvider.ts View File

@ -181,14 +181,12 @@ export class GutterChangesAnnotationProvider extends AnnotationProviderBase
const sha = context!.sha;
for (let i = hunk.current.position.start - 1; i < hunk.current.position.end; i++) {
if (blame.lines[i].sha === sha) {
if (blame.lines[i]?.sha === sha) {
skip = false;
}
}
if (skip) {
continue;
}
if (skip) continue;
}
// Subtract 2 because editor lines are 0-based and we will be adding 1 in the first iteration of the loop

Loading…
Cancel
Save