@opensumi/ide-core-browser 3.1.4 → 3.1.5-next-1719978700.0

package/src/common/common.command.ts

@@ -1063,6 +1063,13 @@ export namespace QUICK_OPEN_COMMANDS {
 }
 
 export namespace SCM_COMMANDS {
+  const category = 'SCM';
+
+  export const GetSCMResource = {
+    id: 'scm.getResource',
+    category,
+  };
+
   // 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',

package/src/components/actions/index.tsx

@@ -3,8 +3,7 @@ import React, { useMemo, useState } from 'react';
 
 import { Button, CheckBox, Icon } from '@opensumi/ide-components';
 import { ClickParam, Menu } from '@opensumi/ide-components/lib/menu';
-import { CommandRegistry, IDisposable, isBoolean, strings } from '@opensumi/ide-core-common';
-import { GitCommands } from '@opensumi/ide-core-common/lib/commands/git';
+import { isBoolean, strings } from '@opensumi/ide-core-common';
 
 import {
   AbstractMenuService,
@@ -233,7 +232,6 @@ const InlineActionWidget: React.FC<
 > = React.memo(({ iconService, type = 'icon', data, context = [], className, afterClick, ...restProps }) => {
   const styles_iconAction = useDesignStyles(styles.iconAction, 'iconAction');
   const styles_btnAction = useDesignStyles(styles.btnAction, 'btnAction');
-  const commandRegistry = useInjectable<CommandRegistry>(CommandRegistry);
 
   const [loading, setLoading] = useState(false);
   const handleClick = React.useCallback(
@@ -260,38 +258,6 @@ const InlineActionWidget: React.FC<
     [data, context],
   );
 
-  React.useEffect(() => {
-    let dispose: IDisposable | undefined;
-    switch (data.id) {
-      case GitCommands.Stage:
-        {
-          const firstArg = context[0];
-          if (!firstArg) {
-            break;
-          }
-          if (!firstArg.sourceUri) {
-            break;
-          }
-          dispose = commandRegistry.registerHandler(`${data.id}-${firstArg.sourceUri.toString()}`, {
-            execute: async () => {
-              if (typeof data.execute === 'function') {
-                await data.execute([...context]);
-              }
-            },
-          });
-        }
-        break;
-      default:
-        break;
-    }
-
-    return () => {
-      if (dispose) {
-        dispose.dispose();
-      }
-    };
-  }, [data.id]);
-
   const [title, label] = React.useMemo(() => {
     let title = data.tooltip || data.label;
     const label = data.label;

package/src/components/ai-native/ai-action/index.tsx

@@ -50,10 +50,10 @@ export interface AIActionItem {
 }
 
 export interface AIActionProps {
-  operationList: AIActionItem[];
+  operationList?: AIActionItem[];
   moreOperation?: MenuNode[];
   showClose?: boolean;
-  onClickItem: (id: string) => void;
+  onClickItem?: (id: string) => void;
   onClose?: () => void;
   loading?: boolean;
   customOperationRender?: React.ReactNode;
@@ -109,15 +109,15 @@ export const AIAction = (props: AIActionProps) => {
 
     const defaultOperationList = (
       <React.Fragment>
-        {operationList.map(({ name, title, id }, i) =>
+        {operationList?.map(({ name, title, id }, i) =>
           title ? (
             <EnhancePopover id={id} title={title} key={`popover_${i}`}>
-              <EnhanceIcon wrapperClassName={styles.operate_item} onClick={() => onClickItem(id)}>
+              <EnhanceIcon wrapperClassName={styles.operate_item} onClick={() => onClickItem?.(id)}>
                 <span key={i}>{name}</span>
               </EnhanceIcon>
             </EnhancePopover>
           ) : (
-            <EnhanceIcon wrapperClassName={styles.operate_item} onClick={() => onClickItem(id)} key={i}>
+            <EnhanceIcon wrapperClassName={styles.operate_item} onClick={() => onClickItem?.(id)} key={i}>
               <span>{name}</span>
             </EnhanceIcon>
           ),

package/src/components/ai-native/enhanceIcon/index.tsx

@@ -1,6 +1,8 @@
 import cls from 'classnames';
 import React, { useCallback } from 'react';
 
+import { CommandService } from '@opensumi/ide-core-common';
+
 import { Icon } from '../../../components';
 import { MenuNode } from '../../../menu/next/base';
 import { IBrowserCtxMenu } from '../../../menu/next/renderer/ctxmenu/browser';
@@ -40,6 +42,7 @@ export const EnhanceIcon = React.forwardRef<HTMLDivElement | null, IEnhanceIconP
 );
 
 interface IEnhanceIconWithCtxMenuProps extends IEnhanceIconProps {
+  id?: string;
   menuNodes: MenuNode[];
   skew?: { x: number; y: number };
 }
@@ -48,7 +51,8 @@ interface IEnhanceIconWithCtxMenuProps extends IEnhanceIconProps {
  * 包含下拉菜单的 icon 组件，可以自定义下拉菜单位置
  */
 export const EnhanceIconWithCtxMenu = (props: IEnhanceIconWithCtxMenuProps) => {
-  const { children, menuNodes, skew, ...restProps } = props;
+  const { children, menuNodes, skew, id: commandId, ...restProps } = props;
+  const commandService = useInjectable<CommandService>(CommandService);
 
   const ctxMenuRenderer = useInjectable<IBrowserCtxMenu>(IBrowserCtxMenu);
   const [anchor, setAnchor] = React.useState<{ x: number; y: number } | undefined>(undefined);
@@ -89,14 +93,17 @@ export const EnhanceIconWithCtxMenu = (props: IEnhanceIconWithCtxMenuProps) => {
     if (!anchor) {
       return;
     }
-
-    handleRefRect((_anchor) => {
-      ctxMenuRenderer.show({
-        anchor: _anchor,
-        menuNodes,
+    if (menuNodes) {
+      handleRefRect((_anchor) => {
+        ctxMenuRenderer.show({
+          anchor: _anchor,
+          menuNodes,
+        });
       });
-    });
-  }, [iconRef.current, menuNodes, anchor]);
+    } else if (commandId) {
+      commandService.executeCommand(commandId);
+    }
+  }, [iconRef.current, menuNodes, anchor, commandId]);
 
   return (
     <EnhanceIcon ref={iconRef} onClick={handleClick} {...restProps}>

package/src/components/ai-native/interactive-input/index.tsx

@@ -38,6 +38,7 @@ export const InteractiveInput = React.forwardRef(
       width,
       sendBtnClassName,
       popoverPosition,
+      autoFocus,
     } = props;
 
     const internalRef = useRef<HTMLTextAreaElement>(null);
@@ -48,6 +49,12 @@ export const InteractiveInput = React.forwardRef(
 
     useImperativeHandle(ref, () => internalRef.current as HTMLTextAreaElement);
 
+    useEffect(() => {
+      if (internalRef && internalRef.current && autoFocus) {
+        internalRef.current.focus();
+      }
+    }, [internalRef]);
+
     useEffect(() => {
       const value = props.value;
       if (isUndefined(value)) {

package/src/components/layout/split-panel.service.ts

@@ -3,6 +3,8 @@ import React from 'react';
 import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
 import { Deferred, Disposable, IDisposable } from '@opensumi/ide-core-common';
 
+import { RESIZE_LOCK } from '../resize/resize';
+
 import { SplitPanelProps } from './split-panel';
 
 export const ISplitPanelService = Symbol('ISplitPanelService');
@@ -23,7 +25,6 @@ export interface ISplitPanelService extends IDisposable {
 
 @Injectable({ multiple: true })
 export class SplitPanelService extends Disposable implements ISplitPanelService {
-  private static MIN_SIZE = 120;
   constructor(protected readonly panelId: string) {
     super();
   }
@@ -50,20 +51,30 @@ export class SplitPanelService extends Disposable implements ISplitPanelService
   getFirstResizablePanel(index: number, direction: boolean, isPrev?: boolean): HTMLElement | undefined {
     if (isPrev) {
       if (direction) {
-        return this.panels[index];
+        for (let i = index; i >= 0; i--) {
+          if (!this.panels[i].classList.contains(RESIZE_LOCK)) {
+            // 跳过无法调整的面板
+            return this.panels[i];
+          }
+        }
       } else {
         for (let i = index; i >= 0; i--) {
-          if (this.panels[i].clientHeight > SplitPanelService.MIN_SIZE) {
+          if (!this.panels[i].classList.contains(RESIZE_LOCK)) {
             return this.panels[i];
           }
         }
       }
     } else {
       if (!direction) {
-        return this.panels[index + 1];
+        for (let i = index + 1; i < this.panels.length; i++) {
+          if (!this.panels[i].classList.contains(RESIZE_LOCK)) {
+            // 跳过无法调整的面板
+            return this.panels[i];
+          }
+        }
       } else {
         for (let i = index + 1; i < this.panels.length; i++) {
-          if (this.panels[i].clientHeight > SplitPanelService.MIN_SIZE) {
+          if (!this.panels[i].classList.contains(RESIZE_LOCK)) {
             return this.panels[i];
           }
         }

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

@@ -5,7 +5,7 @@ import { IEventBus } from '@opensumi/ide-core-common';
 
 import { ResizeEvent } from '../../layout';
 import { useInjectable } from '../../react-hooks';
-import { IResizeHandleDelegate, ResizeFlexMode } from '../resize/resize';
+import { IResizeHandleDelegate, RESIZE_LOCK, ResizeFlexMode } from '../resize/resize';
 
 import { Layout } from './layout';
 import { SplitPanelManager } from './split-panel.service';
@@ -64,6 +64,7 @@ export interface SplitPanelProps extends SplitChildProps {
   className?: string;
   style?: React.CSSProperties;
   direction?: Layout.direction;
+  headerSize?: number;
   id: string;
   // setAbsoluteSize 时保证相邻节点总宽度不变
   resizeKeep?: boolean;
@@ -95,6 +96,7 @@ export const SplitPanel: React.FC<SplitPanelProps> = (props) => {
   const {
     id,
     className,
+    headerSize,
     resizeHandleClassName,
     style,
     children = [],
@@ -298,6 +300,7 @@ export const SplitPanel: React.FC<SplitPanelProps> = (props) => {
                     splitPanelService.panels.push(ele);
                   }
                 }}
+                className={getElementSize(element, totalFlexNum) === `${headerSize}px` ? RESIZE_LOCK : ''}
                 id={getProp(element, 'id') /* @deprecated: query by data-view-id */}
                 style={{
                   // 手风琴场景，固定尺寸和 flex 尺寸混合布局；需要在 Resize Flex 模式下禁用

package/src/contextkey/ai-native.ts

@@ -2,3 +2,6 @@ import { RawContextKey } from '../raw-context-key';
 
 export const InlineChatIsVisible = new RawContextKey('ai.native.inlineChatIsVisible', false);
 export const InlineCompletionIsTrigger = new RawContextKey('ai.native.inlineCompletionIsTrigger', false);
+export const InlineHintWidgetIsVisible = new RawContextKey('ai.native.inlineHintWidgetIsVisible', false);
+export const InlineInputWidgetIsVisible = new RawContextKey('ai.native.inlineInputWidgetIsVisible', false);
+export const InlineDiffPartialEditsIsVisible = new RawContextKey('ai.native.inlineDiffPartialEditsIsVisible', false);

package/src/logger/browser-logger.ts

@@ -3,19 +3,15 @@ import { ILogServiceClient, ILoggerManagerClient, LogLevel, SupportLogNamespace
 
 export { ILogger } from '@opensumi/ide-core-common';
 
-@Injectable()
-export class Logger implements ILogServiceClient {
-  @Autowired(ILoggerManagerClient)
-  private LoggerManager: ILoggerManagerClient;
+class LoggerWrapper implements ILogServiceClient {
+  protected logger: ILogServiceClient;
 
-  private logger: ILogServiceClient;
-
-  constructor() {
-    this.logger = this.LoggerManager.getLogger(SupportLogNamespace.Browser);
+  setup(logger: ILogServiceClient) {
+    this.logger = logger;
   }
 
   public getLevel() {
-    return this.getLevel();
+    return this.logger.getLevel();
   }
 
   public setLevel(level: LogLevel) {
@@ -49,3 +45,19 @@ export class Logger implements ILogServiceClient {
     return this.logger.dispose();
   }
 }
+
+@Injectable()
+export class Logger extends LoggerWrapper implements ILogServiceClient {
+  @Autowired(ILoggerManagerClient)
+  protected loggerManager: ILoggerManagerClient;
+
+  constructor() {
+    super();
+    this.logger = this.loggerManager.getBrowserLogger(SupportLogNamespace.Browser);
+  }
+
+  public reportToServer() {
+    this.logger.dispose();
+    this.logger = this.loggerManager.getLogger(SupportLogNamespace.Browser);
+  }
+}