@opensumi/ide-editor 2.27.3-next-1714461024.0 → 2.27.3-next-1714464252.0

package/lib/browser/merge-editor/merge-editor.module.less

@@ -0,0 +1,71 @@
+.merge_editor_float_container {
+  display: flex;
+  flex-direction: column;
+  background: var(--kt-panelTab-activeBackground);
+  box-shadow: inset 1px 1px 3px 0px var(--kt-panelTab-border);
+  justify-content: space-between;
+  white-space: nowrap;
+  // minimap's z-index is 5
+  z-index: 6;
+  padding: 10px;
+
+  .merge_editor_float_container_info {
+    width: 100%;
+    display: flex;
+    padding-left: 20px;
+  }
+
+  .merge_editor_float_container_operation_bar {
+    width: 100%;
+    display: flex;
+    justify-content: flex-end;
+    white-space: nowrap;
+    padding-top: 4px;
+    padding-right: 20px;
+  }
+
+  .merge_conflict_bottom_btn {
+    border: 1px solid var(--kt-button-disableForeground);
+    border-radius: 8px;
+    padding: 5px 16px;
+    background: var(--editor-background);
+    color: var(--editor-foreground);
+    margin: 0 4px;
+    line-height: 22px;
+    justify-content: end;
+    white-space: nowrap;
+    cursor: pointer;
+    :global {
+      .kt-icon {
+        font-size: 12px;
+      }
+    }
+    :first-child {
+      margin-right: 8px;
+    }
+  }
+
+  .magic_btn {
+    background-image: radial-gradient(circle at -21% -22%, #19cfff, #8429ff);
+    border: none;
+    font-weight: 500;
+    span {
+      color: #fff;
+    }
+    :global {
+      .kt-icon {
+        color: #fff;
+        font-size: 12px;
+        margin-right: 8px;
+      }
+    }
+  }
+
+  .line_vertical {
+    background-color: var(--design-borderColor-common);
+    width: 1px;
+    min-width: 1px;
+    height: 24px;
+    margin: 4px;
+  }
+}

package/lib/browser/merge-editor/merge-editor.provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-editor.provider.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,YAAY,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG3F,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC5D,qBACa,2BAA4B,SAAQ,YAAa,YAAW,iBAAiB;IACxF,MAAM,SAAiB;IAGvB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAG5C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IAEjD,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAwBvD,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,eAAe,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,YAAY,CAAC,OAAO,CAAC;CAajH"}
+{"version":3,"file":"merge-editor.provider.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,YAAY,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG3F,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC5D,qBACa,2BAA4B,SAAQ,YAAa,YAAW,iBAAiB;IACxF,MAAM,SAAiB;IAGvB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAG5C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IAEjD,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IA2BvD,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,eAAe,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,YAAY,CAAC,OAAO,CAAC;CAajH"}

package/lib/browser/merge-editor/merge-editor.provider.js

@@ -18,6 +18,9 @@ let MergeEditorResourceProvider = class MergeEditorResourceProvider extends ide_
             const resultEditorUri = new ide_core_browser_1.URI(output);
             const icon = this.labelService.getIcon(resultEditorUri);
             return {
+                // 如果设置为 true，再打开时没有找到对应的 provider 会报错
+                // TODO: 需要增加一个标记，说明这个资源要在某个插件加载后才能 revive
+                supportsRevive: false,
                 name,
                 icon,
                 uri,

package/lib/browser/merge-editor/merge-editor.provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge-editor.provider.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.provider.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAA2F;AAC3F,qHAAgH;AAIzG,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,+BAAY;IAAtD;;QACL,WAAM,GAAG,aAAa,CAAC;IA6CzB,CAAC;IArCQ,eAAe,CAAC,GAAQ;QAC7B,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,cAAc,EAAE,CAAC;QAEpD,IAAI;YACF,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC/C,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;YAC3D,MAAM,eAAe,GAAG,IAAI,sBAAG,CAAC,MAAM,CAAC,CAAC;YACxC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YACxD,OAAO;gBACL,IAAI;gBACJ,IAAI;gBACJ,GAAG;gBACH,QAAQ,EAAE;oBACR,QAAQ;oBACR,MAAM;oBACN,MAAM;oBACN,MAAM;iBACP;aACF,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAC,qCAAqC,CAAC,CAAC;SACpD;IACH,CAAC;IAEM,mBAAmB,CAAC,QAAwB,EAAE,eAAmC;QACtF,MAAM,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;QAEvD,IAAI;YACF,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC/C,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;YACjC,MAAM,SAAS,GAAG,IAAI,sBAAG,CAAC,MAAM,CAAC,CAAC;YAClC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;YACpD,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAC,qCAAqC,CAAC,CAAC;SACpD;IACH,CAAC;CACF,CAAA;AA3CC;IAAC,IAAA,cAAS,EAAC,+BAAY,CAAC;sCACO,+BAAY;iEAAC;AAE5C;IAAC,IAAA,cAAS,EAAC,yCAAkB,CAAC;sCACO,yCAAkB;uEAAC;AAP7C,2BAA2B;IADvC,IAAA,eAAU,GAAE;GACA,2BAA2B,CA8CvC;AA9CY,kEAA2B"}
+{"version":3,"file":"merge-editor.provider.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.provider.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAA2F;AAC3F,qHAAgH;AAIzG,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,+BAAY;IAAtD;;QACL,WAAM,GAAG,aAAa,CAAC;IAgDzB,CAAC;IAxCQ,eAAe,CAAC,GAAQ;QAC7B,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,cAAc,EAAE,CAAC;QAEpD,IAAI;YACF,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC/C,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;YAC3D,MAAM,eAAe,GAAG,IAAI,sBAAG,CAAC,MAAM,CAAC,CAAC;YACxC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YACxD,OAAO;gBACL,sCAAsC;gBACtC,0CAA0C;gBAC1C,cAAc,EAAE,KAAK;gBACrB,IAAI;gBACJ,IAAI;gBACJ,GAAG;gBACH,QAAQ,EAAE;oBACR,QAAQ;oBACR,MAAM;oBACN,MAAM;oBACN,MAAM;iBACP;aACF,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAC,qCAAqC,CAAC,CAAC;SACpD;IACH,CAAC;IAEM,mBAAmB,CAAC,QAAwB,EAAE,eAAmC;QACtF,MAAM,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;QAEvD,IAAI;YACF,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC/C,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;YACjC,MAAM,SAAS,GAAG,IAAI,sBAAG,CAAC,MAAM,CAAC,CAAC;YAClC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;YACpD,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAC,qCAAqC,CAAC,CAAC;SACpD;IACH,CAAC;CACF,CAAA;AA9CC;IAAC,IAAA,cAAS,EAAC,+BAAY,CAAC;sCACO,+BAAY;iEAAC;AAE5C;IAAC,IAAA,cAAS,EAAC,yCAAkB,CAAC;sCACO,yCAAkB;uEAAC;AAP7C,2BAA2B;IADvC,IAAA,eAAU,GAAE;GACA,2BAA2B,CAiDvC;AAjDY,kEAA2B"}

package/lib/common/editor.d.ts

@@ -103,7 +103,7 @@ export declare enum EditorType {
     MERGE_EDITOR_DIFF = "MERGE_EDITOR_DIFF"
 }
 /**
- * 一个IEditor代表了一个最小的编辑器单元，可以是CodeEditor中的一个，也可以是DiffEditor中的两个
+ * 一个IEditor代表了一个最小的编辑器单元，可以是 CodeEditor 中的一个，也可以是 DiffEditor 中的两个
  */
 export interface IEditor {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-editor",
-  "version": "2.27.3-next-1714461024.0",
+  "version": "2.27.3-next-1714464252.0",
   "files": [
     "lib",
     "src"
@@ -17,21 +17,21 @@
     "url": "git@github.com:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-core-common": "2.27.3-next-1714461024.0",
-    "@opensumi/ide-core-node": "2.27.3-next-1714461024.0",
-    "@opensumi/ide-file-service": "2.27.3-next-1714461024.0",
-    "@opensumi/ide-monaco": "2.27.3-next-1714461024.0",
-    "@opensumi/ide-utils": "2.27.3-next-1714461024.0",
+    "@opensumi/ide-core-common": "2.27.3-next-1714464252.0",
+    "@opensumi/ide-core-node": "2.27.3-next-1714464252.0",
+    "@opensumi/ide-file-service": "2.27.3-next-1714464252.0",
+    "@opensumi/ide-monaco": "2.27.3-next-1714464252.0",
+    "@opensumi/ide-utils": "2.27.3-next-1714464252.0",
     "vscode-oniguruma": "1.5.1"
   },
   "devDependencies": {
-    "@opensumi/ide-components": "2.27.3-next-1714461024.0",
-    "@opensumi/ide-core-browser": "2.27.3-next-1714461024.0",
-    "@opensumi/ide-dev-tool": "2.27.3-next-1714461024.0",
-    "@opensumi/ide-overlay": "2.27.3-next-1714461024.0",
-    "@opensumi/ide-quick-open": "2.27.3-next-1714461024.0",
-    "@opensumi/ide-theme": "2.27.3-next-1714461024.0",
-    "@opensumi/ide-workspace": "2.27.3-next-1714461024.0"
+    "@opensumi/ide-components": "2.27.3-next-1714464252.0",
+    "@opensumi/ide-core-browser": "2.27.3-next-1714464252.0",
+    "@opensumi/ide-dev-tool": "2.27.3-next-1714464252.0",
+    "@opensumi/ide-overlay": "2.27.3-next-1714464252.0",
+    "@opensumi/ide-quick-open": "2.27.3-next-1714464252.0",
+    "@opensumi/ide-theme": "2.27.3-next-1714464252.0",
+    "@opensumi/ide-workspace": "2.27.3-next-1714464252.0"
   },
-  "gitHead": "c01da0a090dfb170ba5a97f0e046d5ebf3fc06a7"
+  "gitHead": "fec3bd7dd5bb0d4005a3f3aa582d8954accc16dc"
 }

package/src/browser/doc-model/editor-document-model-service.ts

@@ -1,5 +1,7 @@
 import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
 import {
+  Dispatcher,
+  IDisposable,
   IEditorDocumentChange,
   IEditorDocumentModelSaveResult,
   ILogger,
@@ -27,6 +29,7 @@ import {
   EditorDocumentModelCreationEvent,
   EditorDocumentModelOptionExternalUpdatedEvent,
   IEditorDocumentModelContentRegistry,
+  IEditorDocumentModelCreationEventPayload,
   IEditorDocumentModelService,
   IPreferredModelOptions,
 } from './types';
@@ -67,7 +70,9 @@ export class EditorDocumentModelServiceImpl extends WithEventBus implements IEdi
 
   private preferredModelOptions = new Map<string, IPreferredModelOptions>();
 
-  private _ready = new ReadyEvent<void>();
+  private _ready = this.registerDispose(new ReadyEvent<void>());
+
+  private modelCreationEventDispatcher = this.registerDispose(new Dispatcher<void>());
 
   constructor() {
     super();
@@ -83,6 +88,7 @@ export class EditorDocumentModelServiceImpl extends WithEventBus implements IEdi
       this._delete(key);
     });
     this._modelReferenceManager.onInstanceCreated((model) => {
+      this.modelCreationEventDispatcher.dispatch(model.uri.toString());
       this.eventBus.fire(
         new EditorDocumentModelCreationEvent({
           uri: model.uri,
@@ -106,6 +112,10 @@ export class EditorDocumentModelServiceImpl extends WithEventBus implements IEdi
     );
   }
 
+  onDocumentModelCreated(uri: string, listener: () => void): IDisposable {
+    return this.modelCreationEventDispatcher.on(uri)(listener);
+  }
+
   private _delete(uri: string | URI): void {
     const modelDisposeDebounceTime = this.preferenceService.get<number>('editor.modelDisposeTime', 3000);
     // debounce

package/src/browser/doc-model/types.ts

@@ -14,6 +14,8 @@ import { EOL, EndOfLineSequence } from '@opensumi/ide-monaco/lib/browser/monaco-
 import { IEditorDocumentModelContentChange, SaveReason } from '../../common';
 import { IEditorDocumentModel, IEditorDocumentModelRef } from '../../common/editor';
 
+import { EditorDocumentModel } from './editor-document-model';
+
 export interface IDocModelUpdateOptions extends monaco.editor.ITextModelUpdateOptions {
   detectIndentation?: boolean;
 }
@@ -119,6 +121,8 @@ export interface IPreferredModelOptions {
 }
 
 export interface IEditorDocumentModelService {
+  onDocumentModelCreated(uri: string, listener: () => void): IDisposable;
+
   hasLanguage(languageId: string): boolean;
 
   createModelReference(uri: URI, reason?: string): Promise<IEditorDocumentModelRef>;

package/src/browser/editor-collection.service.ts

@@ -62,7 +62,7 @@ export class EditorCollectionServiceImpl extends WithEventBus implements EditorC
   @Autowired(IEditorFeatureRegistry)
   protected readonly editorFeatureRegistry: EditorFeatureRegistryImpl;
 
-  private _editors: Set<IMonacoImplEditor> = new Set();
+  private _editors: Set<ISumiEditor> = new Set();
   private _diffEditors: Set<IDiffEditor> = new Set();
 
   private _onCodeEditorCreate = new Emitter<ICodeEditor>();
@@ -100,11 +100,11 @@ export class EditorCollectionServiceImpl extends WithEventBus implements EditorC
     return editor;
   }
 
-  public listEditors(): IMonacoImplEditor[] {
+  public listEditors(): ISumiEditor[] {
     return Array.from(this._editors.values());
   }
 
-  public addEditors(editors: IMonacoImplEditor[]) {
+  public addEditors(editors: ISumiEditor[]) {
     const beforeSize = this._editors.size;
     editors.forEach((editor) => {
       if (!this._editors.has(editor)) {
@@ -123,7 +123,7 @@ export class EditorCollectionServiceImpl extends WithEventBus implements EditorC
     }
   }
 
-  public removeEditors(editors: IMonacoImplEditor[]) {
+  public removeEditors(editors: ISumiEditor[]) {
     const beforeSize = this._editors.size;
     editors.forEach((editor) => {
       this._editors.delete(editor);
@@ -199,7 +199,7 @@ export class EditorCollectionServiceImpl extends WithEventBus implements EditorC
   }
 }
 
-export type IMonacoImplEditor = IEditor;
+export type ISumiEditor = IEditor;
 
 export function insertSnippetWithMonacoEditor(
   editor: IMonacoCodeEditor,
@@ -578,9 +578,9 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
     return null;
   }
 
-  public originalEditor: IMonacoImplEditor;
+  public originalEditor: ISumiEditor;
 
-  public modifiedEditor: IMonacoImplEditor;
+  public modifiedEditor: ISumiEditor;
 
   public _disposed: boolean;
 

package/src/browser/editor-electron.contribution.ts

@@ -3,7 +3,6 @@ import {
   ClientAppContribution,
   Domain,
   EDITOR_COMMANDS,
-  IClientApp,
   KeybindingContribution,
   KeybindingRegistry,
   electronEnv,
@@ -44,7 +43,7 @@ export class EditorElectronContribution extends WithEventBus implements ClientAp
   /**
    * Return true in order to prevent exit
    */
-  async onWillStop(app: IClientApp) {
+  async onWillStop() {
     if (await this.workbenchEditorService.closeAllOnlyConfirmOnce()) {
       return true;
     }

package/src/browser/editor.decoration.service.ts

@@ -127,14 +127,16 @@ export class EditorDecorationCollectionService implements IEditorDecorationColle
     disposer.add(this.cssManager.addClass(className, styles));
     disposer.add(this.cssManager.addClass(inlineClassName, inlineStyles));
     if (options.after) {
+      const afterClassName = `${key}-after`;
       const styles = this.resolveContentCSSStyle(options.after);
-      disposer.add(this.cssManager.addClass(key + '::after', styles));
-      afterContentClassName = `${inlineBlockSelector} ${key}`;
+      disposer.add(this.cssManager.addClass(afterClassName + '::after', styles));
+      afterContentClassName = `${inlineBlockSelector} ${afterClassName}`;
     }
     if (options.before) {
+      const beforeClassName = `${key}-before`;
       const styles = this.resolveContentCSSStyle(options.before);
-      disposer.add(this.cssManager.addClass(key + '::before', styles));
-      beforeContentClassName = `${inlineBlockSelector} ${key}`;
+      disposer.add(this.cssManager.addClass(beforeClassName + '::before', styles));
+      beforeContentClassName = `${inlineBlockSelector} ${beforeClassName}`;
     }
     if (options.gutterIconPath) {
       const glyphMarginStyle = this.resolveCSSStyle({

package/src/browser/editor.module.less

@@ -568,57 +568,3 @@
 }
 
 // -------------- styles for editor empty component ends --------------
-
-// -------------- styles for merge editor component starts --------------
-.merge_editor_float_container {
-  display: flex;
-  background: var(--kt-panelTab-activeBackground);
-  box-shadow: inset 1px 1px 3px 0px var(--kt-panelTab-border);
-  padding: 16px 28px;
-  justify-content: end;
-  white-space: nowrap;
-  .merge_conflict_bottom_btn {
-    border: 1px solid var(--kt-button-disableForeground);
-    border-radius: 8px;
-    padding: 5px 16px;
-    background: var(--editor-background);
-    margin: 0 4px;
-    line-height: 22px;
-    justify-content: end;
-    white-space: nowrap;
-    cursor: pointer;
-    :global {
-      .kt-icon {
-        font-size: 12px;
-      }
-    }
-    :first-child {
-      margin-right: 8px;
-    }
-  }
-
-  .magic_btn {
-    background-image: radial-gradient(circle at -21% -22%, #19cfff, #8429ff);
-    border: none;
-    font-weight: 500;
-    span {
-      color: #fff;
-    }
-    :global {
-      .kt-icon {
-        color: #fff;
-        font-size: 12px;
-        margin-right: 8px;
-      }
-    }
-  }
-
-  .line_vertical {
-    background-color: var(--design-borderColor-common);
-    width: 1px;
-    min-width: 1px;
-    height: 24px;
-    margin: 4px;
-  }
-}
-// -------------- styles for merge editor component ends --------------

package/src/browser/hooks/useEditor.ts

@@ -0,0 +1,34 @@
+import { useEffect, useState } from 'react';
+
+import { URI, useInjectable } from '@opensumi/ide-core-browser';
+
+import { IEditorDocumentModelService } from '../doc-model/types';
+import { IEditorDocumentModelRef } from '../types';
+
+export function useEditorDocumentModelRef(uri: URI) {
+  const documentService: IEditorDocumentModelService = useInjectable(IEditorDocumentModelService);
+  const [ref, setRef] = useState<IEditorDocumentModelRef | null>(null);
+
+  useEffect(() => {
+    const run = () => {
+      const ref = documentService.getModelReference(uri);
+      if (ref) {
+        setRef(ref);
+      }
+    };
+
+    const toDispose = documentService.onDocumentModelCreated(uri.toString(), () => {
+      run();
+    });
+
+    run();
+    return () => {
+      toDispose.dispose();
+      if (ref) {
+        ref.dispose();
+      }
+    };
+  }, [uri]);
+
+  return ref;
+}

package/src/browser/hooks/useInMergeChanges.ts

@@ -0,0 +1,30 @@
+import { useEffect, useState } from 'react';
+
+import { IContextKeyService, useInjectable } from '@opensumi/ide-core-browser';
+
+const contextKey = 'git.mergeChangesObj';
+
+export const gitMergeChangesSet = new Set([contextKey]);
+
+export function useInMergeChanges(uriStr: string) {
+  const contextKeyService = useInjectable<IContextKeyService>(IContextKeyService);
+
+  const [inMergeChanges, setInMergeChanges] = useState(false);
+
+  useEffect(() => {
+    function run() {
+      const mergeChanges = contextKeyService.getValue<Record<string, boolean>>(contextKey) || {};
+      setInMergeChanges(mergeChanges[uriStr] || false);
+    }
+    run();
+
+    const disposed = contextKeyService.onDidChangeContext(({ payload }) => {
+      if (payload.affectsSome(gitMergeChangesSet)) {
+        run();
+      }
+    });
+    return () => disposed.dispose();
+  }, [uriStr]);
+
+  return inMergeChanges;
+}