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

package/src/browser/debug-configuration-manager.ts

@@ -20,19 +20,22 @@ import {
   CommonLanguageId,
 } from '@opensumi/ide-core-browser';
 import { WorkbenchEditorService, IOpenResourceResult } from '@opensumi/ide-editor';
+import { EditorCollectionService, IEditorDocumentModelService } from '@opensumi/ide-editor/lib/browser/index';
 import { IFileServiceClient } from '@opensumi/ide-file-service';
 import { FileSystemError } from '@opensumi/ide-file-service';
+import { EOL } from '@opensumi/ide-monaco';
 import { ITextModel } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
 import { QuickPickService } from '@opensumi/ide-quick-open';
 import { IWorkspaceService } from '@opensumi/ide-workspace';
 import { WorkspaceVariableContribution } from '@opensumi/ide-workspace/lib/browser/workspace-variable-contribution';
+import { EditOperation } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/editOperation';
 import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
 import { DebugServer, IDebugServer, IDebuggerContribution, launchSchemaUri } from '../common';
 import { DebugSessionOptions } from '../common';
 import { DebugConfiguration } from '../common';
 
-import { CONTEXT_DEBUGGERS_AVAILABLE } from './../common/constants';
+import { CONTEXT_DEBUGGERS_AVAILABLE, LAUNCH_VIEW_SCHEME } from './../common/constants';
 import { DebugConfigurationModel } from './debug-configuration-model';
 import { DebugPreferences } from './debug-preferences';
 
@@ -87,6 +90,12 @@ export class DebugConfigurationManager {
   @Autowired(DebugPreferences)
   protected readonly debugPreferences: DebugPreferences;
 
+  @Autowired(IEditorDocumentModelService)
+  protected readonly documentService: IEditorDocumentModelService;
+
+  @Autowired(EditorCollectionService)
+  protected readonly editorCollectionService: EditorCollectionService;
+
   private contextDebuggersAvailable: IContextKey<boolean>;
 
   // 用于存储支持断点的语言
@@ -266,36 +275,32 @@ export class DebugConfigurationManager {
     }
   }
 
