@opensumi/ide-core-browser 2.25.3 → 2.25.4-next-1688526464.0

package/lib/preferences/settings.d.ts

@@ -42,6 +42,10 @@ export interface IPreferenceViewDesc {
     hiddenInScope?: PreferenceScope[];
 }
 export interface ISettingSection {
+    /**
+     * 插件 ID
+     */
+    extensionId?: string;
     /**
      * 该 Section 的名字
      */

package/lib/preferences/settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/preferences/settings.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAElF,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,eAAO,MAAM,0BAA0B,eAAuC,CAAC;AAC/E,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,wBAAwB,EAAE,CAAC;IAEpC,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,eAAe,OAAE;IAE/D,gBAAgB,CAAC,KAAK,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,aAAa,EAAE,CAAC;IAE3E,oBAAoB,CAAC,KAAK,EAAE,aAAa,GAAG,WAAW,CAAC;IAExD,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,WAAW,CAAC;IAE/E,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,uBAAuB,EAAE,CAAC;IACzG,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAAC;IAC7E,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,GAAG;QAAE,KAAK,EAAE,GAAG,CAAC;QAAC,cAAc,EAAE,eAAe,CAAA;KAAE,CAAC;IAE/G,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAE/E,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/C,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa;IAE5B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,eAAe,EAAE,CAAC;CACnC;AAED,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,WAAW,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACpC;;OAEG;IACH,SAAS,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;QAAE,KAAK,EAAE,eAAe,CAAA;KAAE,CAAC,CAAC;IAC5D;;OAEG;IACH,WAAW,CAAC,EAAE,eAAe,EAAE,CAAC;IAChC;;OAEG;IACH,aAAa,CAAC,EAAE,eAAe,EAAE,CAAC;CACnC;AAED,MAAM,WAAW,uBAAwB,SAAQ,eAAe;IAC9D,WAAW,CAAC,EAAE,2BAA2B,EAAE,CAAC;IAC5C,WAAW,CAAC,EAAE,uBAAuB,EAAE,CAAC;CACzC;AAED,MAAM,WAAW,2BAA2B;IAC1C,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B"}
+{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/preferences/settings.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAElF,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,eAAO,MAAM,0BAA0B,eAAuC,CAAC;AAC/E,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,wBAAwB,EAAE,CAAC;IAEpC,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,eAAe,OAAE;IAE/D,gBAAgB,CAAC,KAAK,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,aAAa,EAAE,CAAC;IAE3E,oBAAoB,CAAC,KAAK,EAAE,aAAa,GAAG,WAAW,CAAC;IAExD,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,WAAW,CAAC;IAE/E,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,uBAAuB,EAAE,CAAC;IACzG,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAAC;IAC7E,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,GAAG;QAAE,KAAK,EAAE,GAAG,CAAC;QAAC,cAAc,EAAE,eAAe,CAAA;KAAE,CAAC;IAE/G,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAE/E,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/C,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa;IAE5B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,eAAe,EAAE,CAAC;CACnC;AAED,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,WAAW,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACpC;;OAEG;IACH,SAAS,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;QAAE,KAAK,EAAE,eAAe,CAAA;KAAE,CAAC,CAAC;IAC5D;;OAEG;IACH,WAAW,CAAC,EAAE,eAAe,EAAE,CAAC;IAChC;;OAEG;IACH,aAAa,CAAC,EAAE,eAAe,EAAE,CAAC;CACnC;AAED,MAAM,WAAW,uBAAwB,SAAQ,eAAe;IAC9D,WAAW,CAAC,EAAE,2BAA2B,EAAE,CAAC;IAC5C,WAAW,CAAC,EAAE,uBAAuB,EAAE,CAAC;CACzC;AAED,MAAM,WAAW,2BAA2B;IAC1C,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B"}

package/lib/react-providers/config-provider.d.ts

@@ -211,7 +211,7 @@ export interface AppConfig {
      * 视图组件内默认的组件样式资源 CDN 来源
      * 默认值为 'alipay'
      */
-    componentCDNType?: 'unpkg' | 'jsdelivr' | 'alipay';
+    componentCDNType?: TComponentCDNType;
     /**
      * 指定前端是否为 Electron 环境 (Electron Renderer)
      * 为兼容老的逻辑，若不兼容则 fallback 到 isElectronRenderer 的判断
@@ -248,4 +248,5 @@ export declare const ConfigContext: React.Context<AppConfig>;
 export declare function ConfigProvider(props: React.PropsWithChildren<{
     value: AppConfig;
 }>): JSX.Element;
+export type TComponentCDNType = 'unpkg' | 'jsdelivr' | 'alipay' | 'npmmirror';
 //# sourceMappingURL=config-provider.d.ts.map

package/lib/react-providers/config-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-provider.d.ts","sourceRoot":"","sources":["../../src/react-providers/config-provider.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"config-provider.d.ts","sourceRoot":"","sources":["../../src/react-providers/config-provider.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-core-browser",
-  "version": "2.25.3",
+  "version": "2.25.4-next-1688526464.0",
   "description": "@opensumi/ide-core-browser",
   "files": [
     "lib",
@@ -18,9 +18,9 @@
     "build": "tsc --build ../../configs/ts/references/tsconfig.core-browser.json"
   },
   "dependencies": {
-    "@opensumi/ide-components": "2.25.3",
-    "@opensumi/ide-connection": "2.25.3",
-    "@opensumi/ide-core-common": "2.25.3",
+    "@opensumi/ide-components": "2.25.4-next-1688526464.0",
+    "@opensumi/ide-connection": "2.25.4-next-1688526464.0",
+    "@opensumi/ide-core-common": "2.25.4-next-1688526464.0",
     "@opensumi/vscode-debugprotocol": "1.49.0-beta.1",
     "@vscode/codicons": "0.0.27",
     "ajv": "^6.10.0",
@@ -50,5 +50,5 @@
   "peerDependencies": {
     "react": ">=16.8.6"
   },
-  "gitHead": "f4e9157217c34d71493d704d32d0d0cf2dc9cc41"
+  "gitHead": "5b91ede7c8aaff39b2132b7d171ace7385fee1db"
 }

package/src/common/common.command.ts

@@ -363,6 +363,12 @@ export namespace EDITOR_COMMANDS {
     category: CATEGORY,
   };
 
+  export const MERGEEDITOR_RESET: Command = {
+    id: 'editor.mergeEditor.reset',
+    category: CATEGORY,
+    label: '%mergeEditor.reset%',
+  };
+
   export const CLOSE: Command = {
     id: 'editor.close',
     category: CATEGORY,
@@ -1012,3 +1018,14 @@ export namespace QUICK_OPEN_COMMANDS {
     id: 'editor.action.quickView',
   };
 }
+
+export namespace SCM_COMMANDS {
+  // git extension 1.71 版本之前存在下划线，这里为了做兼容处理: https://github.com/microsoft/vscode/blob/1.68.1/extensions/git/src/repository.ts#L613
+  export const _GIT_OPEN_MERGE_EDITOR: Command = {
+    id: '_git.openMergeEditor',
+  };
+  // git extension 1.71 版本之后就去掉了前面的下划线: https://github.com/microsoft/vscode/commit/c0ade8bc816386b7194d69fed878d4b9bb796d6c#diff-da56ff967ab1a9606c01af61dc926332afb862f13c8e5c74a575bc2aa1b15e43R411
+  export const GIT_OPEN_MERGE_EDITOR: Command = {
+    id: 'git.openMergeEditor',
+  };
+}

package/src/components/actions/index.tsx

@@ -108,9 +108,9 @@ export const MenuActionList: React.FC<{
           }
 
           return (
-            <>
+            <React.Fragment key={`${menuNode.id}-${(menuNode as SubmenuItemNode).submenuId}-${index}`}>
               <Menu.SubMenu
-                key={`${(menuNode as SubmenuItemNode).submenuId}-${index}`}
+                key={`${menuNode.id}-${(menuNode as SubmenuItemNode).submenuId}-${index}`}
                 className={styles.submenuItem}
                 popupClassName='kt-menu'
                 title={<MenuAction hasSubmenu data={menuNode} iconService={iconService} />}
@@ -118,22 +118,22 @@ export const MenuActionList: React.FC<{
                 {recursiveRender(menuNode.children, menuNode.label)}
               </Menu.SubMenu>
               {hasSeparator ? <Menu.Divider key={`divider-${index}`} className={styles.menuItemDivider} /> : null}
-            </>
+            </React.Fragment>
           );
         }
 
         return (
-          <>
+          <React.Fragment key={`${menuNode.id}-${index}`}>
             <Menu.Item
               id={`${menuNode.id}-${index}`}
-              key={`${menuNode.id}-${key}-${index}`}
+              key={`${menuNode.id}-${index}`}
               className={styles.menuItem}
               disabled={menuNode.disabled}
             >
               <MenuAction data={menuNode} disabled={menuNode.disabled} iconService={iconService} />
             </Menu.Item>
             {hasSeparator ? <Menu.Divider key={`divider-${index}`} className={styles.menuItemDivider} /> : null}
-          </>
+          </React.Fragment>
         );
       }),
     [],

package/src/components/layout/split-panel.tsx

@@ -79,6 +79,18 @@ export interface SplitPanelProps extends SplitChildProps {
 const getProp = (child: React.ReactNode, prop: string) =>
   child && child['props'] && (child['props'][prop] ?? child['props'][`data-sp-${prop}`]);
 
+function getElementSize(element: any, totalFlexNum: number) {
+  if (getProp(element, 'savedSize')) {
+    return getProp(element, 'savedSize') + 'px';
+  } else if (getProp(element, 'defaultSize') !== undefined) {
+    return getProp(element, 'defaultSize') + 'px';
+  } else if (getProp(element, 'flex')) {
+    return (getProp(element, 'flex') / totalFlexNum) * 100 + '%';
+  } else {
+    return (1 / totalFlexNum) * 100 + '%';
+  }
+}
+
 export const SplitPanel: React.FC<SplitPanelProps> = ({
   id,
   className,
@@ -95,12 +107,17 @@ export const SplitPanel: React.FC<SplitPanelProps> = ({
 }) => {
   const ResizeHandle = Layout.getResizeHandle(direction);
   // convert children to list
-  const childList = React.Children.toArray(children);
-  const totalFlexNum = childList.reduce(
-    (accumulator, item) => accumulator + (getProp(item, 'flex') !== undefined ? getProp(item, 'flex') : 1),
-    0,
+  const childList = React.useMemo(() => React.Children.toArray(children), [children]);
+
+  const totalFlexNum = React.useMemo(
+    () =>
+      childList.reduce(
+        (accumulator, item) => accumulator + (getProp(item, 'flex') !== undefined ? getProp(item, 'flex') : 1),
+        0,
+      ),
+    [childList],
   );
-  const elements: React.ReactNodeArray = [];
+
   const resizeDelegates = React.useRef<IResizeHandleDelegate[]>([]);
   const eventBus = useInjectable<IEventBus>(IEventBus);
   const rootRef = React.useRef<HTMLElement>();
@@ -115,178 +132,197 @@ export const SplitPanel: React.FC<SplitPanelProps> = ({
   splitPanelService.panels = [];
 
   // 获取setSize的handle，对于最右端或最底部的视图，取上一个位置的handle
-  const setSizeHandle = (index) => (size?: number, isLatter?: boolean) => {
-    const targetIndex = isLatter ? index - 1 : index;
-    const delegate = resizeDelegates.current[targetIndex];
-    if (delegate) {
-      delegate.setAbsoluteSize(
-        size !== undefined ? size : getProp(childList[index], 'defaultSize'),
-        isLatter,
-        resizeKeep,
-      );
-    }
-  };
-
-  const setRelativeSizeHandle = (index) => (prev: number, next: number, isLatter?: boolean) => {
-    const targetIndex = isLatter ? index - 1 : index;
-    const delegate = resizeDelegates.current[targetIndex];
-    if (delegate) {
-      delegate.setRelativeSize(prev, next);
-    }
-  };
-
-  const getSizeHandle = (index) => (isLatter?: boolean) => {
-    const targetIndex = isLatter ? index - 1 : index;
-    const delegate = resizeDelegates.current[targetIndex];
-    if (delegate) {
-      return delegate.getAbsoluteSize(isLatter);
-    }
-    return 0;
-  };
+  const setSizeHandle = React.useCallback(
+    (index) => (size?: number, isLatter?: boolean) => {
+      const targetIndex = isLatter ? index - 1 : index;
+      const delegate = resizeDelegates.current[targetIndex];
+      if (delegate) {
+        delegate.setAbsoluteSize(
+          size !== undefined ? size : getProp(childList[index], 'defaultSize'),
+          isLatter,
+          resizeKeep,
+        );
+      }
+    },
+    [resizeDelegates.current],
+  );
 
-  const getRelativeSizeHandle = (index) => (isLatter?: boolean) => {
-    const targetIndex = isLatter ? index - 1 : index;
-    const delegate = resizeDelegates.current[targetIndex];
-    if (delegate) {
-      return delegate.getRelativeSize();
-    }
-    return [0, 0];
-  };
+  const setRelativeSizeHandle = React.useCallback(
+    (index) => (prev: number, next: number, isLatter?: boolean) => {
+      const targetIndex = isLatter ? index - 1 : index;
+      const delegate = resizeDelegates.current[targetIndex];
+      if (delegate) {
+        delegate.setRelativeSize(prev, next);
+      }
+    },
+    [resizeDelegates.current],
+  );
 
-  const lockResizeHandle = (index) => (lock: boolean | undefined, isLatter?: boolean) => {
-    const targetIndex = isLatter ? index - 1 : index;
-    const newResizeState = resizeLockState.current.map((state, idx) =>
-      idx === targetIndex ? (lock !== undefined ? lock : !state) : state,
-    );
-    resizeLockState.current = newResizeState;
-    setLocks(newResizeState);
-  };
+  const getSizeHandle = React.useCallback(
+    (index) => (isLatter?: boolean) => {
+      const targetIndex = isLatter ? index - 1 : index;
+      const delegate = resizeDelegates.current[targetIndex];
+      if (delegate) {
+        return delegate.getAbsoluteSize(isLatter);
+      }
+      return 0;
+    },
+    [resizeDelegates.current],
+  );
 
-  const setMaxSizeHandle = (index) => (lock: boolean | undefined, isLatter?: boolean) => {
-    const newMaxState = maxLockState.current.map((state, idx) =>
-      idx === index ? (lock !== undefined ? lock : !state) : state,
-    );
-    maxLockState.current = newMaxState;
-    setMaxLocks(newMaxState);
-  };
+  const getRelativeSizeHandle = React.useCallback(
+    (index) => (isLatter?: boolean) => {
+      const targetIndex = isLatter ? index - 1 : index;
+      const delegate = resizeDelegates.current[targetIndex];
+      if (delegate) {
+        return delegate.getRelativeSize();
+      }
+      return [0, 0];
+    },
+    [resizeDelegates.current],
+  );
 
-  const hidePanelHandle = (index: number) => (show?: boolean) => {
-    const newHideState = hideState.current.map((state, idx) =>
-      idx === index ? (show !== undefined ? !show : !state) : state,
-    );
-    hideState.current = newHideState;
-    const location = getProp(childList[index], 'slot') || getProp(childList[index], 'id');
-    if (location) {
-      fireResizeEvent(location);
-    }
-    setHides(newHideState);
-  };
+  const lockResizeHandle = React.useCallback(
+    (index) => (lock: boolean | undefined, isLatter?: boolean) => {
+      const targetIndex = isLatter ? index - 1 : index;
+      const newResizeState = resizeLockState.current.map((state, idx) =>
+        idx === targetIndex ? (lock !== undefined ? lock : !state) : state,
+      );
+      resizeLockState.current = newResizeState;
+      setLocks(newResizeState);
+    },
+    [resizeDelegates.current],
+  );
 
-  const fireResizeEvent = (location?: string) => {
-    if (location) {
-      eventBus.fire(new ResizeEvent({ slotLocation: location }));
-    }
-  };
+  const setMaxSizeHandle = React.useCallback(
+    (index) => (lock: boolean | undefined, isLatter?: boolean) => {
+      const newMaxState = maxLockState.current.map((state, idx) =>
+        idx === index ? (lock !== undefined ? lock : !state) : state,
+      );
+      maxLockState.current = newMaxState;
+      setMaxLocks(newMaxState);
+    },
+    [resizeDelegates.current],
+  );
 
-  childList.forEach((element, index) => {
-    if (index !== 0) {
-      const targetElement = index === 1 ? childList[index - 1] : childList[index];
-      let flexMode: ResizeFlexMode | undefined;
-      if (getProp(element, 'flexGrow')) {
-        flexMode = ResizeFlexMode.Prev;
-      } else if (getProp(childList[index - 1], 'flexGrow')) {
-        flexMode = ResizeFlexMode.Next;
+  const hidePanelHandle = React.useCallback(
+    (index: number) => (show?: boolean) => {
+      const newHideState = hideState.current.map((state, idx) =>
+        idx === index ? (show !== undefined ? !show : !state) : state,
+      );
+      hideState.current = newHideState;
+      const location = getProp(childList[index], 'slot') || getProp(childList[index], 'id');
+      if (location) {
+        fireResizeEvent(location);
       }
-      const noResize = getProp(targetElement, 'noResize') || locks[index - 1];
-      if (!noResize) {
-        elements.push(
-          <ResizeHandle
-            className={resizeHandleClassName}
-            onResize={(prev, next) => {
-              const prevLocation = getProp(childList[index - 1], 'slot') || getProp(childList[index - 1], 'id');
-              const nextLocation = getProp(childList[index], 'slot') || getProp(childList[index], 'id');
-              fireResizeEvent(prevLocation!);
-              fireResizeEvent(nextLocation!);
-            }}
-            noColor={true}
-            findNextElement={
-              dynamicTarget
-                ? (direction: boolean) => splitPanelService.getFirstResizablePanel(index - 1, direction)
-                : undefined
-            }
-            findPrevElement={
-              dynamicTarget
-                ? (direction: boolean) => splitPanelService.getFirstResizablePanel(index - 1, direction, true)
-                : undefined
-            }
-            key={`split-handle-${index}`}
-            delegate={(delegate) => {
-              resizeDelegates.current.push(delegate);
-            }}
-            flexMode={flexMode}
-          />,
-        );
+      setHides(newHideState);
+    },
+    [childList, hideState.current],
+  );
+
+  const fireResizeEvent = React.useCallback(
+    (location?: string) => {
+      if (location) {
+        eventBus.fire(new ResizeEvent({ slotLocation: location }));
       }
-    }
+    },
+    [eventBus],
+  );
 
-    elements.push(
-      <PanelContext.Provider
-        key={index}
-        value={{
-          setSize: setSizeHandle(index),
-          getSize: getSizeHandle(index),
-          setRelativeSize: setRelativeSizeHandle(index),
-          getRelativeSize: getRelativeSizeHandle(index),
-          lockSize: lockResizeHandle(index),
-          setMaxSize: setMaxSizeHandle(index),
-          hidePanel: hidePanelHandle(index),
-        }}
-      >
-        <div
-          data-min-resize={getProp(element, 'minResize')}
-          data-max-resize={getProp(element, 'maxResize')}
-          ref={(ele) => {
-            if (ele && splitPanelService.panels.indexOf(ele) === -1) {
-              splitPanelService.panels.push(ele);
-            }
-          }}
-          id={getProp(element, 'id') /* @deprecated: query by data-view-id */}
-          style={{
-            // 手风琴场景，固定尺寸和 flex 尺寸混合布局；需要在 Resize Flex 模式下禁用
-            ...(getProp(element, 'flex') &&
-            !getProp(element, 'savedSize') &&
-            !childList.find((item) => getProp(item, 'flexGrow'))
-              ? { flex: getProp(element, 'flex') }
-              : { [Layout.getSizeProperty(direction)]: getElementSize(element) }),
-            // 相对尺寸带来的问题，必须限制最小最大尺寸
-            [Layout.getMinSizeProperty(direction)]: getProp(element, 'minSize')
-              ? getProp(element, 'minSize') + 'px'
-              : '-1px',
-            [Layout.getMaxSizeProperty(direction)]:
-              maxLocks[index] && getProp(element, 'maxSize') ? getProp(element, 'maxSize') + 'px' : 'unset',
-            // Resize Flex 模式下应用 flexGrow
-            ...(getProp(element, 'flexGrow') !== undefined ? { flexGrow: getProp(element, 'flexGrow') } : {}),
-            display: hides[index] ? 'none' : 'block',
-            backgroundColor: getProp(element, 'backgroundColor'),
-          }}
-        >
-          {element}
-        </div>
-      </PanelContext.Provider>,
-    );
-  });
+  const elements: React.ReactNodeArray = React.useMemo(
+    () =>
+      childList.map((element, index) => {
+        const result: JSX.Element[] = [];
 
-  function getElementSize(element: any) {
-    if (getProp(element, 'savedSize')) {
-      return getProp(element, 'savedSize') + 'px';
-    } else if (getProp(element, 'defaultSize') !== undefined) {
-      return getProp(element, 'defaultSize') + 'px';
-    } else if (getProp(element, 'flex')) {
-      return (getProp(element, 'flex') / totalFlexNum) * 100 + '%';
-    } else {
-      return (1 / totalFlexNum) * 100 + '%';
-    }
-  }
+        if (index !== 0) {
+          const targetElement = index === 1 ? childList[index - 1] : childList[index];
+          let flexMode: ResizeFlexMode | undefined;
+          if (getProp(element, 'flexGrow')) {
+            flexMode = ResizeFlexMode.Prev;
+          } else if (getProp(childList[index - 1], 'flexGrow')) {
+            flexMode = ResizeFlexMode.Next;
+          }
+          const noResize = getProp(targetElement, 'noResize') || locks[index - 1];
+          if (!noResize) {
+            result.push(
+              <ResizeHandle
+                className={resizeHandleClassName}
+                onResize={(prev, next) => {
+                  const prevLocation = getProp(childList[index - 1], 'slot') || getProp(childList[index - 1], 'id');
+                  const nextLocation = getProp(childList[index], 'slot') || getProp(childList[index], 'id');
+                  fireResizeEvent(prevLocation!);
+                  fireResizeEvent(nextLocation!);
+                }}
+                noColor={true}
+                findNextElement={
+                  dynamicTarget
+                    ? (direction: boolean) => splitPanelService.getFirstResizablePanel(index - 1, direction)
+                    : undefined
+                }
+                findPrevElement={
+                  dynamicTarget
+                    ? (direction: boolean) => splitPanelService.getFirstResizablePanel(index - 1, direction, true)
+                    : undefined
+                }
+                key={`split-handle-${index}`}
+                delegate={(delegate) => {
+                  resizeDelegates.current.push(delegate);
+                }}
+                flexMode={flexMode}
+              />,
+            );
+          }
+        }
+
+        result.push(
+          <PanelContext.Provider
+            key={index}
+            value={{
+              setSize: setSizeHandle(index),
+              getSize: getSizeHandle(index),
+              setRelativeSize: setRelativeSizeHandle(index),
+              getRelativeSize: getRelativeSizeHandle(index),
+              lockSize: lockResizeHandle(index),
+              setMaxSize: setMaxSizeHandle(index),
+              hidePanel: hidePanelHandle(index),
+            }}
+          >
+            <div
+              data-min-resize={getProp(element, 'minResize')}
+              data-max-resize={getProp(element, 'maxResize')}
+              ref={(ele) => {
+                if (ele && splitPanelService.panels.indexOf(ele) === -1) {
+                  splitPanelService.panels.push(ele);
+                }
+              }}
+              id={getProp(element, 'id') /* @deprecated: query by data-view-id */}
+              style={{
+                // 手风琴场景，固定尺寸和 flex 尺寸混合布局；需要在 Resize Flex 模式下禁用
+                ...(getProp(element, 'flex') &&
+                !getProp(element, 'savedSize') &&
+                !childList.find((item) => getProp(item, 'flexGrow'))
+                  ? { flex: getProp(element, 'flex') }
+                  : { [Layout.getSizeProperty(direction)]: getElementSize(element, totalFlexNum) }),
+                // 相对尺寸带来的问题，必须限制最小最大尺寸
+                [Layout.getMinSizeProperty(direction)]: getProp(element, 'minSize')
+                  ? getProp(element, 'minSize') + 'px'
+                  : '-1px',
+                [Layout.getMaxSizeProperty(direction)]:
+                  maxLocks[index] && getProp(element, 'maxSize') ? getProp(element, 'maxSize') + 'px' : 'unset',
+                // Resize Flex 模式下应用 flexGrow
+                ...(getProp(element, 'flexGrow') !== undefined ? { flexGrow: getProp(element, 'flexGrow') } : {}),
+                display: hides[index] ? 'none' : 'block',
+                backgroundColor: getProp(element, 'backgroundColor'),
+              }}
+            >
+              {element}
+            </div>
+          </PanelContext.Provider>,
+        );
+        return result;
+      }),
+    [children, childList, resizeHandleClassName, dynamicTarget, resizeDelegates.current, hides],
+  );
 
   React.useEffect(() => {
     if (rootRef.current) {
@@ -311,7 +347,7 @@ export const SplitPanel: React.FC<SplitPanelProps> = ({
       className={clsx(styles['split-panel'], className)}
       style={{ flexDirection: Layout.getFlexDirection(direction), ...style }}
     >
-      {elements}
+      {elements.filter(Boolean)}
     </div>
   );
 };

package/src/layout/layout.interface.ts

@@ -2,6 +2,7 @@ import type React from 'react';
 
 import { MaybeNull, BasicEvent } from '@opensumi/ide-core-common';
 
+import { Layout } from '../components/layout/index';
 import type { IMenu, IContextMenu } from '../menu/next';
 import type { SlotLocation } from '../react-providers';
 
@@ -75,6 +76,7 @@ export interface ExtViewContainerOptions {
   fromExtension?: boolean;
   // viewContainer 最小高度，默认 120
   miniSize?: number;
+  alignment?: Layout.alignment;
 }
 export const ComponentRegistry = Symbol('ComponentRegistry');
 

package/src/markdown/index.tsx

@@ -22,7 +22,6 @@ export const toMarkdownHtml = (message: string): string => {
     gfm: true,
     breaks: false,
     pedantic: false,
-    sanitize: true,
     smartLists: true,
     smartypants: false,
     renderer,

package/src/menu/next/menu-id.ts

@@ -84,6 +84,8 @@ export enum MenuId {
   // setting.json
   SettingJSONGlyphMarginContext = 'settingJson/glyphMargin/context',
   SubSettingJSONGlyphMarginContext = 'sub/settingJson/glyphMargin/context',
+  // merge editor context
+  MergeEditorResultTitleContext = 'mergeEditor/result/title/context',
 }
 
 export function getTabbarCommonMenuId(location: string) {

package/src/preferences/settings.ts

@@ -49,6 +49,10 @@ export interface IPreferenceViewDesc {
 }
 
 export interface ISettingSection {
+  /**
+   * 插件 ID
+   */
+  extensionId?: string;
   /**
    * 该 Section 的名字
    */

package/src/react-providers/config-provider.tsx

@@ -216,7 +216,7 @@ export interface AppConfig {
    * 视图组件内默认的组件样式资源 CDN 来源
    * 默认值为 'alipay'
    */
-  componentCDNType?: 'unpkg' | 'jsdelivr' | 'alipay';
+  componentCDNType?: TComponentCDNType;
   /**
    * 指定前端是否为 Electron 环境 (Electron Renderer)
    * 为兼容老的逻辑，若不兼容则 fallback 到 isElectronRenderer 的判断
@@ -277,3 +277,5 @@ export function ConfigProvider(props: React.PropsWithChildren<{ value: AppConfig
 
   return React.createElement(extraContextProvider, { children: app });
 }
+
+export type TComponentCDNType = 'unpkg' | 'jsdelivr' | 'alipay' | 'npmmirror';