feat(mr): comments.

Author: cangzhang

src/codingServer.ts

@@ -18,14 +18,16 @@ import {
   IMRContentResp,
   ICreateCommentResp,
   IMRStatusResp,
+  IMRCommentResp,
 } from 'src/typings/respResult';
+
 import { PromiseAdapter, promiseFromEvent, parseQuery, parseCloneUrl } from 'src/common/utils';
 import { GitService } from 'src/common/gitService';
 import { IRepoInfo, ISessionData, TokenType } from 'src/typings/commonTypes';
 import { keychain } from 'src/common/keychain';
 import Logger from 'src/common/logger';
 
-const AUTH_SERVER = `https://x5p7m.csb.app`;
+const AUTH_SERVER = `https://ftxwn9.coding-pages.com`;
 const ClientId = `ff768664c96d04235b1cc4af1e3b37a8`;
 const ClientSecret = `d29ebb32cab8b5f0a643b5da7dcad8d1469312c7`;
 
@@ -390,10 +392,10 @@ export class CodingServer {
     }
   }
 
-  public async getMRComments(iid: string) {
+  public async getMRComments(iid: string | number) {
     try {
       const { repoApiPrefix } = await this.getApiPrefix();
-      const result: CodingResponse = await got
+      const result: IMRCommentResp = await got
         .get(`${repoApiPrefix}/merge/${iid}/comments`, {
           searchParams: {
             access_token: this._session?.accessToken,

src/common/contants.ts

@@ -0,0 +1 @@
+export const MRUriScheme = `coding-mr`;

src/extension.ts

@@ -7,6 +7,9 @@ import { IFileNode, MRTreeDataProvider } from 'src/tree/mrTree';
 import { ReleaseTreeDataProvider } from 'src/tree/releaseTree';
 import { IRepoInfo, IMRWebViewDetail, ISessionData } from 'src/typings/commonTypes';
 import { GitService } from 'src/common/gitService';
+import { ReviewComment, replyNote } from './reviewCommentController';
+import { MRUriScheme } from 'src/common/contants';
+import { IDiffComment, IMRData } from 'src/typings/respResult';
 
 export async function activate(context: vscode.ExtensionContext) {
   await GitService.init();
@@ -42,6 +45,23 @@ export async function activate(context: vscode.ExtensionContext) {
     showCollapseAll: true,
   });
 
+  const commentController = vscode.comments.createCommentController(
+    'mr-comment',
+    'Merge request diff comments',
+  );
+  context.subscriptions.push(commentController);
+
+  commentController.commentingRangeProvider = {
+    provideCommentingRanges: (document: vscode.TextDocument, token: vscode.CancellationToken) => {
+      if (document.uri.scheme !== MRUriScheme) {
+        return;
+      }
+
+      const lineCount = document.lineCount;
+      return [new vscode.Range(0, 0, lineCount - 1, 0)];
+    },
+  };
+
   context.subscriptions.push(vscode.window.registerUriHandler(uriHandler));
   context.subscriptions.push(
     vscode.commands.registerCommand('codingPlugin.showMROverview', async (mr: IMRWebViewDetail) => {
@@ -184,21 +204,63 @@ export async function activate(context: vscode.ExtensionContext) {
     }),
   );
   context.subscriptions.push(
-    vscode.commands.registerCommand(`codingPlugin.showDiff`, async (file: IFileNode) => {
-      const headUri = vscode.Uri.parse(file.path, false).with({
-        // path: `${file.path}.txt`,
-        scheme: `mr`,
-        query: `commit=${file.newSha}&path=${file.path}`,
-      });
-      const parentUri = headUri.with({ query: `commit=${file.oldSha}&path=${file.path}` });
-      await vscode.commands.executeCommand(
-        `vscode.diff`,
-        parentUri,
-        headUri,
-        `${file.name} (Merge Request)`,
-        { preserveFocus: true },
-      );
-    }),
+    vscode.commands.registerCommand(
+      `codingPlugin.showDiff`,
+      async (file: IFileNode, mr: IMRData) => {
+        const headUri = vscode.Uri.parse(file.path, false).with({
+          scheme: MRUriScheme,
+          query: `commit=${file.newSha}&path=${file.path}`,
+        });
+        const parentUri = headUri.with({ query: `commit=${file.oldSha}&path=${file.path}` });
+        await vscode.commands.executeCommand(
+          `vscode.diff`,
+          parentUri,
+          headUri,
+          `${file.name} (Merge Request #${mr.iid})`,
+          { preserveFocus: true },
+        );
+
+        const commentResp = await codingSrv.getMRComments(mr.iid);
+        const comments = (commentResp.data as IDiffComment[][])
+          .filter((i) => {
+            const first = i[0];
+            return !first.outdated && first.path === file.path;
+          }, [])
+          .map((i) => {
+            const root = i[0];
+            const isRight = root.change_type === 1;
+            const isLeft = root.change_type === 2;
+            const both = root.change_type === 3;
+
+            const rootLine = root.diffFile.diffLines[root.diffFile.diffLines.length - 1];
+            const lineNum = isLeft ? rootLine.leftNo : rootLine.rightNo;
+            const range = new vscode.Range(lineNum, 0, lineNum, 0);
+            const commentList: vscode.Comment[] = i.map((c) => {
+              const body = new vscode.MarkdownString(`${c.content}`);
+              body.isTrusted = true;
+              const comment: vscode.Comment = {
+                mode: vscode.CommentMode.Preview,
+                body: c.content,
+                author: {
+                  name: `${c.author.name}(${c.author.global_key})`,
+                  iconPath: vscode.Uri.parse(c.author.avatar, false),
+                },
+              };
+              return comment;
+            });
+            commentController.createCommentThread(headUri, range, commentList);
+          });
+      },
+    ),
+  );
+
+  context.subscriptions.push(
+    vscode.commands.registerCommand(
+      `codingPlugin.diff.createComment`,
+      async (reply: vscode.CommentReply) => {
+        replyNote(reply);
+      },
+    ),
   );
 
   if (vscode.window.registerWebviewPanelSerializer) {

src/reviewCommentController.ts

@@ -0,0 +1,33 @@
+import * as vscode from 'vscode';
+
+let commentId = 1;
+
+export class ReviewComment implements vscode.Comment {
+  id: number;
+  label: string | undefined;
+  constructor(
+    public body: string | vscode.MarkdownString,
+    public mode: vscode.CommentMode,
+    public author: vscode.CommentAuthorInformation,
+    public parent?: vscode.CommentThread,
+    public contextValue?: string,
+  ) {
+    this.id = ++commentId;
+  }
+}
+
+export function replyNote(reply: vscode.CommentReply) {
+  const thread = reply.thread;
+  const newComment = new ReviewComment(
+    reply.text,
+    vscode.CommentMode.Preview,
+    { name: 'vscode' },
+    thread,
+    thread.comments.length ? 'canDelete' : undefined,
+  );
+  if (thread.contextValue === 'draft') {
+    newComment.label = 'pending';
+  }
+
+  thread.comments = [...thread.comments, newComment];
+}

src/tree/mrTree.ts

@@ -6,6 +6,7 @@ import { CodingServer } from 'src/codingServer';
 import { IRepoInfo, ISessionData, GitChangeType } from 'src/typings/commonTypes';
 import { IMRDiffStat, IMRData, IMRPathItem } from 'src/typings/respResult';
 import { getInMemMRContentProvider } from './inMemMRContentProvider';
+import { MRUriScheme } from 'src/common/contants';
 
 enum MRType {
   Open = `open`,
@@ -69,7 +70,7 @@ export class MRTreeDataProvider implements vscode.TreeDataProvider<ListItem<ITre
     this._disposables = [];
     this._disposables.push(
       vscode.workspace.registerTextDocumentContentProvider(
-        'mr',
+        MRUriScheme,
         getInMemMRContentProvider(context, this._service),
       ),
     );
@@ -233,6 +234,7 @@ export class MRItem extends ListItem<IMRData> {
             (f.children || [])?.length > 0
               ? TreeItemCollapsibleState.Expanded
               : TreeItemCollapsibleState.None,
+            this.value,
           ),
       ),
     ];
@@ -297,6 +299,7 @@ export class FileNode extends ListItem<IFileNode> {
     public readonly label: string,
     public readonly value: IFileNode,
     public readonly collapsibleState: TreeItemCollapsibleState,
+    public readonly mrData: IMRData,
   ) {
     super(
       label,
@@ -306,7 +309,7 @@ export class FileNode extends ListItem<IFileNode> {
         ? {
             command: `codingPlugin.showDiff`,
             title: ``,
-            arguments: [value],
+            arguments: [value, mrData],
           }
         : undefined,
       FileNode.getFileIcon(value.changeType, collapsibleState),
@@ -333,6 +336,7 @@ export class FileNode extends ListItem<IFileNode> {
           (f.children || [])?.length > 0
             ? TreeItemCollapsibleState.Expanded
             : TreeItemCollapsibleState.None,
+          this.mrData,
         ),
     );
   }

src/typings/respResult.ts

@@ -266,3 +266,79 @@ export interface IMRStatus {
 export interface IMRStatusResp extends CodingResponse {
   data: IMRStatus;
 }
+
+export interface IDiffLine {
+  index: number;
+  leftNo: number;
+  rightNo: number;
+  prefix: string;
+  text: string;
+}
+
+export interface IDiffFile {
+  linkRef: string;
+  linkUrl: string;
+  path: string;
+  changeType: string;
+  fileType: string;
+  type: string;
+  pathMD5: string;
+  changeMode: string;
+  oldMode: string;
+  newMode: string;
+  language: string;
+  insertions: number;
+  deletions: number;
+  isChangeInfoValid: boolean;
+  diffLines: IDiffLine[];
+}
+
+export interface IChildComment {
+  id: number;
+  noteable_type: string;
+  noteable_id: number;
+  content: string;
+  outdated: boolean;
+  author: IUserItem;
+  parentId: number;
+  created_at: number;
+  hasResourceReference: boolean;
+}
+
+export interface IDiffComment {
+  id: number;
+  commitId: string;
+  noteable_type: string;
+  noteable_id: number;
+  line: number;
+  change_type: number;
+  position: number;
+  path: string;
+  anchor: string;
+  content: string;
+  outdated: boolean;
+  parentId: number;
+  created_at: number;
+  hasResourceReference: boolean;
+  author: IUserItem;
+  diffFile: IDiffFile;
+}
+
+export interface IActivityComment {
+  id: number;
+  noteable_type: string;
+  noteable_id: number;
+  content: string;
+  outdated: boolean;
+  parentId: number;
+  created_at: number;
+  hasResourceReference: boolean;
+  author: IUserItem;
+  childComments: IChildComment[];
+}
+
+export type IMRComment = IDiffComment | IActivityComment;
+
+export interface IMRCommentResp extends CodingResponse {
+  data: IMRComment[][];
+}