-  async addConfiguration(uri?: string): Promise<void> {
-    let model: DebugConfigurationModel | undefined;
-    if (uri) {
-      model = this.getModelByUri(uri);
-    } else {
-      model = this.model;
-    }
-    if (!model) {
+  async openLaunchEditor(): Promise<void> {
+    if (!this.model) {
       return;
     }
-    const resouce = await this.doOpen(model);
-    if (!resouce) {
-      return;
-    }
-    const { group } = resouce;
-    const editor = group.codeEditor.monacoEditor;
-    if (!editor) {
+
+    const uri = this.model.uri;
+    if (!uri) {
       return;
     }
 
+    await this.workbenchEditorService.open(uri.withScheme(LAUNCH_VIEW_SCHEME), {
+      disableNavigate: true,
+    });
+  }
+
+  private visitConfigurationsEditor(model: ITextModel): monaco.Position | undefined {
     let position: monaco.Position | undefined;
     let depthInArray = 0;
     let lastProperty = '';
-    visit(editor.getValue(), {
+    visit(model.getValue(), {
       onObjectProperty: (property) => {
         lastProperty = property;
       },
       onArrayBegin: (offset) => {
         if (lastProperty === 'configurations' && depthInArray === 0) {
-          position = editor.getModel()!.getPositionAt(offset + 1);
+          position = model.getPositionAt(offset + 1);
         }
         depthInArray++;
       },
@@ -303,9 +308,68 @@ export class DebugConfigurationManager {
         depthInArray--;
       },
     });
+
+    return position;
+  }
+
+  async insertConfiguration(uri: URI, configuration: DebugConfiguration): Promise<void> {
+    let ref = this.documentService.getModelReference(uri);
+    if (!ref) {
+      ref = await this.documentService.createModelReference(uri);
+    }
+
+    const model = ref.instance.getMonacoModel();
+    const eol = model.getEOL();
+    const position: monaco.Position | undefined = this.visitConfigurationsEditor(model);
+    if (!position) {
+      return;
+    }
+
+    const { indentSize, insertSpaces } = model.getOptions();
+    // 获取 configurations 字符串前面的空格个数
+    const spacesMatch = model.getLineContent(position.lineNumber).match(/^\s*/);
+    const leadingSpaces = spacesMatch ? spacesMatch[0].length : 0;
+    const indent = insertSpaces ? ' '.repeat(indentSize + leadingSpaces) : '\t';
+
+    const decompose = JSON.stringify(configuration, null, indentSize).split(EOL.LF);
+    const length = decompose.length;
+    const indentContent = decompose.reduce(
+      (pre, cur, index) => pre + indent + cur + (index === length - 1 ? '' : EOL.LF),
+      '',
+    );
+
+    model.pushEditOperations(
+      null,
+      [EditOperation.insert(position, eol), EditOperation.insert(position, indentContent + ',')],
+      () => null,
+    );
+  }
+
+  async addConfiguration(uri?: string): Promise<void> {
+    let model: DebugConfigurationModel | undefined;
+    if (uri) {
+      model = this.getModelByUri(uri);
+    } else {
+      model = this.model;
+    }
+    if (!model) {
+      return;
+    }
+    const resouce = await this.doOpen(model);
+    if (!resouce) {
+      return;
+    }
+    const { group } = resouce;
+    const editor = group.codeEditor.monacoEditor;
+    if (!editor) {
+      return;
+    }
+
+    const position: monaco.Position | undefined = this.visitConfigurationsEditor(editor.getModel()!);
     if (!position) {
       return;
     }
+
     // 判断在"configurations": [后是否有字符，如果有则新建一行
     if (editor.getModel()!.getLineLastNonWhitespaceColumn(position.lineNumber) > position.column) {
       editor.setPosition(position);

package/src/browser/debug-contribution.ts

@@ -40,7 +40,6 @@ import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
 import {
   IDebugSessionManager,
-  launchSchemaUri,
   DEBUG_CONTAINER_ID,
   DEBUG_WATCH_ID,
   DEBUG_VARIABLES_ID,
@@ -53,6 +52,7 @@ import {
   TSourceBrekpointProperties,
   DEBUG_COMMANDS,
   IDebugModelManager,
+  launchDefaultSchemaUri,
 } from '../common';
 
 import {
@@ -68,7 +68,7 @@ import { DebugContextKey } from './contextkeys/debug-contextkey.service';
 import { DebugConfigurationManager } from './debug-configuration-manager';
 import { DebugPreferences, debugPreferencesSchema } from './debug-preferences';
 import { DebugProgressService } from './debug-progress.service';
-import { launchSchema } from './debug-schema-updater';
+import { launchSchema } from './debug-schema-manager';
 import { DebugSession } from './debug-session';
 import { DebugSessionManager } from './debug-session-manager';
 import { DebugEditorContribution } from './editor/debug-editor-contribution';
@@ -86,6 +86,10 @@ import { DebugVariableView } from './view/variables/debug-variables.view';
 import { DebugWatchView } from './view/watch/debug-watch.view';
 
 const LAUNCH_JSON_REGEX = /launch\.json$/;
+enum LAUNCH_OPEN {
+  json,
+  editor,
+}
 
 export namespace DebugBreakpointWidgetCommands {
   export const ACCEPT = {
@@ -357,7 +361,11 @@ export class DebugContribution
 
   registerCommands(commands: CommandRegistry) {
     commands.registerCommand(COMMON_COMMANDS.OPEN_LAUNCH_CONFIGURATION, {
-      execute: () => {
+      execute: (type: LAUNCH_OPEN = LAUNCH_OPEN.json) => {
+        if (type === LAUNCH_OPEN.editor) {
+          return this.debugConfigurationService.openLaunchEditor();
+        }
+
         this.debugConfigurationService.openConfiguration();
       },
     });
@@ -653,7 +661,7 @@ export class DebugContribution
   }
 
   registerSchema(registry: IJSONSchemaRegistry) {
-    registry.registerSchema(`${launchSchemaUri}/default`, launchSchema, ['launch.json']);
+    registry.registerSchema(launchDefaultSchemaUri, launchSchema, ['launch.json']);
   }
 
   registerKeybindings(keybindings: KeybindingRegistry) {

package/src/browser/{debug-schema-updater.ts → debug-schema-manager.ts}

@@ -1,7 +1,7 @@
 import { Injectable, Autowired } from '@opensumi/di';
 import { objects, IJSONSchema, IJSONSchemaRegistry } from '@opensumi/ide-core-browser';
 
-import { launchSchemaUri } from '../common';
+import { launchExtensionSchemaUri, launchSchemaUri } from '../common';
 import { DebugServer, IDebugServer } from '../common/debug-service';
 
 import { DebugConfigurationManager } from './debug-configuration-manager';
@@ -9,7 +9,7 @@ import { DebugConfigurationManager } from './debug-configuration-manager';
 const { deepClone } = objects;
 
 @Injectable()
-export class DebugSchemaUpdater {
+export class DebugSchemaManager {
   @Autowired(IDebugServer)
   protected readonly debug: DebugServer;
 
@@ -19,7 +19,7 @@ export class DebugSchemaUpdater {
   @Autowired(DebugConfigurationManager)
   private config: DebugConfigurationManager;
 
-  async update(): Promise<void> {
+  public async update(): Promise<void> {
     const debuggers = this.config.getDebuggers();
     const schema = { ...deepClone(launchSchema) };
     const items = schema!.properties!.configurations.items as IJSONSchema;
@@ -38,7 +38,8 @@ export class DebugSchemaUpdater {
         items.defaultSnippets.push(...configurationSnippets);
       }
     }
-    this.schemaRegistry.registerSchema(`${launchSchemaUri}/extension`, schema, ['launch.json']);
+
+    this.schemaRegistry.registerSchema(launchExtensionSchemaUri, schema, ['launch.json']);
   }
 }
 

package/src/browser/debugUtils.ts

@@ -1,4 +1,5 @@
 import { strings } from '@opensumi/ide-core-browser';
+import { SnippetParser } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/snippet/browser/snippetParser';
 
 import { DebugConfiguration } from '../common';
 
@@ -108,3 +109,25 @@ export class CharWidthReader {
     return width;
   }
 }
+
+export const parseSnippet = (value: string) => {
+  /**
+   * 在 Windows 中, 直接使用 \" 来转义双引号可能会被解析为文件路径中的反斜杠，从而导致路径错误。
+   * 为了避免这个问题，一些插件内使用 ^\" 来表示转义的双引号，这样就不会被解析为文件路径中的反斜杠了。
+   * 当调试器解析 launch.json 文件并读取字符串值时，它会将 ^" 转换为双引号。
+   * 而我们在这里为了需要把转义后的字符串能正确展示，就需要用正则去剔除
+   */
+  const doubleQuotesRegex = new RegExp(/^\^\"(.*)\"/gm);
+  /**
+   * 使用 monaco 内部的 SnippetParser 来转换形如 ${1:xxxx} 这样的符号
+   */
+  const snippet = new SnippetParser();
+  const isHasSnippetRegex = new RegExp(/\${\d+:(.*)/);
+
+  if (isHasSnippetRegex.test(value) || doubleQuotesRegex.test(value)) {
+    const snippetParse = snippet.text(value);
+    return snippetParse.replace(doubleQuotesRegex, '$1');
+  }
+
+  return value;
+};

package/src/browser/editor/debug-breakpoint-zone-widget.tsx

@@ -3,11 +3,12 @@ import ReactDOM from 'react-dom';
 
 import { Injectable, Autowired } from '@opensumi/di';
 import { Select, Option } from '@opensumi/ide-components';
+import { PreferenceService } from '@opensumi/ide-core-browser';
 import { localize, Emitter, Event } from '@opensumi/ide-core-common';
 import { ICodeEditor } from '@opensumi/ide-editor';
 import { ZoneWidget } from '@opensumi/ide-monaco-enhance';
 import { ICSSStyleService } from '@opensumi/ide-theme';
-import * as monacoLanguages from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages';
+import { EditorOption } from '@opensumi/monaco-editor-core/esm/vs/editor/common/config/editorOptions';
 import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
 import {
@@ -29,6 +30,9 @@ export class DebugBreakpointZoneWidget extends ZoneWidget {
   @Autowired(DebugBreakpointsService)
   protected debugBreakpointsService: DebugBreakpointsService;
 
+  @Autowired(PreferenceService)
+  protected preferenceService: PreferenceService;
+
   @Autowired(ICSSStyleService)
   protected readonly cssManager: ICSSStyleService;
 
@@ -219,6 +223,17 @@ export class DebugBreakpointZoneWidget extends ZoneWidget {
     this._wrapper.className = styles.debug_breakpoint_wrapper;
     this._selection.className = styles.debug_breakpoint_selected;
     this._input.className = styles.debug_breakpoint_input;
+
+    const model = this.editor.getModel();
+
+    if (!model) {
+      return;
+    }
+
+    const lineHeight = this.editor.getOption(EditorOption.lineHeight);
+    const fontSize = this.editor.getOption(EditorOption.fontSize);
+    const newTopMargin = lineHeight - fontSize;
+    this._input.style.marginTop = newTopMargin + 'px';
   }
 
   applyStyle() {

package/src/browser/index.ts

@@ -10,6 +10,7 @@ import {
   IDebugProgress,
   IDebugService,
   IDebugSessionManager,
+  ILaunchService,
 } from '../common';
 
 import { BreakpointManager } from './breakpoint';
@@ -30,6 +31,7 @@ import { DebugHoverSource } from './editor/debug-hover-source';
 import { EvaluatableExpressionServiceImpl, IEvaluatableExpressionService } from './editor/evaluatable-expression';
 import { LaunchFolderPreferenceProvider } from './preferences/launch-folder-preference-provider';
 import { LaunchPreferencesContribution } from './preferences/launch-preferences-contribution';
+import { LaunchService } from './preferences/launch.service';
 import { DebugToolbarOverlayWidget } from './view/configuration/debug-toolbar.view';
 import { DebugConsoleModelService } from './view/console/debug-console-tree.model.service';
 import { DebugConsoleContribution } from './view/console/debug-console.contribution';
@@ -88,6 +90,10 @@ export class DebugModule extends BrowserModule {
       token: IDebugService,
       useClass: DebugService,
     },
+    {
+      token: ILaunchService,
+      useClass: LaunchService,
+    },
     {
       token: IDebugProgress,
       useClass: DebugProgressService,

package/src/browser/preferences/components/checkbox-widget.tsx

@@ -0,0 +1,78 @@
+import {
+  ariaDescribedByIds,
+  descriptionId,
+  getTemplate,
+  labelValue,
+  FormContextType,
+  RJSFSchema,
+  StrictRJSFSchema,
+  WidgetProps,
+  GenericObjectType,
+} from '@rjsf/utils';
+import React, { FocusEvent } from 'react';
+
+import { CheckBox } from '@opensumi/ide-components';
+import { IJSONSchema } from '@opensumi/ide-core-common';
+
+import styles from './json-widget.module.less';
+
+export const CheckboxWidget = <T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(
+  props: WidgetProps<T, S, F>,
+) => {
+  const {
+    disabled,
+    formContext,
+    id,
+    label,
+    hideLabel,
+    onBlur,
+    onChange,
+    onFocus,
+    readonly,
+    value,
+    registry,
+    options,
+    schema,
+    uiSchema,
+  } = props;
+  const { readonlyAsDisabled = true } = formContext as GenericObjectType;
+  const DescriptionFieldTemplate = getTemplate<'DescriptionFieldTemplate', T, S, F>(
+    'DescriptionFieldTemplate',
+    registry,
+    options,
+  );
+
+  const handleChange = ({ target }: any) => onChange(target.checked);
+
+  const handleBlur = ({ target }: FocusEvent<HTMLInputElement>) => onBlur(id, target.checked);
+
+  const handleFocus = ({ target }: FocusEvent<HTMLInputElement>) => onFocus(id, target.checked);
+
+  const extraProps = {
+    onBlur: !readonly ? handleBlur : undefined,
+    onFocus: !readonly ? handleFocus : undefined,
+  };
+
+  const description = options.description ?? schema.description ?? (schema as IJSONSchema).markdownDescription;
+
+  return (
+    <div className={styles.checkbox_widget_control}>
+      {!hideLabel && (
+        <label title={label} className={styles.field_label}>
+          {label}
+        </label>
+      )}
+      <CheckBox
+        checked={typeof value === 'undefined' ? false : value}
+        disabled={disabled || (readonlyAsDisabled && readonly)}
+        id={id}
+        name={id}
+        onChange={!readonly ? handleChange : undefined}
+        {...extraProps}
+        aria-describedby={ariaDescribedByIds<T>(id)}
+        label={description}
+        className={styles.checkbox}
+      />
+    </div>
+  );
+};

package/src/browser/preferences/components/fields/any-of-field.tsx

@@ -0,0 +1,90 @@
+import {
+  descriptionId,
+  FieldProps,
+  FormContextType,
+  GenericObjectType,
+  getTemplate,
+  RJSFSchema,
+  StrictRJSFSchema,
+  titleId,
+} from '@rjsf/utils';
+import React from 'react';
+
+import { Input } from '@opensumi/ide-components';
+import { IJSONSchema } from '@opensumi/ide-core-common';
+
+import styles from '../json-widget.module.less';
+
+// 对于 anyof/oneof 的处理统一使用 input
+export const AnyOfField = <T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(
+  props: FieldProps<T, S, F>,
+) => {
+  const {
+    disabled,
+    formContext,
+    idSchema,
+    onBlur,
+    id,
+    onChange,
+    onFocus,
+    options,
+    placeholder,
+    readonly,
+    registry,
+    name,
+    required,
+    schema,
+    uiOptions,
+  } = props;
+  const { readonlyAsDisabled = true } = formContext as GenericObjectType;
+
+  const handleTextChange = ({ target }: React.ChangeEvent<HTMLInputElement>) =>
+    onChange(target.value === '' ? options.emptyValue : target.value);
+
+  const handleBlur = ({ target }: React.FocusEvent<HTMLInputElement>) => onBlur(id!, target.value);
+
+  const handleFocus = ({ target }: React.FocusEvent<HTMLInputElement>) => onFocus(id!, target.value);
+
+  const description = options.description ?? schema.description ?? (schema as IJSONSchema).markdownDescription;
+
+  const TitleFieldTemplate = getTemplate<'TitleFieldTemplate', T, S, F>('TitleFieldTemplate', registry, uiOptions);
+  const DescriptionFieldTemplate = getTemplate<'DescriptionFieldTemplate', T, S, F>(
+    'DescriptionFieldTemplate',
+    registry,
+    uiOptions,
+  );
+
+  return (
+    <div className={styles.any_of_widget_control}>
+      {name && (
+        <div className={styles.object_title}>
+          <TitleFieldTemplate
+            id={titleId<T>(idSchema)}
+            title={name}
+            required={required}
+            schema={schema}
+            registry={registry}
+          />
+        </div>
+      )}
+      {description && (
+        <div className={styles.object_description}>
+          <DescriptionFieldTemplate
+            id={descriptionId<T>(idSchema)}
+            description={description}
+            schema={schema}
+            registry={registry}
+          />
+        </div>
+      )}
+      <Input
+        disabled={disabled || (readonlyAsDisabled && readonly)}
+        onBlur={!readonly ? handleBlur : undefined}
+        onChange={!readonly ? handleTextChange : undefined}
+        onFocus={!readonly ? handleFocus : undefined}
+        placeholder={placeholder}
+        autoComplete='off'
+      />
+    </div>
+  );
+};

package/src/browser/preferences/components/fields/array-field.tsx

@@ -0,0 +1,25 @@
+import { getDefaultRegistry } from '@rjsf/core';
+import { FieldProps } from '@rjsf/utils';
+import { FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import React, { useCallback } from 'react';
+
+import { isUndefined } from '@opensumi/ide-core-common';
+
+const DefaultArrayField: any = getDefaultRegistry().fields.ArrayField;
+
+export const ArrayField = <T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(
+  props: FieldProps<T, S, F>,
+) => {
+  const { onChange } = props;
+
+  const handleOnChange = useCallback(
+    (newFormData: T) => {
+      if (Array.isArray(newFormData)) {
+        onChange(newFormData.map((data) => (isUndefined(data) ? '' : data)) as unknown as T);
+      }
+    },
+    [onChange],
+  );
+
+  return <DefaultArrayField {...props} onChange={handleOnChange} />;
+};

package/src/browser/preferences/components/fields/object-filed.tsx

@@ -0,0 +1,33 @@
+import { getDefaultRegistry } from '@rjsf/core';
+import { FieldProps } from '@rjsf/utils';
+import { FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import React, { useEffect } from 'react';
+
+import { useInjectable } from '@opensumi/ide-core-browser';
+import { Disposable } from '@opensumi/ide-core-common';
+
+import { ILaunchService } from '../../../../common';
+import { LaunchService } from '../../launch.service';
+
+const DefaultObjectField: any = getDefaultRegistry().fields.ObjectField;
+
+export const ObjectField = <T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(
+  props: FieldProps<T, S, F>,
+) => {
+  const launchService = useInjectable<LaunchService>(ILaunchService);
+  const { idSchema, onChange } = props;
+
+  useEffect(() => {
+    const { $id } = idSchema;
+    const disabled = new Disposable();
+
+    // 仅处理 root 节点
+    if ($id === 'root') {
+      disabled.addDispose(launchService.onChangeFormData((newFormData) => onChange(newFormData as T)));
+    }
+
+    return () => disabled.dispose();
+  }, [idSchema]);
+
+  return <DefaultObjectField {...props} />;
+};

package/src/browser/preferences/components/fields/title-field.tsx

@@ -0,0 +1,16 @@
+import { FormContextType, TitleFieldProps, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import React from 'react';
+
+import styles from '../json-widget.module.less';
+
+export const TitleField = <T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(
+  props: TitleFieldProps<T, S, F>,
+) => {
+  const { title } = props;
+
+  return title ? (
+    <label title={title} className={styles.field_label}>
+      {title}
+    </label>
+  ) : null;
+};

package/src/browser/preferences/components/json-widget.module.less

@@ -0,0 +1,36 @@
+@max_width: 500px;
+@min_width: 300px;
+
+.select_widget_control,
+.text_widget_control,
+.any_of_widget_control {
+  min-width: @min_width;
+  max-width: @max_width;
+  width: 100%;
+}
+
+.text_widget_control {
+  input[type='number']::-webkit-outer-spin-button,
+  input[type='number']::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+  }
+}
+
+.checkbox_widget_control {
+  display: flex;
+  flex-direction: column;
+
+  .checkbox {
+    font-size: 14px;
+    opacity: 0.75;
+    white-space: pre-wrap;
+    color: var(--descriptionForeground);
+  }
+}
+
+.field_label {
+  margin-bottom: 10px;
+  font-size: 1.5em;
+  display: inline-block;
+}