feat: mr comment.

Author: cangzhang

src/codingServer.ts

@@ -19,6 +19,8 @@ import {
   ICreateCommentResp,
   IMRStatusResp,
   IMRCommentResp,
+  IFileDiffParam,
+  IFileDiffResp,
 } from 'src/typings/respResult';
 
 import { PromiseAdapter, promiseFromEvent, parseQuery, parseCloneUrl } from 'src/common/utils';
@@ -717,6 +719,32 @@ export class CodingServer {
     }
   }
 
+  public async fetchFileDiffs(param: IFileDiffParam) {
+    try {
+      const { repoApiPrefix } = await this.getApiPrefix();
+      const resp: IFileDiffResp = await got
+        .get(`http://127.0.0.1:5000/api/git/compare_with_path`, {
+          // .get(`${repoApiPrefix}/compare_with_path`, {
+          searchParams: {
+            access_token: this._session?.accessToken,
+            base: param.base,
+            compare: param.compare,
+            path: encodeURIComponent(param.path),
+            mergeRequestId: param.mergeRequestId,
+          },
+        })
+        .json();
+
+      if (resp.code) {
+        return Promise.reject(resp);
+      }
+
+      return resp;
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }
+
   get loggedIn() {
     return this._loggedIn;
   }

src/common/contants.ts

@@ -1 +1,3 @@
 export const MRUriScheme = `coding-mr`;
+
+export const EmptyUserAvatar = `https://coding-net-production-static-ci.codehub.cn/7167f369-59ff-4196-bb76-a9959cf2b906.png`;

src/common/utils.ts

@@ -66,3 +66,15 @@ export function getNonce() {
   }
   return text;
 }
+
+const HunkRegExp = /@@.+@@/g;
+export const isHunkLine = (hunk: string) => HunkRegExp.test(hunk);
+
+export const getDiffLineNumber = (hunk: string) => {
+  const matchedHunks = hunk.match(/[-+]\d+,\d+/g) || [];
+  return matchedHunks.map((i) => {
+    const [start, sum] = i.match(/\d+/g)?.map((j) => +j) || [0, 0];
+    const end = start + sum > 0 ? start + sum - 1 : 0;
+    return [start, end];
+  });
+};

src/extension.ts

@@ -10,7 +10,8 @@ import { IRepoInfo, IMRWebViewDetail, ISessionData } from 'src/typings/commonTyp
 import { GitService } from 'src/common/gitService';
 import { ReviewComment, replyNote } from './reviewCommentController';
 import { MRUriScheme } from 'src/common/contants';
