Merge branch 'v3.6'

opensumi · Dec 17, 2024 · cf537d1 · cf537d1
2 parents a6234eb + 2d56a07
commit cf537d1
Show file tree

Hide file tree

Showing 69 changed files with 207 additions and 193 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,4 +1,4 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.6.1"
+  "version": "3.6.2"
 }
diff --git a/packages/addons/package.json b/packages/addons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-addons",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/ai-native/package.json b/packages/ai-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-ai-native",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/collaboration/package.json b/packages/collaboration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-collaboration",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/comments/package.json b/packages/comments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-comments",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-components",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "description": "@opensumi/ide-components",
   "license": "MIT",
   "main": "lib/index.js",

diff --git a/packages/connection/package.json b/packages/connection/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-connection",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/core-browser/package.json b/packages/core-browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-core-browser",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "description": "@opensumi/ide-core-browser",
   "files": [
     "lib",

diff --git a/packages/core-browser/src/components/resize/resize.tsx b/packages/core-browser/src/components/resize/resize.tsx
@@ -568,8 +568,11 @@ export const ResizeHandleVertical = (props: ResizeHandleProps) => {
 
   // keep = true 左右侧面板使用，保证相邻节点的总宽度不变
   const setAbsoluteSize = (size: number, isLatter?: boolean, keep?: boolean) => {
-    const currentPrev = prevElement.current!.clientHeight;
-    const currentNext = nextElement.current!.clientHeight;
+    if (!prevElement.current || !nextElement.current) {
+      return;
+    }
+    const currentPrev = prevElement.current.clientHeight;
+    const currentNext = nextElement.current.clientHeight;
     const totalSize = currentPrev + currentNext;
     if (props.flexMode) {
       const prevHeight = props.flexMode === ResizeFlexMode.Prev ? size : totalSize - size;

diff --git a/packages/core-common/package.json b/packages/core-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-core-common",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "description": "@opensumi/ide-core-common",
   "files": [
     "lib",

diff --git a/packages/core-electron-main/package.json b/packages/core-electron-main/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-core-electron-main",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "browser-preload"

diff --git a/packages/core-node/package.json b/packages/core-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-core-node",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "description": "@opensumi/ide-core-node",
   "files": [
     "lib",

diff --git a/packages/debug/package.json b/packages/debug/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-debug",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/decoration/package.json b/packages/decoration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-decoration",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/design/package.json b/packages/design/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-design",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/editor/package.json b/packages/editor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-editor",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/editor/src/browser/doc-model/editor-document-model.ts b/packages/editor/src/browser/doc-model/editor-document-model.ts
@@ -335,6 +335,13 @@ export class EditorDocumentModel extends Disposable implements IEditorDocumentMo
     if (this.monacoModel.isDisposed()) {
       return false;
     }
+    /**
+     * https://github.com/microsoft/vscode/blob/1.95.3/src/vscode-dts/vscode.d.ts#L14007
+     * 如果文档是只读状态，说明并不能进行保存, 自然不需要 dirty 状态
+     */
+    if (this.readonly) {
+      return false;
+    }
     return this._persistVersionId !== this.monacoModel.getAlternativeVersionId();
   }
 

diff --git a/packages/electron-basic/package.json b/packages/electron-basic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-electron-basic",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/explorer/package.json b/packages/explorer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-explorer",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/express-file-server/package.json b/packages/express-file-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-express-file-server",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/extension-manager/package.json b/packages/extension-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-extension-manager",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/extension-storage/package.json b/packages/extension-storage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-extension-storage",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/extension/package.json b/packages/extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-extension",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "hosted"

diff --git a/packages/extension/src/hosted/api/vscode/doc/doc-manager.host.ts b/packages/extension/src/hosted/api/vscode/doc/doc-manager.host.ts
@@ -179,15 +179,15 @@ export class ExtensionDocumentDataManagerImpl implements ExtensionDocumentDataMa
   $fireModelOptionsChangedEvent(e: IExtensionDocumentModelOptionsChangedEvent) {
     const document = this._documents.get(e.uri);
     if (document) {
+      if (isDefined(e.dirty)) {
+        document._acceptIsDirty(e.dirty);
+      }
       // 和 vscode 表现保持一致，接收到 languages 变更时，发送一个 close 和一个 open 事件
       if (isDefined(e.languageId) && e.languageId !== document._getLanguageId()) {
         document._acceptLanguageId(e.languageId);
         this._onDidCloseTextDocument.fire(document.document);
         this._onDidOpenTextDocument.fire(document.document);
       }
-      if (isDefined(e.dirty)) {
-        document._acceptIsDirty(e.dirty);
-      }
     }
   }
 
@@ -197,14 +197,14 @@ export class ExtensionDocumentDataManagerImpl implements ExtensionDocumentDataMa
     if (!document) {
       return;
     }
+    document._acceptIsDirty(dirty);
     document.onEvents({
       eol,
       versionId,
       changes,
       isRedoing,
       isUndoing,
     });
-    document._acceptIsDirty(dirty);
 
     let reason: vscode.TextDocumentChangeReason | undefined;
 

diff --git a/packages/file-scheme/package.json b/packages/file-scheme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-file-scheme",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/file-search/package.json b/packages/file-search/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-file-search",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/file-service/package.json b/packages/file-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-file-service",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/file-tree-next/package.json b/packages/file-tree-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-file-tree-next",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/i18n/package.json b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-i18n",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/keymaps/package.json b/packages/keymaps/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-keymaps",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/logs-core/package.json b/packages/logs-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-logs",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/main-layout/package.json b/packages/main-layout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-main-layout",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "description": "@opensumi/ide-main-layout",
   "files": [
     "lib",

diff --git a/packages/main-layout/src/browser/tabbar/bar.view.tsx b/packages/main-layout/src/browser/tabbar/bar.view.tsx
@@ -226,13 +226,16 @@ export const IconTabView: React.FC<{ component: ComponentRegistryProvider }> = (
   }, [component]);
 
   useEffect(() => {
+    // Immediately update with current component to handle initial badge value
+    setComponent({ ...component });
+
     const dispose = component.onChange((newComponent) => {
       setComponent(newComponent);
     });
     return () => {
       dispose.dispose();
     };
-  }, []);
+  }, [component]); // Add component as dependency to re-run effect when it changes
 
   return (
     <div className={styles_icon_tab}>
@@ -254,12 +257,13 @@ export const TextTabView: React.FC<{ component: ComponentRegistryProvider }> = (
   const [component, setComponent] = React.useState<ComponentRegistryProvider>(defaultComponent);
   useEffect(() => {
     const dispose = component.onChange((newComponent) => {
-      setComponent(newComponent);
+      // Immediately update with current component to handle initial badge value
+      setComponent({ ...newComponent });
     });
     return () => {
       dispose.dispose();
     };
-  }, []);
+  }, [component]); // Add component as dependency to re-run effect when it changes
   return (
     <div className={styles.text_tab}>
       <div className={styles.bottom_tab_title}>{component.options?.title?.toUpperCase()}</div>

diff --git a/packages/markdown/package.json b/packages/markdown/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-markdown",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/markers/package.json b/packages/markers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-markers",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/menu-bar/package.json b/packages/menu-bar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-menu-bar",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "description": "@opensumi/ide-menu-bar",
   "files": [
     "lib",

diff --git a/packages/monaco-enhance/package.json b/packages/monaco-enhance/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-monaco-enhance",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/monaco/package.json b/packages/monaco/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-monaco",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src",

diff --git a/packages/monaco/src/browser/contrib/merge-editor/view/merge-editor.module.less b/packages/monaco/src/browser/contrib/merge-editor/view/merge-editor.module.less
@@ -321,7 +321,7 @@
       display: flex;
       align-content: center;
       height: inherit;
-      max-width: calc(100% - 120px);
+      max-width: calc(100% - 140px);
       display: flex;
 
       .title {

diff --git a/packages/notebook/package.json b/packages/notebook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-notebook",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "license": "MIT",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

diff --git a/packages/opened-editor/package.json b/packages/opened-editor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-opened-editor",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"

diff --git a/packages/outline/package.json b/packages/outline/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-outline",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "files": [
     "lib",
     "src"