Changes to use decoration for default indicator

gitkraken · Mar 9, 2021 · 94bea80 · 94bea80
1 parent 3c57b6f
commit 94bea80
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/src/views/nodes/remoteNode.ts b/src/views/nodes/remoteNode.ts
@@ -1,5 +1,5 @@
 'use strict';
-import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode';
+import { ThemeIcon, TreeItem, TreeItemCollapsibleState, Uri } from 'vscode';
 import { BranchNode } from './branchNode';
 import { BranchOrTagFolderNode } from './branchOrTagFolderNode';
 import { MessageNode } from './common';
@@ -106,10 +106,7 @@ export class RemoteNode extends ViewNode<RemotesView | RepositoriesView> {
 			arrows = GlyphChars.Dash;
 		}
 
-		const item = new TreeItem(
-			`${this.remote.default ? `${GlyphChars.Check} ${GlyphChars.Space}` : ''}${this.remote.name}`,
-			TreeItemCollapsibleState.Collapsed,
-		);
+		const item = new TreeItem(this.remote.name, TreeItemCollapsibleState.Collapsed);
 
 		if (this.remote.provider != null) {
 			const { provider } = this.remote;
@@ -123,7 +120,7 @@ export class RemoteNode extends ViewNode<RemotesView | RepositoriesView> {
 			if (provider.hasApi()) {
 				const connected = provider.maybeConnected ?? (await provider.isConnected());
 
-				item.contextValue += `${ContextValues.Remote}${connected ? '+connected' : '+disconnected'}`;
+				item.contextValue = `${ContextValues.Remote}${connected ? '+connected' : '+disconnected'}`;
 				item.tooltip = `${this.remote.name} (${provider.name} ${GlyphChars.Dash} ${
 					connected ? 'connected' : 'not connected'
 				})\n${provider.displayPath}\n`;
@@ -144,6 +141,7 @@ export class RemoteNode extends ViewNode<RemotesView | RepositoriesView> {
 
 		if (this.remote.default) {
 			item.contextValue += '+default';
+			item.resourceUri = Uri.parse('gitlens-view://remote/default');
 		}
 
 		item.id = this.id;

diff --git a/src/views/viewDecorationProvider.ts b/src/views/viewDecorationProvider.ts
@@ -25,9 +25,17 @@ export class ViewFileDecorationProvider implements FileDecorationProvider, Dispo
 			// Register the current branch decorator separately (since we can only have 2 char's per decoration)
 			window.registerFileDecorationProvider({
 				provideFileDecoration: (uri, token) => {
-					if (uri.scheme !== 'gitlens-view' || uri.authority !== 'branch') return undefined;
+					if (uri.scheme !== 'gitlens-view') return undefined;
 
-					return this.provideBranchCurrentDecoration(uri, token);
+					if (uri.authority === 'branch') {
+						return this.provideBranchCurrentDecoration(uri, token);
+					}
+
+					if (uri.authority === 'remote') {
+						return this.provideRemoteDefaultDecoration(uri, token);
+					}
+
+					return undefined;
 				},
 			}),
 			window.registerFileDecorationProvider(this),
@@ -171,4 +179,15 @@ export class ViewFileDecorationProvider implements FileDecorationProvider, Dispo
 			tooltip: 'Current Branch',
 		};
 	}
+
+	provideRemoteDefaultDecoration(uri: Uri, _token: CancellationToken): FileDecoration | undefined {
+		const [, isDefault] = uri.path.split('/');
+
+		if (!isDefault) return undefined;
+
+		return {
+			badge: GlyphChars.Check,
+			tooltip: 'Default Remote',
+		};
+	}
 }