Change explorer panel styling

src/codebucket/command/registerDecorators.ts

@@ -0,0 +1,8 @@
+import { ExtensionContext, window } from 'vscode';
+
+import { FileDecorationProvider } from '../../views/decorators/FileDecorationProvider';
+
+export function activate(context: ExtensionContext) {
+    const decorationProvider = new FileDecorationProvider();
+    context.subscriptions.push(window.registerFileDecorationProvider(decorationProvider));
+}

src/extension.ts

@@ -7,6 +7,7 @@ import { DetailedSiteInfo, ProductBitbucket, ProductJira } from './atlclients/au
 import { startListening } from './atlclients/negotiate';
 import { BitbucketContext } from './bitbucket/bbContext';
 import { activate as activateCodebucket } from './codebucket/command/registerCommands';
+import { activate as activateDecorators } from './codebucket/command/registerDecorators';
 import { CommandContext, setCommandContext } from './commandContext';
 import { Commands, registerCommands } from './commands';
 import { Configuration, configuration, IConfig } from './config/configuration';
@@ -56,7 +57,7 @@ export async function activate(context: ExtensionContext) {
         activateErrorReporting();
         registerCommands(context);
         activateCodebucket(context);
-
+        activateDecorators(context);
         setCommandContext(
             CommandContext.IsJiraAuthenticated,
             Container.siteManager.productHasAtLeastOneSite(ProductJira),

src/views/decorators/FileDecorationProvider.ts

@@ -0,0 +1,49 @@
+import * as vscode from 'vscode';
+
+import { FileStatus } from '../../bitbucket/model';
+
+export class FileDecorationProvider implements vscode.FileDecorationProvider {
+    private _onDidChangeFileDecorations = new vscode.EventEmitter<vscode.Uri[]>();
+    readonly onDidChangeFileDecorations = this._onDidChangeFileDecorations.event;
+
+    provideFileDecoration(
+        uri: vscode.Uri,
+        _token: vscode.CancellationToken,
+    ): vscode.ProviderResult<vscode.FileDecoration> {
+        try {
+            const params = JSON.parse(uri.query);
+            const status = params.status as FileStatus;
+            const hasComments = params.hasComments;
+            if (status) {
+                return {
+                    badge: hasComments ? `💬${status}` : status,
+                    color: this.getColor(status),
+                    tooltip: hasComments ? `File has comments` : undefined,
+                    propagate: false,
+                };
+            }
+        } catch (e) {
+            console.error('Error in provideFileDecoration:', e);
+        }
+        return undefined;
+    }
+
+    private getColor(status: FileStatus): vscode.ThemeColor {
+        switch (status) {
+            case FileStatus.MODIFIED:
+                return new vscode.ThemeColor('gitDecoration.modifiedResourceForeground');
+            case FileStatus.ADDED:
+                return new vscode.ThemeColor('gitDecoration.addedResourceForeground');
+            case FileStatus.DELETED:
+                return new vscode.ThemeColor('gitDecoration.deletedResourceForeground');
+            case FileStatus.RENAMED:
+                return new vscode.ThemeColor('gitDecoration.renamedResourceForeground');
+            case FileStatus.CONFLICT:
+                return new vscode.ThemeColor('gitDecoration.conflictingResourceForeground');
+            case FileStatus.COPIED:
+                return new vscode.ThemeColor('gitDecoration.addedResourceForeground');
+            default:
+                return new vscode.ThemeColor('gitDecoration.modifiedResourceForeground');
+        }
+    }
+}

src/views/nodes/pullRequestFilesNode.ts

@@ -4,53 +4,45 @@ import * as vscode from 'vscode';
 import { FileStatus } from '../../bitbucket/model';
 import { Commands } from '../../commands';
 import { configuration } from '../../config/configuration';
-import { Resources } from '../../resources';
 import { DiffViewArgs } from '../pullrequest/diffViewHelper';
-import { PullRequestContextValue } from '../pullrequest/pullRequestNode';
 import { AbstractBaseNode } from './abstractBaseNode';
 
 export class PullRequestFilesNode extends AbstractBaseNode {
     constructor(private diffViewData: DiffViewArgs) {
         super();
     }
 
+    createFileChangeUri(fileName: string, status: FileStatus, prUrl: string, hasComments: boolean): vscode.Uri {
+        return vscode.Uri.parse(`${prUrl}/${fileName}`).with({
+            scheme: 'pullRequest',
+            query: JSON.stringify({
+                status: status,
+                hasComments: hasComments,
+            }),
+        });
+    }
+
     async getTreeItem(): Promise<vscode.TreeItem> {
         const itemData = this.diffViewData.fileDisplayData;
         let fileDisplayString = itemData.fileDisplayName;
         if (configuration.get<boolean>('bitbucket.explorer.nestFilesEnabled')) {
             fileDisplayString = path.basename(itemData.fileDisplayName);
         }
-        const item = new vscode.TreeItem(
-            `${itemData.numberOfComments > 0 ? '💬 ' : ''}${fileDisplayString}`,
-            vscode.TreeItemCollapsibleState.None,
-        );
+        const item = new vscode.TreeItem(fileDisplayString, vscode.TreeItemCollapsibleState.None);
         item.tooltip = itemData.fileDisplayName;
         item.command = {
             command: Commands.ViewDiff,
             title: 'Diff file',
             arguments: this.diffViewData.diffArgs,
         };
 
-        item.contextValue = PullRequestContextValue;
-        item.resourceUri = vscode.Uri.parse(`${itemData.prUrl}#chg-${itemData.fileDisplayName}`);
-        switch (itemData.fileDiffStatus) {
-            case FileStatus.ADDED:
-                item.iconPath = Resources.icons.get('add-circle');
-                break;
-            case FileStatus.DELETED:
-                item.iconPath = Resources.icons.get('delete');
-                break;
-            case FileStatus.CONFLICT:
-                item.iconPath = Resources.icons.get('warning');
-                break;
-            default:
-                item.iconPath = Resources.icons.get('edit');
-                break;
-        }
-
-        if (this.diffViewData.fileDisplayData.isConflicted) {
-            item.iconPath = Resources.icons.get('warning');
-        }
+        item.resourceUri = this.createFileChangeUri(
+            itemData.fileDisplayName,
+            itemData.fileDiffStatus,
+            itemData.prUrl,
+            itemData.numberOfComments > 0,
+        );
+        item.iconPath = undefined;
 
         return item;
     }

src/views/pullrequest/pullRequestNode.ts

@@ -64,6 +64,12 @@ export class PullRequestTitlesNode extends AbstractBaseNode {
         item.iconPath = vscode.Uri.parse(this.pr.data!.author!.avatarUrl);
         item.contextValue = PullRequestContextValue;
         item.resourceUri = vscode.Uri.parse(this.pr.data.url);
+        item.command = {
+            command: Commands.BitbucketShowPullRequestDetails,
+            title: 'Open pull request details',
+            arguments: [this.pr],
+        };
+
         let dateString = '';
         if (typeof this.pr.data.updatedTs === 'number') {
             dateString = formatDistanceToNow(new Date(this.pr.data.updatedTs), {
@@ -102,7 +108,6 @@ export class PullRequestTitlesNode extends AbstractBaseNode {
             fileChangedNodes = await createFileChangesNodes(this.pr, comments, files, [], []);
             // update loadedChildren with critical data without commits
             this.loadedChildren = [
-                new DescriptionNode(this.pr),
                 ...(this.pr.site.details.isCloud ? [new CommitSectionNode(this.pr, [], true)] : []),
                 ...fileChangedNodes,
             ];
@@ -130,7 +135,6 @@ export class PullRequestTitlesNode extends AbstractBaseNode {
             ]);
             // update loadedChildren with additional data
             this.loadedChildren = [
-                new DescriptionNode(this.pr),
                 ...(this.pr.site.details.isCloud ? [new CommitSectionNode(this.pr, commits)] : []),
                 ...jiraIssueNodes,
                 ...fileNodes,
@@ -148,7 +152,7 @@ export class PullRequestTitlesNode extends AbstractBaseNode {
         }
 
         this.isLoading = true;
-        this.loadedChildren = [new DescriptionNode(this.pr), new SimpleNode('Loading...')];
+        this.loadedChildren = [new SimpleNode('Loading...')];
         let fileDiffs: FileDiff[] = [];
         let allComments: PaginatedComments = { data: [] };
         let fileChangedNodes: AbstractBaseNode[] = [];
@@ -168,7 +172,6 @@ export class PullRequestTitlesNode extends AbstractBaseNode {
         const commits = await commitsPromise;
         // update loadedChildren with commits data
         this.loadedChildren = [
-            new DescriptionNode(this.pr),
             ...(this.pr.site.details.isCloud ? [new CommitSectionNode(this.pr, commits)] : []),
             ...fileChangedNodes,
         ];