Ensures search results files are filtered properly

Author: eamodio

src/git/models/commit.ts

@@ -239,17 +239,23 @@ export class GitCommit implements GitRevisionReference {
 		allowFilteredFiles?: boolean;
 		include?: { stats?: boolean };
 	}): this is GitCommitWithFullDetails {
-		return (
-			this.message != null &&
-			this.fileset != null &&
-			((options?.allowFilteredFiles && this.fileset.filtered) || !this.fileset.filtered) &&
-			(!options?.include?.stats || this.fileset.files.some(f => f.stats != null)) &&
-			((this.isUncommitted &&
-				// If this is an uncommitted commit, check if we need to load the working files (if we don't have a matching etag -- only works if we are currently watching the file system for this repository)
-				this._etagFileSystem === this.container.git.getRepository(this.repoPath)?.etagFileSystem) ||
-				this.parents.length !== 0) &&
-			(this.refType !== 'stash' || this._stashUntrackedFilesLoaded)
-		);
+		if (this.message == null || this.fileset == null) return false;
+		if (this.fileset.filtered && !options?.allowFilteredFiles) return false;
+		if (this.refType === 'stash' && !this._stashUntrackedFilesLoaded && !options?.allowFilteredFiles) {
+			return false;
+		}
+		if (options?.include?.stats && this.fileset.files.some(f => f.stats == null)) {
+			return false;
+		}
+		// If this is an uncommitted commit, check if we need to load the working files (if we don't have a matching etag -- only works if we are currently watching the file system for this repository)
+		if (
+			this.isUncommitted &&
+			(!this.parents.length ||
+				this._etagFileSystem !== this.container.git.getRepository(this.repoPath)?.etagFileSystem)
+		) {
+			return false;
+		}
+		return true;
 	}
 
 	@gate()

src/views/nodes/resultsCommitsNode.ts

@@ -140,13 +140,13 @@ export class ResultsCommitsNode<View extends ViewsWithCommits = ViewsWithCommits
 			);
 		}
 
-		const options = { expand: this._options.expand && log.count === 1 };
+		const options = { allowFilteredFiles: true, expand: this._options.expand && log.count === 1 };
 
 		children.push(
 			...insertDateMarkers(
 				map(log.commits.values(), c =>
 					isStash(c)
-						? new StashNode(this.view, this, c, { icon: true })
+						? new StashNode(this.view, this, c, { allowFilteredFiles: true, icon: true })
 						: new CommitNode(this.view, this, c, undefined, undefined, getBranchAndTagTips, options),
 				),
 				this,

src/views/nodes/stashNode.ts

@@ -21,7 +21,7 @@ export class StashNode extends ViewRefNode<'stash', ViewsWithStashes, GitStashRe
 		view: ViewsWithStashes,
 		protected override parent: ViewNode,
 		public readonly commit: GitStashCommit,
-		private readonly options?: { icon?: boolean },
+		private readonly _options?: { allowFilteredFiles?: boolean; icon?: boolean },
 	) {
 		super('stash', commit.getGitUri(), view, parent);
 
@@ -43,7 +43,10 @@ export class StashNode extends ViewRefNode<'stash', ViewsWithStashes, GitStashRe
 
 	async getChildren(): Promise<ViewNode[]> {
 		// Ensure we have checked for untracked files (inside the getCommitsForFiles call)
-		const commits = await this.commit.getCommitsForFiles({ include: { stats: true } });
+		const commits = await this.commit.getCommitsForFiles({
+			allowFilteredFiles: this._options?.allowFilteredFiles,
+			include: { stats: true },
+		});
 		let children: FileNode[] = commits.map(c => new StashFileNode(this.view, this, c.file!, c as GitStashCommit));
 
 		if (this.view.config.files.layout !== 'list') {
@@ -76,24 +79,25 @@ export class StashNode extends ViewRefNode<'stash', ViewsWithStashes, GitStashRe
 			dateFormat: configuration.get('defaultDateFormat'),
 		});
 		item.contextValue = ContextValues.Stash;
-		if (this.options?.icon) {
+		if (this._options?.icon) {
 			item.iconPath = new ThemeIcon('archive');
 		}
 
 		return item;
 	}
 
 	override async resolveTreeItem(item: TreeItem, token: CancellationToken): Promise<TreeItem> {
-		if (item.tooltip == null) {
-			item.tooltip = await this.getTooltip(token);
-		}
+		item.tooltip ??= await this.getTooltip(token);
 		return item;
 	}
 
 	private async getTooltip(cancellation: CancellationToken) {
 		const [remotesResult, _] = await Promise.allSettled([
 			this.view.container.git.remotes(this.commit.repoPath).getBestRemotesWithProviders(cancellation),
-			this.commit.ensureFullDetails({ include: { stats: true } }),
+			this.commit.ensureFullDetails({
+				allowFilteredFiles: this._options?.allowFilteredFiles,
+				include: { stats: true },
+			}),
 		]);
 
 		if (cancellation.isCancellationRequested) return undefined;