-import { IDiffComment, IMRData } from 'src/typings/respResult';
+import { IDiffComment, IMRData, IFileDiffParam } from 'src/typings/respResult';
+import { getDiffLineNumber, isHunkLine } from 'src/common/utils';
 
 export async function activate(context: vscode.ExtensionContext) {
   await GitService.init();
@@ -54,13 +55,42 @@ export async function activate(context: vscode.ExtensionContext) {
   context.subscriptions.push(commentController);
 
   commentController.commentingRangeProvider = {
-    provideCommentingRanges: (document: vscode.TextDocument, token: vscode.CancellationToken) => {
+    provideCommentingRanges: async (
+      document: vscode.TextDocument,
+      token: vscode.CancellationToken,
+    ) => {
       if (document.uri.scheme !== MRUriScheme) {
-        return;
+        return [];
       }
 
-      const lineCount = document.lineCount;
-      return [new vscode.Range(0, 0, lineCount - 1, 0)];
+      try {
+        const params = new URLSearchParams(decodeURIComponent(document.uri.query));
+        const iid = params.get('mr') || ``;
+        let param: IFileDiffParam = {
+          path: params.get('path') ?? ``,
+          base: params.get('leftSha') ?? ``,
+          compare: params.get('rightSha') ?? ``,
+          mergeRequestId: iid ?? ``,
+        };
+        const {
+          data: { diffLines },
+        } = await codingSrv.fetchFileDiffs(param);
+        const ret = diffLines.reduce((result, i) => {
+          const isHunk = isHunkLine(i.text);
+          if (!isHunk) {
+            return result;
+          }
+
+          const [left, right] = getDiffLineNumber(i.text);
+          const [start, end] = params.get('right') ? right : left;
+          result.push(new vscode.Range(start, 0, end, 0));
+          return result;
+        }, [] as vscode.Range[]);
+        return ret;
+      } catch (e) {
+        console.error('fetch diff lines failed.');
+        return [];
+      }
     },
   };
 
@@ -211,9 +241,11 @@ export async function activate(context: vscode.ExtensionContext) {
       async (file: IFileNode, mr: IMRData) => {
         const headUri = vscode.Uri.parse(file.path, false).with({
           scheme: MRUriScheme,
-          query: `commit=${file.newSha}&path=${file.path}`,
+          query: `leftSha=${file.oldSha}&rightSha=${file.newSha}&path=${file.path}&right=true&mr=${mr.iid}`,
+        });
+        const parentUri = headUri.with({
+          query: `leftSha=${file.oldSha}&rightSha=${file.newSha}&path=${file.path}&right=false&mr=${mr.iid}`,
         });
-        const parentUri = headUri.with({ query: `commit=${file.oldSha}&path=${file.path}` });
         await vscode.commands.executeCommand(
           `vscode.diff`,
           parentUri,
@@ -224,6 +256,7 @@ export async function activate(context: vscode.ExtensionContext) {
 
         try {
           const commentResp = await codingSrv.getMRComments(mr.iid);
+
           (commentResp.data as IDiffComment[][])
             .filter((i) => {
               const first = i[0];
@@ -268,15 +301,15 @@ export async function activate(context: vscode.ExtensionContext) {
     vscode.commands.registerCommand(
       `codingPlugin.diff.createComment`,
       (reply: vscode.CommentReply) => {
-        replyNote(reply);
+        replyNote(reply, context);
       },
     ),
   );
   context.subscriptions.push(
     vscode.commands.registerCommand(
       `codingPlugin.diff.replyComment`,
       (reply: vscode.CommentReply) => {
-        replyNote(reply);
+        replyNote(reply, context);
       },
     ),
   );

src/reviewCommentController.ts

@@ -1,4 +1,6 @@
 import * as vscode from 'vscode';
+import { ISessionData } from 'src/typings/commonTypes';
+import { EmptyUserAvatar } from 'src/common/contants';
 
 let commentId = 1;
 
@@ -16,18 +18,29 @@ export class ReviewComment implements vscode.Comment {
   }
 }
 
-export function replyNote(reply: vscode.CommentReply) {
+export function replyNote(reply: vscode.CommentReply, context: vscode.ExtensionContext) {
+  const curUser = context.workspaceState.get<ISessionData>(`session`);
+  const commentAuthor: vscode.CommentAuthorInformation = curUser?.user
+    ? {
+        name: `${curUser.user.name} (${curUser.user.global_key})`,
+        iconPath: vscode.Uri.parse(curUser.user.avatar, false),
+      }
+    : {
+        name: `vscode user`,
+        iconPath: vscode.Uri.parse(EmptyUserAvatar, false),
+      };
   const thread = reply.thread;
+  thread.contextValue = `editable`;
   const newComment = new ReviewComment(
     reply.text,
     vscode.CommentMode.Preview,
-    { name: 'vscode' },
+    commentAuthor,
     thread,
     thread.comments.length ? 'canDelete' : undefined,
   );
-  if (thread.contextValue === 'draft') {
-    newComment.label = 'pending';
-  }
+  // if (thread.contextValue === 'draft') {
+  //   newComment.label = 'pending';
+  // }
 
   thread.comments = [...thread.comments, newComment];
 }

src/tree/inMemMRContentProvider.ts

@@ -30,7 +30,7 @@ export class InMemMRContentProvider implements vscode.TextDocumentContentProvide
     token: vscode.CancellationToken,
   ): Promise<string> {
     const params = new URLSearchParams(decodeURIComponent(uri.query));
-    const commit = params.get(`commit`);
+    const commit = params.get(`right`) ? params.get(`rightSha`) : params.get('leftSha');
     const path = params.get(`path`);
     return await this._service.getRemoteFileContent(`${commit}/${path}`);
   }

src/typings/respResult.ts

@@ -342,3 +342,14 @@ export type IMRComment = IDiffComment | IActivityComment;
 export interface IMRCommentResp extends CodingResponse {
   data: IMRComment[][];
 }
+
+export interface IFileDiffParam {
+  path: string;
+  base: string;
+  compare: string;
+  mergeRequestId: string;
+}
+
+export interface IFileDiffResp extends CodingResponse {
+  data: IDiffFile;
+}