Add file name styling

Author: sn2912

src/codebucket/command/registerCommands.ts

@@ -1,8 +1,9 @@
-import { commands, ExtensionContext } from 'vscode';
+import { commands, ExtensionContext, window } from 'vscode';
 import { CopyBitbucketPullRequestCommand } from './command-copy-pullreqest';
 import { OpenInBitbucketCommand } from './command-open';
 import { OpenBitbucketChangesetCommand } from './command-open-changeset';
 import { OpenBitbucketPullRequestCommand } from './command-open-pullrequest';
+import { FileDecorationProvider } from 'src/views/nodes/pullRequestFilesNode';
 
 enum CodebucketCommands {
     OpenInBitbucket = 'atlascode.bb.openInBitbucket',
@@ -33,4 +34,6 @@ export function activate(context: ExtensionContext) {
         copyPullRequest.run(),
     );
     context.subscriptions.push(copyPullRequestCmd);
+    const decorationProvider = new FileDecorationProvider();
+    context.subscriptions.push(window.registerFileDecorationProvider(decorationProvider));
 }

src/views/nodes/pullRequestFilesNode.ts

@@ -3,13 +3,58 @@ import * as vscode from 'vscode';
 import { FileStatus, PullRequest } 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';
 import { Container } from '../../container';
 import { DirectoryNode } from './directoryNode';
 import * as crypto from 'crypto';
+import { Logger } from 'src/logger';
+
+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');
+        }
+    }
+}
 
 export class PullRequestFilesNode extends AbstractBaseNode {
     constructor(
@@ -45,16 +90,26 @@ export class PullRequestFilesNode extends AbstractBaseNode {
         }
     }
 
+    createFileChangeUri(fileName: string, status: FileStatus, prUrl: string, hasComments: boolean): vscode.Uri {
+        if (hasComments) {
+            Logger.debug(hasComments, prUrl, 'hasComments');
+        }
+        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.checkboxState = this.checked
             ? vscode.TreeItemCheckboxState.Checked
@@ -68,28 +123,14 @@ export class PullRequestFilesNode extends AbstractBaseNode {
             title: 'Diff file',
             arguments: this.diffViewData.diffArgs,
         };
-
-        item.contextValue = `${PullRequestContextValue}${this.checked ? '.checked' : ''}`;
-        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');
-        }
-
+        // Create URI with both status and comment information
+        item.resourceUri = this.createFileChangeUri(
+            itemData.fileDisplayName,
+            itemData.fileDiffStatus,
+            itemData.prUrl,
+            itemData.numberOfComments > 0,
+        );
+        item.iconPath = undefined;
         return item;
     }