chore: bug fix

Author: guqiankun.gqk

packages/acr/src/modules/common-commands/index.contribution.ts

@@ -85,25 +85,6 @@ export class CommonCommandsContribution implements CommandContribution {
       },
     });
 
-    // 注册命令 供外部调用props
-    commandRegistry.registerCommand(
-      {
-        id: 'antcode-cr.props',
-      },
-      {
-        execute: async () => {
-          const { comments, annotations, projectMeta, pullRequestChangeList, noteIdToReplyIdSet } =
-            this.antCodeService;
-          return {
-            comments,
-            annotations,
-            projectMeta,
-            pullRequestChangeList,
-            noteIdToReplyIdSet: noteIdToReplyIdSet,
-          };
-        },
-      }
-    );
     commandRegistry.registerCommand(
       {
         id: 'antcode-cr.setBadge',

packages/acr/src/normalize.less

@@ -12,6 +12,9 @@ html {
   // 全局默认字体颜色
   color: var(--foreground);
   background-color: var(--editor-background);
+  
+  // 全局设置滚动条样式
+  // scrollbar 重置为应用的值，react-custom-scrollbars 用的 body 滚动条宽度，mac 上为 15px，windows 上为 17px
   // 这里如果设置为 kaitian 的 10px，会导致无法滚到到顶部，有 5~7px 的偏差
   // issue 见 https://baiyan.alipay.com/task/122717?bqlKey=fc2b39b
    ::-webkit-scrollbar {

packages/integrations/src/antcode-cr/index.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useEffect } from 'react';
+import { useEffect, useRef } from 'react';
 import ReactDOM from 'react-dom';
 import { Button, Switch } from 'antd';
 import 'antd/dist/antd.css';
@@ -51,7 +51,7 @@ const App = () => {
   const fileReadMarkChange$ = useFileReadMarkChange$(diffsPack?.diffs ?? [], readMarks);
 
   useEffect(() => {
-    if (!CodeScaningPlugin.ready) {
+    if (!CodeScaningPlugin?.ready) {
       return;
     }
     // map 需要转译
@@ -72,16 +72,28 @@ const App = () => {
     );
   }, [commentPack.updateFlag]);
   useEffect(() => {
-    if (!CodeScaningPlugin.ready) {
+    if (!CodeScaningPlugin?.ready) {
       return;
     }
     CodeScaningPlugin.commands?.executeCommand('antcode-cr.update', 'annotations', annotationPacks);
   }, [annotationPacks]);
 
-  // const extensionMetadata = useLoadLocalExtensionMetadata()
-  // if(!extensionMetadata) return null
+  const extensionMetadata = useLoadLocalExtensionMetadata();
+  if (!extensionMetadata) return null;
   if (!diffsPack) return null;
 
+  CodeScaningPlugin.setProps({
+    noteIdToNote: commentPack.noteIdToNote,
+    annotations: annotationPacks,
+    projectMeta: {
+      projectId: project.pathWithNamespace,
+      prId: pr?.iid,
+      pullRequestId: pr?.id,
+    },
+    pullRequestChangeList: diffsPack?.diffs,
+    noteIdToReplyIdSet: commentPack.noteIdToReplyIdSet,
+  });
+
   const props = {
     noteIdToReplyIdSet: commentPack.noteIdToReplyIdSet,
     addLineNum: diffsPack.addLineNum,
@@ -145,8 +157,8 @@ const App = () => {
         .with({ path: path.join('/antcode', project.pathWithNamespace, 'raw') })
         .toString(),
       plugins: [acrPlugin, CodeScaningPlugin],
-      extensionMetadata: [CodeScaning],
-      // extensionMetadata
+      // extensionMetadata: [CodeScaning],
+      extensionMetadata,
     },
   } as IAntcodeCRProps;
 

packages/integrations/src/common/code-scaning.plugin.ts

@@ -5,6 +5,10 @@ export class Plugin implements IPluginModule {
 
   private _commands: IPluginAPI['commands'] | null = null;
 
+  private _ready: boolean = false;
+
+  private props: null = null;
+
   get commands() {
     return this._commands;
   }
@@ -13,15 +17,16 @@ export class Plugin implements IPluginModule {
     return this._ready;
   }
 
-  private _ready: boolean = false;
+  setProps(props) {
+    this.props = props;
+  }
 
   async activate({ context, commands }: IPluginAPI) {
     this._commands = commands;
     context.subscriptions.push(
-      // 判断 extension 注册成功
-      commands.registerCommand('antcode-cr.plugin.ready', async () => {
-        this._ready = (await commands.executeCommand('antcode-cr.ready')) as boolean;
-        return true;
+      commands.registerCommand('antcode-cr.plugin.props', async () => {
+        this._ready = true;
+        return this.props;
       })
     );
   }