@opensumi/ide-debug 2.24.6-rc-1685671765.0 → 2.25.0

package/src/browser/view/breakpoints/debug-breakpoints.module.less

@@ -1,3 +1,5 @@
+@tree-item-icon-size: 18px;
+
 .debug_breakpoints {
   width: 100%;
   height: 100%;
@@ -5,8 +7,8 @@
   flex-direction: column;
   :global {
     span.kt-icon.icon.kaitian-icon {
-      min-width: 20px;
-      width: 20px;
+      min-width: @tree-item-icon-size;
+      width: @tree-item-icon-size;
     }
     .basic_tree .icon:before {
       font-size: 14px;
@@ -16,6 +18,14 @@
   .tree_item_twister_placeholder {
     display: none;
   }
+
+  .tree_item_twister_placeholder_fill {
+    min-width: @tree-item-icon-size;
+  }
+
+  .tree_item_twister {
+    min-width: @tree-item-icon-size;
+  }
 }
 
 .debug_breakpoints_disabled {
@@ -53,9 +63,10 @@
 }
 
 .debug_breakpoints_icon {
-  width: 20px;
-  height: 20px;
-  min-width: 20px;
+  width: @tree-item-icon-size;
+  height: @tree-item-icon-size;
+  min-width: @tree-item-icon-size;
+
   :global {
     .kt-checkbox-lump {
       margin: auto;
@@ -63,12 +74,6 @@
   }
 }
 
-.debug_breakpoints_checkbox {
-  width: 16px;
-  min-width: 16px;
-  font-size: 16px;
-}
-
 .debug_breakpoints_badge {
   display: block;
   margin-right: 5px;
@@ -94,10 +99,6 @@
   flex: 1;
 }
 
-.debug_breakpoints_item_tree_node {
-  padding-left: 27px !important;
-}
-
 .debug_activate_breakpoints_icon {
   color: var(--debugIcon-activateBreakpointsForeground);
   &:hover {
@@ -128,13 +129,14 @@
 
   .file_item_icon {
     display: block;
-    margin-left: -2px;
+    height: 16px;
     margin-right: 4px;
   }
 
   &:hover {
     .file_item_checkbox {
-      display: inherit;
+      display: flex;
+      margin-right: 4px;
     }
     .file_item_icon {
       display: none;

package/src/browser/view/breakpoints/debug-breakpoints.view.tsx

@@ -13,7 +13,6 @@ import {
   Disposable,
   ViewState,
   Event,
-  isUndefined,
   IRange,
   localize,
 } from '@opensumi/ide-core-browser';
@@ -29,7 +28,6 @@ import {
   isRuntimeBreakpoint,
   getStatus,
   EXCEPTION_BREAKPOINT_URI,
-  BreakpointManager,
 } from '../../breakpoint';
 import { DebugSessionManager } from '../../debug-session-manager';
 
@@ -37,6 +35,10 @@ import { BreakpointsTreeNode } from './debug-breakpoints-tree.model';
 import styles from './debug-breakpoints.module.less';
 import { DebugBreakpointsService } from './debug-breakpoints.service';
 
+interface IBreakpointTreeData extends IBasicTreeData {
+  order?: number;
+}
+
 export interface BreakpointItem {
   name: string;
   id: string;
@@ -49,7 +51,7 @@ export const DebugBreakpointView = observer(({ viewState }: React.PropsWithChild
   const debugBreakpointsService: DebugBreakpointsService = useInjectable(DebugBreakpointsService);
   const { enable, toggleBreakpointEnable } = debugBreakpointsService;
   const isDisposed = useRef<boolean>(false);
-  const [treeData, setTreeData] = useState<IBasicTreeData[]>([]);
+  const [treeData, setTreeData] = useState<IBreakpointTreeData[]>([]);
 
   const getBreakpointClsState = (options: {
     data: BreakpointItem;
@@ -78,14 +80,16 @@ export const DebugBreakpointView = observer(({ viewState }: React.PropsWithChild
   const updateTreeData = useCallback(
     (nodes: [string, BreakpointsTreeNode[]][]) => {
       const { roots } = debugBreakpointsService;
-      const breakpointTreeData: IBasicTreeData[] = [];
-      nodes.forEach(([uri, items]) => {
+      const breakpointTreeData: IBreakpointTreeData[] = [];
+      nodes.forEach(([uri, items], index) => {
         const isException = EXCEPTION_BREAKPOINT_URI.toString() === uri;
         if (isException) {
-          items.forEach((item) => {
+          items.forEach((item, i) => {
             breakpointTreeData.push({
               label: '',
+              order: index * 100 + i,
               expandable: false,
+              twisterPlaceholderClassName: styles.tree_item_twister_placeholder_fill,
               children: [],
               description: (
                 <BreakpointItem
@@ -103,6 +107,8 @@ export const DebugBreakpointView = observer(({ viewState }: React.PropsWithChild
 
           breakpointTreeData.push({
             label,
+            order: index,
+            twisterClassName: styles.tree_item_twister,
             renderLabel: (
               <BreakpointFileItem
                 label={label}
@@ -116,6 +122,7 @@ export const DebugBreakpointView = observer(({ viewState }: React.PropsWithChild
               ...item,
               label: '',
               expandable: false,
+              twisterClassName: styles.tree_item_twister,
               twisterPlaceholderClassName: styles.tree_item_twister_placeholder,
               breakpoint: item.breakpoint,
               iconClassName: cls(
@@ -174,7 +181,13 @@ export const DebugBreakpointView = observer(({ viewState }: React.PropsWithChild
             toggleBreakpointEnable(item.raw.breakpoint);
           }
         }}
-        indent={20}
+        sortComparator={(a: IBreakpointTreeData, b: IBreakpointTreeData) => {
+          if (typeof a.order !== 'undefined' && typeof b.order !== 'undefined') {
+            return a.order > b.order ? 1 : a.order < b.order ? -1 : 0;
+          }
+          return undefined;
+        }}
+        indent={18}
         baseIndent={8}
         treeData={treeData}
         height={viewState.height}
@@ -220,11 +233,11 @@ export const BreakpointFileItem = ({ label, title, breakpointItems }: Breakpoint
     <div className={styles.debug_breakpoints_file_item}>
       <div className={styles.file_item_control}>
         <CheckBox
-          className={styles.file_item_checkbox}
+          className={cls(styles.debug_breakpoints_icon, styles.file_item_checkbox)}
           onChange={() => handleCheckBoxChange(enabled)}
           checked={enabled}
         ></CheckBox>
-        <i className={cls(getIcon('file-text'), styles.file_item_icon)}></i>
+        <i className={cls(getIcon('file-text'), styles.file_item_icon, styles.debug_breakpoints_icon)}></i>
         <span title={title}>{label}</span>
       </div>
       <div className={styles.file_item_control_right}>
@@ -237,7 +250,6 @@ export const BreakpointFileItem = ({ label, title, breakpointItems }: Breakpoint
 export const BreakpointItem = ({ data, toggle }: { data: BreakpointItem; toggle: () => void }) => {
   const defaultValue = isDebugBreakpoint(data.breakpoint) ? data.breakpoint.enabled : !!data.breakpoint.default;
   const manager = useInjectable<DebugSessionManager>(IDebugSessionManager);
-  const breakpointManager = useInjectable<BreakpointManager>(BreakpointManager);
   const commandService = useInjectable<CommandService>(CommandService);
   const debugBreakpointsService = useInjectable<DebugBreakpointsService>(DebugBreakpointsService);
   const [enabled, setEnabled] = React.useState<boolean>(defaultValue);

package/src/browser/view/configuration/debug-configuration.service.ts

@@ -129,6 +129,10 @@ export class DebugConfigurationService {
     this.debugConfigurationManager.openConfiguration(uri);
   };
 
+  openLaunchEditor = () => {
+    this.debugConfigurationManager.openLaunchEditor();
+  };
+
   openDebugConsole = () => {
     this.debugConsoleService.activate();
   };

package/src/common/constants.ts

@@ -5,6 +5,9 @@ import { DebugState } from './debug-session';
 
 export { DEBUG_CONSOLE_CONTAINER_ID, DEBUG_CONTAINER_ID };
 
+export const LAUNCH_VIEW_SCHEME = 'launch_view_scheme';
+export const LAUNCH_VIEW_COMPONENT_ID = 'launch-view';
+
 export const DEBUG_MEMORY_SCHEME = 'vscode-debug-memory';
 
 export const DEBUG_WATCH_ID = 'debug-watch';

package/src/common/debug-schema.ts

@@ -0,0 +1,5 @@
+import { CodeSchemaId } from '@opensumi/ide-core-common';
+
+export const launchSchemaUri = CodeSchemaId.launch;
+export const launchExtensionSchemaUri = `${CodeSchemaId.launch}/extension`;
+export const launchDefaultSchemaUri = `${CodeSchemaId.launch}/default`;

package/src/common/debug-service.ts

@@ -160,3 +160,16 @@ export interface IDebugServiceContributionPoint {
   contributions: IJSONSchema[];
   removed?: boolean;
 }
+
+/**
+ * launch view service
+ */
+
+export const ILaunchService = Symbol('ILaunchService');
+
+export interface ILaunchService {
+  rawSchemaProperties: IJSONSchema | null;
+}
+/**
+ * launch view service end
+ */

package/src/common/index.ts

@@ -8,7 +8,7 @@ export * from './debug-console';
 export * from './debug-session-options';
 export * from './debug-editor';
 export * from './debug-progress';
-export * from './debug-schema-updater';
+export * from './debug-schema';
 export * from './inline-values';
 export * from './types';
 export * from './constants';

package/lib/browser/debug-schema-updater.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"debug-schema-updater.d.ts","sourceRoot":"","sources":["../../src/browser/debug-schema-updater.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,WAAW,EAAuB,MAAM,4BAA4B,CAAC;AAGvF,OAAO,EAAE,WAAW,EAAgB,MAAM,yBAAyB,CAAC;AAMpE,qBACa,kBAAkB;IAE7B,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAGtC,OAAO,CAAC,cAAc,CAAsB;IAG5C,OAAO,CAAC,MAAM,CAA4B;IAEpC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAqB9B;AAED,eAAO,MAAM,YAAY,EAAE,WAsB1B,CAAC"}

package/lib/browser/debug-schema-updater.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"debug-schema-updater.js","sourceRoot":"","sources":["../../src/browser/debug-schema-updater.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAAuF;AAEvF,sCAA4C;AAC5C,2DAAoE;AAEpE,+EAA0E;AAE1E,MAAM,EAAE,SAAS,EAAE,GAAG,0BAAO,CAAC;AAGvB,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAU7B,KAAK,CAAC,MAAM;QACV,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QAC7C,MAAM,MAAM,qBAAQ,SAAS,CAAC,oBAAY,CAAC,CAAE,CAAC;QAC9C,MAAM,KAAK,GAAG,MAAO,CAAC,UAAW,CAAC,cAAc,CAAC,KAAoB,CAAC;QACtE,MAAM,cAAc,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC7C,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,uBAAuB,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;gBACzE,MAAM,UAAU,GAAgB,GAAG,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;gBACrE,OAAO,UAAU,CAAC;YACpB,CAAC,CAAC;YACF,qBAAqB,EAAE,GAAG,CAAC,qBAAqB;SACjD,CAAC,CAAC,CAAC;QACJ,KAAK,MAAM,EAAE,UAAU,EAAE,qBAAqB,EAAE,IAAI,cAAc,EAAE;YAClE,IAAI,UAAU,IAAI,KAAK,CAAC,KAAK,EAAE;gBAC7B,KAAK,CAAC,KAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;aAClC;YACD,IAAI,qBAAqB,IAAI,KAAK,CAAC,eAAe,EAAE;gBAClD,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,qBAAqB,CAAC,CAAC;aACtD;SACF;QACD,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,GAAG,wBAAe,YAAY,EAAE,MAAM,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IAC9F,CAAC;CACF,CAAA;AA9BC;IAAC,IAAA,cAAS,EAAC,4BAAY,CAAC;;iDACc;AAEtC;IAAC,IAAA,cAAS,EAAC,sCAAmB,CAAC;;0DACa;AAE5C;IAAC,IAAA,cAAS,EAAC,uDAAyB,CAAC;sCACrB,uDAAyB;kDAAC;AAR/B,kBAAkB;IAD9B,IAAA,eAAU,GAAE;GACA,kBAAkB,CA+B9B;AA/BY,gDAAkB;AAiClB,QAAA,YAAY,GAAgB;IACvC,GAAG,EAAE,wBAAe;IACpB,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,QAAQ;IACf,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE;IACjD,UAAU,EAAE;QACV,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,8BAA8B;YAC3C,OAAO,EAAE,OAAO;SACjB;QACD,cAAc,EAAE;YACd,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,6FAA6F;YAC1G,KAAK,EAAE;gBACL,eAAe,EAAE,EAAE;gBACnB,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,EAAE;aACV;SACF;KACF;CACF,CAAC"}

package/lib/common/debug-schema-updater.d.ts

@@ -1,3 +0,0 @@
-import { CodeSchemaId } from '@opensumi/ide-core-common';
-export declare const launchSchemaUri = CodeSchemaId.launch;
-//# sourceMappingURL=debug-schema-updater.d.ts.map

package/lib/common/debug-schema-updater.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"debug-schema-updater.d.ts","sourceRoot":"","sources":["../../src/common/debug-schema-updater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,eAAO,MAAM,eAAe,sBAAsB,CAAC"}

package/lib/common/debug-schema-updater.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.launchSchemaUri = void 0;
-exports.launchSchemaUri = "vscode://schemas/launch" /* CodeSchemaId.launch */;
-//# sourceMappingURL=debug-schema-updater.js.map

package/lib/common/debug-schema-updater.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"debug-schema-updater.js","sourceRoot":"","sources":["../../src/common/debug-schema-updater.ts"],"names":[],"mappings":";;;AAEa,QAAA,eAAe,uDAAuB"}

package/src/common/debug-schema-updater.ts

@@ -1,3 +0,0 @@
-import { CodeSchemaId } from '@opensumi/ide-core-common';
-
-export const launchSchemaUri = CodeSchemaId.launch;