From e4fb09ae600eeac8d6274008bd6bd262fd659a48 Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Sat, 24 Oct 2020 17:05:14 -0400
Subject: [PATCH] Fixes issue with file history unpin refresh

---
 src/views/fileHistoryView.ts | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/views/fileHistoryView.ts b/src/views/fileHistoryView.ts
index b7d8a63..3c7f73b 100644
--- a/src/views/fileHistoryView.ts
+++ b/src/views/fileHistoryView.ts
@@ -12,8 +12,14 @@ const pinnedSuffix = ' (pinned)';
 export class FileHistoryView extends ViewBase<FileHistoryTrackerNode | LineHistoryTrackerNode, FileHistoryViewConfig> {
 	protected readonly configKey = 'fileHistory';
 
+	private _followCursor: boolean = false;
+	private _followEditor: boolean = true;
+
 	constructor() {
 		super('gitlens.views.fileHistory', 'File History');
+
+		void setContext(ContextKeys.ViewsFileHistoryCursorFollowing, this._followCursor);
+		void setContext(ContextKeys.ViewsFileHistoryEditorFollowing, this._followEditor);
 	}
 
 	protected get showCollapseAll(): boolean {
@@ -95,13 +101,6 @@ export class FileHistoryView extends ViewBase<FileHistoryTrackerNode | LineHisto
 		return true;
 	}
 
-	protected initialize(options: { showCollapseAll?: boolean } = {}) {
-		super.initialize(options);
-
-		void setContext(ContextKeys.ViewsFileHistoryEditorFollowing, this._followEditor);
-		void setContext(ContextKeys.ViewsFileHistoryCursorFollowing, this._followCursor);
-	}
-
 	async showHistoryForUri(uri: GitUri, baseRef?: string) {
 		this.setCursorFollowing(false);
 		this.setEditorFollowing(false);
@@ -117,7 +116,6 @@ export class FileHistoryView extends ViewBase<FileHistoryTrackerNode | LineHisto
 		void this.root?.changeBase();
 	}
 
-	private _followCursor: boolean = false;
 	private setCursorFollowing(enabled: boolean) {
 		this._followCursor = enabled;
 		void setContext(ContextKeys.ViewsFileHistoryCursorFollowing, enabled);
@@ -130,11 +128,12 @@ export class FileHistoryView extends ViewBase<FileHistoryTrackerNode | LineHisto
 		void this.refresh(true);
 	}
 
-	private _followEditor: boolean = true;
 	private setEditorFollowing(enabled: boolean) {
 		this._followEditor = enabled;
 		void setContext(ContextKeys.ViewsFileHistoryEditorFollowing, enabled);
-		this.root?.setEditorFollowing(enabled);
+
+		const root = this.ensureRoot(true);
+		root.setEditorFollowing(enabled);
 
 		if (this.description?.endsWith(pinnedSuffix)) {
 			if (enabled) {
@@ -143,6 +142,11 @@ export class FileHistoryView extends ViewBase<FileHistoryTrackerNode | LineHisto
 		} else if (!enabled) {
 			this.description += pinnedSuffix;
 		}
+
+		if (enabled) {
+			void root.ensureSubscription();
+			void this.refresh(true);
+		}
 	}
 
 	private setRenameFollowing(enabled: boolean) {