WIP: diff view.

Author: cangzhang

src/extension.ts

@@ -1,11 +1,11 @@
 import * as vscode from 'vscode';
 
 // import Logger from './common/logger';
-import { uriHandler, CodingServer } from './codingServer';
-import { Panel } from './panel';
-import { ListItem, MRTreeDataProvider } from './tree/mr-tree';
-import { ReleaseTreeDataProvider } from './tree/release-tree';
-import { RepoInfo } from './typings/commonTypes';
+import {uriHandler, CodingServer} from './codingServer';
+import {Panel} from './panel';
+import {IFileNode, MRTreeDataProvider} from './tree/mr-tree';
+import {ReleaseTreeDataProvider} from './tree/release-tree';
+import {RepoInfo} from './typings/commonTypes';
 
 export async function activate(context: vscode.ExtensionContext) {
   const repoInfo = await CodingServer.getRepoParams();
@@ -35,8 +35,8 @@ export async function activate(context: vscode.ExtensionContext) {
 
   const mrDataProvider = new MRTreeDataProvider(context, codingSrv);
   const releaseDataProvider = new ReleaseTreeDataProvider(context);
-  vscode.window.createTreeView(`mrTreeView`, { treeDataProvider: mrDataProvider });
-  vscode.window.createTreeView(`releaseTreeView`, { treeDataProvider: releaseDataProvider });
+  vscode.window.createTreeView(`mrTreeView`, {treeDataProvider: mrDataProvider, showCollapseAll: true});
+  vscode.window.createTreeView(`releaseTreeView`, {treeDataProvider: releaseDataProvider, showCollapseAll: true});
 
   context.subscriptions.push(vscode.window.registerUriHandler(uriHandler));
   context.subscriptions.push(
@@ -79,7 +79,7 @@ export async function activate(context: vscode.ExtensionContext) {
   context.subscriptions.push(
     vscode.commands.registerCommand('codingPlugin.switchRepo', async () => {
       try {
-        const { data } = await codingSrv.getRepoList();
+        const {data} = await codingSrv.getRepoList();
         const list = data.map(i => ({
           label: i.name,
           description: i.depotPath.replace(`/p/`, ``)
@@ -103,6 +103,11 @@ export async function activate(context: vscode.ExtensionContext) {
       }
     }),
   );
+  context.subscriptions.push(
+    vscode.commands.registerCommand(`codingPlugin.showDiff`, async (file: IFileNode) => {
+      await vscode.commands.executeCommand(`vscode.diff`, vscode.Uri);
+    }),
+  );
 
   if (vscode.window.registerWebviewPanelSerializer) {
     // Make sure we register a serializer in activation event
@@ -114,5 +119,4 @@ export async function activate(context: vscode.ExtensionContext) {
   }
 }
 
-export function deactivate() {
-}
+export function deactivate() {}

src/tree/mr-tree.ts

@@ -18,7 +18,7 @@ enum ItemType {
   Node = `node`,
 }
 
-interface IFileNode extends IMRPathItem {
+export interface IFileNode extends IMRPathItem {
   parentPath?: string;
   children?: IFileNode[]
 }
@@ -163,15 +163,15 @@ export class MRItem extends ListItem<IMRData> {
         `mr-desc`,
         vscode.TreeItemCollapsibleState.None,
         {
-        command: 'codingPlugin.showDetail',
-        title: `${this.value.iid} ${this.value.title}`,
-        arguments: [{
-          ...repoInfo,
-          iid: this.value.iid,
-          type: `mr`,
-          accessToken: session?.accessToken,
-        }],
-      }),
+          command: 'codingPlugin.showDetail',
+          title: `${this.value.iid} ${this.value.title}`,
+          arguments: [{
+            ...repoInfo,
+            iid: this.value.iid,
+            type: `mr`,
+            accessToken: session?.accessToken,
+          }],
+        }),
       ...files.map(f => new FileNode(f.name, f, (f.children || [])?.length > 0 ? vscode.TreeItemCollapsibleState.Expanded : vscode.TreeItemCollapsibleState.None)),
     ];
   }
@@ -201,8 +201,8 @@ export class MRItem extends ListItem<IMRData> {
   private _insert(node: IFileNode, nodes: IFileNode[]) {
     for (const i of nodes) {
       if (i.parentPath === node.parentPath) {
-        const hasSameRootNode = nodes.find(j => j.path === node.path);
-        if (hasSameRootNode) {
+        const hasSameParentNode = nodes.find(j => j.path === node.path);
+        if (hasSameParentNode) {
           break;
         }
 
@@ -235,9 +235,17 @@ export class FileNode extends ListItem<IFileNode> {
     public readonly label: string,
     public readonly value: IFileNode,
     public readonly collapsibleState: vscode.TreeItemCollapsibleState,
-    public readonly command?: vscode.Command,
   ) {
-    super(label, value, collapsibleState, command);
+    super(
+      label,
+      value,
+      collapsibleState,
+      collapsibleState === vscode.TreeItemCollapsibleState.None ? {
+        command: `codingPlugin.showDiff`,
+        title: ``,
+        arguments: [value]
+      } : undefined
+    );
   }
 
   public makeTree() {