SCM - tweak appearance of the load more indicator (microsoft#226623)

lszomoru · web-flow · commit eaf845194027 · 2024-08-26T16:18:36.000+02:00
diff --git a/src/vs/workbench/contrib/scm/browser/media/scm.css b/src/vs/workbench/contrib/scm/browser/media/scm.css
@@ -591,10 +591,12 @@
 	display: flex;
 	align-items: center;
 	justify-content: center;
+	color: var(--vscode-textLink-foreground)
 }
 
 .scm-history-view .history-item-load-more .history-item-placeholder .monaco-highlighted-label .codicon {
 	font-size: 12px;
+	color: var(--vscode-textLink-foreground)
 }
 
 .scm-history-view .history-item-load-more .history-item-placeholder.shimmer {
diff --git a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
@@ -846,6 +846,7 @@ export class SCMHistoryViewPane extends ViewPane {
 
 			if (repositoryCount > 1 || alwaysShowRepositories) {
 				this._loadMoreCallback(e.element.repository);
+				this._tree.setSelection([]);
 			}
 		}
 	}
@@ -967,7 +968,7 @@ export class SCMHistoryViewPane extends ViewPane {
 		return loadMore;
 	}
 
-	private _loadMoreCallback(repository: ISCMRepository): void {
+	private async _loadMoreCallback(repository: ISCMRepository): Promise<void> {
 		const loadMore = this._getLoadMore(repository);
 		if (loadMore.get()) {
 			return;
@@ -976,8 +977,8 @@ export class SCMHistoryViewPane extends ViewPane {
 		loadMore.set(true, undefined);
 		this._treeDataSource.loadMore(repository);
 
-		this._updateChildren(repository)
-			.finally(() => loadMore.set(false, undefined));
+		await this._updateChildren(repository);
+		loadMore.set(false, undefined);
 	}
 
 	private _getRepositoryDescription(repository: ISCMRepository): ISettableObservable<string> {

Original file line number	Diff line number	Diff line change
`@@ -591,10 +591,12 @@`
`591`	`591`	`display: flex;`
`592`	`592`	`align-items: center;`
`593`	`593`	`justify-content: center;`
	`594`	`+ color: var(--vscode-textLink-foreground)`
`594`	`595`	`}`
`595`	`596`
`596`	`597`	`.scm-history-view .history-item-load-more .history-item-placeholder .monaco-highlighted-label .codicon {`
`597`	`598`	`font-size: 12px;`
	`599`	`+ color: var(--vscode-textLink-foreground)`
`598`	`600`	`}`
`599`	`601`
`600`	`602`	`.scm-history-view .history-item-load-more .history-item-placeholder.shimmer {`
Original file line number	Diff line number	Diff line change
`@@ -846,6 +846,7 @@ export class SCMHistoryViewPane extends ViewPane {`
`846`	`846`
`847`	`847`	`if (repositoryCount > 1 \|\| alwaysShowRepositories) {`
`848`	`848`	`this._loadMoreCallback(e.element.repository);`
	`849`	`+ this._tree.setSelection([]);`
`849`	`850`	`}`
`850`	`851`	`}`
`851`	`852`	`}`
`@@ -967,7 +968,7 @@ export class SCMHistoryViewPane extends ViewPane {`
`967`	`968`	`return loadMore;`
`968`	`969`	`}`
`969`	`970`
`970`		`- private _loadMoreCallback(repository: ISCMRepository): void {`
	`971`	`+ private async _loadMoreCallback(repository: ISCMRepository): Promise<void> {`
`971`	`972`	`const loadMore = this._getLoadMore(repository);`
`972`	`973`	`if (loadMore.get()) {`
`973`	`974`	`return;`
`@@ -976,8 +977,8 @@ export class SCMHistoryViewPane extends ViewPane {`
`976`	`977`	`loadMore.set(true, undefined);`
`977`	`978`	`this._treeDataSource.loadMore(repository);`
`978`	`979`
`979`		`- this._updateChildren(repository)`
`980`		`- .finally(() => loadMore.set(false, undefined));`
	`980`	`+ await this._updateChildren(repository);`
	`981`	`+ loadMore.set(false, undefined);`
`981`	`982`	`}`
`982`	`983`
`983`	`984`	`private _getRepositoryDescription(repository: ISCMRepository): ISettableObservable<string> {`