From ee3e5cf9602b7bc859037ab08ee04c19e9fa57b8 Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Mon, 16 May 2022 18:31:20 -0400
Subject: [PATCH] Fixes #2000 File changes fail to display properly

---
 CHANGELOG.md                                       | 1 +
 src/annotations/gutterChangesAnnotationProvider.ts | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c03f04..32e5cd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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() &mdash; thanks to [PR #1954](https://github.com/gitkraken/vscode-gitlens/pull/1954) by Felipe Santos ([@felipecrs](https://github.com/felipecrs))
diff --git a/src/annotations/gutterChangesAnnotationProvider.ts b/src/annotations/gutterChangesAnnotationProvider.ts
index 538a6d5..bd997c2 100644
--- a/src/annotations/gutterChangesAnnotationProvider.ts
+++ b/src/annotations/gutterChangesAnnotationProvider.ts
@@ -181,14 +181,12 @@ export class GutterChangesAnnotationProvider extends AnnotationProviderBase<Chan
 
 					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