chore: 增加全局contextkey

Author: guqiankun

packages/acr/src/modules/diff-folding/diff-folding.contribution.ts

@@ -22,7 +22,7 @@ import {
 } from '@opensumi/ide-core-browser';
 import { Domain } from '@opensumi/ide-core-common/lib/di-helper';
 import { WorkbenchEditorService } from '@opensumi/ide-editor';
-import { MiscCommands, MISC_IS_EXPAND_RAW_KEY } from '.';
+import { MiscCommands, MISC_IS_EXPAND_RAW_KEY, MISC_IS_DIFF_DATA } from '.';
 import { AntcodeDiffFoldingService } from './diff-folding.service';
 import { sleep, generateRange } from './utils';
 import { DiffFoldingWidgetService } from './zone-widget/widget.service';
@@ -68,14 +68,14 @@ export class DiffFoldingContribution extends WithEventBus implements CommandCont
   private disposeColl = new DisposableCollection();
 
   private readonly miscIsExpand: IContextKey<boolean>;
+  private readonly isDiffData: IContextKey<boolean>;
 
   private currentURI: URI | undefined;
 
-  private isDiffData = false;
-
   constructor() {
     super();
     this.miscIsExpand = MISC_IS_EXPAND_RAW_KEY.bind(this.globalContextKeyService);
+    this.isDiffData = MISC_IS_DIFF_DATA.bind(this.globalContextKeyService);
     this.antcodeDiffFoldingService.currentRangeModel.setCurrentRangeMap([], 'original');
     this.antcodeDiffFoldingService.currentRangeModel.setCurrentRangeMap([], 'modified');
   }
@@ -120,9 +120,9 @@ export class DiffFoldingContribution extends WithEventBus implements CommandCont
       this.gitDocContentProvider.diffData.has(originalUri.toString()) &&
       this.gitDocContentProvider.diffData.has(modifiedUri.toString())
     ) {
-      this.isDiffData = true;
+      this.isDiffData.set(true);
     } else {
-      this.isDiffData = false;
+      this.isDiffData.set(false);
     }
     // diff 数据折叠
     if (!this.preferenceService.get('acr.foldingEnabled') && !this.isDiffData) return;

packages/acr/src/modules/diff-folding/index.ts

@@ -23,6 +23,9 @@ export class MiscCommands {
 export const MISC_IS_EXPAND = 'misc.isExpand';
 export const MISC_IS_EXPAND_RAW_KEY = new RawContextKey<boolean>(MISC_IS_EXPAND, false);
 
+export const IS_DIFF_DATA = 'misc.isDiffData';
+export const MISC_IS_DIFF_DATA = new RawContextKey<boolean>(IS_DIFF_DATA, false);
+
 export interface IConverDiffByGit {
   content: string;
   type: '-' | '+' | null;

packages/acr/src/modules/merge-request/changes-tree/changes-tree.contribution.ts

@@ -176,7 +176,7 @@ export class ChangesTreeContribution
       },
       iconClass: getIcon('file-expand'),
       group: 'navigation',
-      when: 'isInDiffEditor && config.acr.foldingEnabled',
+      when: 'isInDiffEditor && config.acr.foldingEnabled && !misc.isDiffData',
       toggledWhen: 'config.misc.isExpand',
       order: 5,
     });

packages/acr/src/modules/open-change-files/index.ts

@@ -224,14 +224,10 @@ export class OpenChangeFilesService extends Disposable {
   async fetchDiff(path: string) {
     // 如果没有 diff 信息，则去请求
     const changeDiff = this.antcodeService.pullRequestChangeList.find((changeDiff) => {
-      if (changeDiff.newPath === path) {
-        return true;
-      } else if (changeDiff.newPath !== changeDiff.oldPath && changeDiff.oldPath === path) {
-        // 重命名文件
-        return true;
-      } else {
-        return false;
-      }
+      return (
+        changeDiff.newPath === path ||
+        (changeDiff.newPath !== changeDiff.oldPath && changeDiff.oldPath === path)
+      );
     });
     // @ts-ignore
     if (!changeDiff.diff) {