Fixes File/Line history loading on intial show

Author: eamodio

src/views/nodes/abstract/cacheableChildrenViewNode.ts

@@ -27,7 +27,7 @@ export abstract class CacheableChildrenViewNode<
 	}
 
 	@debug()
-	override refresh(reset: boolean = false): void {
+	override refresh(reset: boolean = false): void | { cancel: boolean } | Promise<void | { cancel: boolean }> {
 		if (reset) {
 			this.children = undefined;
 		}

src/views/nodes/abstract/repositoryFolderNode.ts

@@ -172,9 +172,8 @@ export abstract class RepositoryFolderNode<
 	@gate()
 	@debug()
 	override async refresh(reset: boolean = false): Promise<void> {
-		super.refresh(reset);
+		await super.refresh(reset);
 		await this.child?.triggerChange(reset, false, this);
-
 		await this.ensureSubscription();
 	}
 

src/views/nodes/abstract/subscribeableViewNode.ts

@@ -34,16 +34,16 @@ export abstract class SubscribeableViewNode<
 		}
 
 		const getTreeItem = this.getTreeItem;
-		this.getTreeItem = function (this: SubscribeableViewNode<Type, TView>) {
+		this.getTreeItem = async function (this: SubscribeableViewNode<Type, TView>) {
 			this.loaded = true;
-			void this.ensureSubscription();
+			await this.ensureSubscription();
 			return getTreeItem.apply(this);
 		};
 
 		const getChildren = this.getChildren;
-		this.getChildren = function (this: SubscribeableViewNode<Type, TView>) {
+		this.getChildren = async function (this: SubscribeableViewNode<Type, TView>) {
 			this.loaded = true;
-			void this.ensureSubscription();
+			await this.ensureSubscription();
 			return getChildren.apply(this);
 		};
 

src/views/nodes/abstract/viewNode.ts

@@ -307,7 +307,7 @@ export abstract class ViewNode<
 		return undefined;
 	}
 
-	refresh?(reset?: boolean): boolean | void | Promise<void> | Promise<boolean>;
+	refresh?(reset?: boolean): void | { cancel: boolean } | Promise<void | { cancel: boolean }>;
 
 	@gate()
 	@debug()

src/views/nodes/fileHistoryTrackerNode.ts

@@ -47,6 +47,18 @@ export class FileHistoryTrackerNode extends SubscribeableViewNode<'file-history-
 		this._child = value;
 	}
 
+	protected override etag(): number {
+		return 0;
+	}
+
+	get followingEditor(): boolean {
+		return this.canSubscribe;
+	}
+
+	get hasUri(): boolean {
+		return this._uri !== unknownGitUri && this._uri.repoPath != null;
+	}
+
 	async getChildren(): Promise<ViewNode[]> {
 		if (this.child == null) {
 			this.view.groupedLabel ??= this.view.name.toLocaleLowerCase();
@@ -96,12 +108,50 @@ export class FileHistoryTrackerNode extends SubscribeableViewNode<'file-history-
 		return item;
 	}
 
-	get followingEditor(): boolean {
-		return this.canSubscribe;
+	@gate()
+	@debug({ exit: true })
+	override async refresh(reset: boolean = false): Promise<{ cancel: boolean }> {
+		const scope = getLogScope();
+
+		if (!this.canSubscribe) return { cancel: false };
+
+		if (reset) {
+			if (this._uri != null && this._uri !== unknownGitUri) {
+				await this.view.container.documentTracker.resetCache(this._uri, 'log');
+			}
+
+			this.reset();
+		}
+
+		const updated = await this.updateUri();
+		setLogScopeExit(scope, `, uri=${Logger.toLoggable(this._uri)}`);
+		return { cancel: !updated };
 	}
 
-	get hasUri(): boolean {
-		return this._uri !== unknownGitUri && this._uri.repoPath != null;
+	@debug()
+	protected async subscribe(): Promise<Disposable> {
+		await this.updateUri();
+
+		return Disposable.from(
+			weakEvent(window.onDidChangeActiveTextEditor, debounce(this.onActiveEditorChanged, 250), this),
+		);
+	}
+
+	private _triggerChangeDebounced: Deferrable<() => Promise<void>> | undefined;
+	@debug({ args: false })
+	private onActiveEditorChanged(editor: TextEditor | undefined) {
+		// If we are losing the active editor, give more time before assuming its really gone
+		// For virtual repositories the active editor event takes a while to fire
+		// Ultimately we need to be using the upcoming Tabs api to avoid this
+		if (editor == null && isVirtualUri(this._uri)) {
+			if (this._triggerChangeDebounced == null) {
+				this._triggerChangeDebounced = debounce(() => this.triggerChange(), 1500);
+			}
+
+			void this._triggerChangeDebounced();
+			return;
+		}
+		void this.triggerChange();
 	}
 
 	@gate()
@@ -131,40 +181,53 @@ export class FileHistoryTrackerNode extends SubscribeableViewNode<'file-history-
 		await this.triggerChange();
 	}
 
-	@gate()
-	@debug({ exit: true })
-	override async refresh(reset: boolean = false): Promise<boolean> {
-		const scope = getLogScope();
+	@log()
+	setEditorFollowing(enabled: boolean): void {
+		if (enabled) {
+			this.setUri();
+			// Don't need to call triggerChange here, since canSubscribe will do it
+		}
 
-		if (!this.canSubscribe) return false;
+		this.canSubscribe = enabled;
+		if (!enabled) {
+			void this.triggerChange();
+		}
+	}
 
-		if (reset) {
-			if (this._uri != null && this._uri !== unknownGitUri) {
-				await this.view.container.documentTracker.resetCache(this._uri, 'log');
-			}
+	@debug()
+	setUri(uri?: GitUri): void {
+		this._uri = uri ?? unknownGitUri;
+		void setContext('gitlens:views:fileHistory:canPin', this.hasUri);
+	}
 
-			this.reset();
-		}
+	@log()
+	async showHistoryForUri(uri: GitUri): Promise<void> {
+		this.setUri(uri);
+		await this.triggerChange();
+	}
 
+	private reset() {
+		this.setUri();
+		this.child = undefined;
+	}
+
+	private async updateUri(): Promise<boolean> {
 		const editor = window.activeTextEditor;
 		if (editor == null || !this.view.container.git.isTrackable(editor.document.uri)) {
 			if (
 				!this.hasUri ||
 				(this.view.container.git.isTrackable(this.uri) &&
 					window.visibleTextEditors.some(e => e.document?.uri.path === this.uri.path))
 			) {
-				return true;
+				return false;
 			}
 
 			this.reset();
-
-			setLogScopeExit(scope, `, uri=${Logger.toLoggable(this._uri)}`);
-			return false;
+			return true;
 		}
 
 		if (editor.document.uri.path === this.uri.path) {
-			setLogScopeExit(scope, `, uri=${Logger.toLoggable(this._uri)}`);
-			return true;
+			return false;
 		}
 
 		let gitUri = await GitUri.fromUri(editor.document.uri);
@@ -173,79 +236,22 @@ export class FileHistoryTrackerNode extends SubscribeableViewNode<'file-history-
 		const uri = await ensureWorkingUri(this.view.container, gitUri);
 
 		if (this.hasUri && uriEquals(uri ?? gitUri, this.uri)) {
-			return true;
+			return false;
 		}
 
 		if (uri != null) {
 			gitUri = await GitUri.fromUri(uri);
 		}
 
 		// If we have no repoPath then don't attempt to use the Uri
-		if (gitUri.repoPath == null) {
+		if (!gitUri.repoPath) {
 			this.reset();
-		} else {
-			this.setUri(gitUri);
-			this.child = undefined;
+			return true;
 		}
 
-		setLogScopeExit(scope, `, uri=${Logger.toLoggable(this._uri)}`);
-		return false;
-	}
-
-	private reset() {
-		this.setUri();
+		this.setUri(gitUri);
 		this.child = undefined;
-	}
 
-	@log()
-	setEditorFollowing(enabled: boolean): void {
-		if (enabled) {
-			this.setUri();
-			// Don't need to call triggerChange here, since canSubscribe will do it
-		}
-
-		this.canSubscribe = enabled;
-		if (!enabled) {
-			void this.triggerChange();
-		}
-	}
-
-	@log()
-	async showHistoryForUri(uri: GitUri): Promise<void> {
-		this.setUri(uri);
-		await this.triggerChange();
-	}
-
-	@debug()
-	protected subscribe(): Disposable {
-		return Disposable.from(
-			weakEvent(window.onDidChangeActiveTextEditor, debounce(this.onActiveEditorChanged, 250), this),
-		);
-	}
-
-	protected override etag(): number {
-		return 0;
-	}
-
-	private _triggerChangeDebounced: Deferrable<() => Promise<void>> | undefined;
-	@debug({ args: false })
-	private onActiveEditorChanged(editor: TextEditor | undefined) {
-		// If we are losing the active editor, give more time before assuming its really gone
-		// For virtual repositories the active editor event takes a while to fire
-		// Ultimately we need to be using the upcoming Tabs api to avoid this
-		if (editor == null && isVirtualUri(this._uri)) {
-			if (this._triggerChangeDebounced == null) {
-				this._triggerChangeDebounced = debounce(() => this.triggerChange(), 1500);
-			}
-
-			void this._triggerChangeDebounced();
-			return;
-		}
-		void this.triggerChange();
-	}
-
-	setUri(uri?: GitUri): void {
-		this._uri = uri ?? unknownGitUri;
-		void setContext('gitlens:views:fileHistory:canPin', this.hasUri);
+		return true;
 	}
 }