@opensumi/ide-keymaps 2.21.8-rc-1670567192.0 → 2.21.8

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "@opensumi/ide-keymaps",
-  "version": "2.21.8-rc-1670567192.0",
+  "version": "2.21.8",
   "files": [
-    "lib",
-    "src"
+    "lib"
   ],
   "license": "MIT",
   "main": "lib/index.js",
@@ -17,16 +16,16 @@
     "url": "git@github.com:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-core-common": "2.21.8-rc-1670567192.0"
+    "@opensumi/ide-core-common": "2.21.8"
   },
   "devDependencies": {
-    "@opensumi/ide-components": "2.21.8-rc-1670567192.0",
-    "@opensumi/ide-core-browser": "2.21.8-rc-1670567192.0",
+    "@opensumi/ide-components": "2.21.8",
+    "@opensumi/ide-core-browser": "2.21.8",
     "@opensumi/ide-dev-tool": "^1.3.1",
-    "@opensumi/ide-editor": "2.21.8-rc-1670567192.0",
-    "@opensumi/ide-file-service": "2.21.8-rc-1670567192.0",
-    "@opensumi/ide-preferences": "2.21.8-rc-1670567192.0",
-    "@opensumi/ide-quick-open": "2.21.8-rc-1670567192.0"
+    "@opensumi/ide-editor": "2.21.8",
+    "@opensumi/ide-file-service": "2.21.8",
+    "@opensumi/ide-preferences": "2.21.8",
+    "@opensumi/ide-quick-open": "2.21.8"
   },
-  "gitHead": "acb182cbff72a453386044944b33a9f71eca426d"
+  "gitHead": "603eaa81756ee0e8a58871fb67cfb01c8499593a"
 }

package/src/browser/index.ts

@@ -1,18 +0,0 @@
-import { Provider, Injectable } from '@opensumi/di';
-import { BrowserModule } from '@opensumi/ide-core-browser';
-
-import { IKeymapService } from '../common';
-
-import { KeymapsContribution } from './keymaps.contribution';
-import { KeymapService } from './keymaps.service';
-
-@Injectable()
-export class KeymapsModule extends BrowserModule {
-  providers: Provider[] = [
-    {
-      token: IKeymapService,
-      useClass: KeymapService,
-    },
-    KeymapsContribution,
-  ];
-}

package/src/browser/keymaps-parser.ts

@@ -1,116 +0,0 @@
-import Ajv from 'ajv';
-import * as parser from 'jsonc-parser';
-
-import { Injectable } from '@opensumi/di';
-
-import { KeymapItem } from '../common';
-
-export const keymapsSchema = {
-  type: 'array',
-  items: {
-    type: 'object',
-    properties: {
-      // 为了兼容 vscode，优先使用 key
-      key: {
-        type: 'string',
-      },
-      keybinding: {
-        type: 'string',
-        deprecated: true,
-      },
-      command: {
-        type: 'string',
-      },
-      context: {
-        type: 'string',
-      },
-      when: {
-        type: 'string',
-      },
-      args: {},
-    },
-    required: ['command'],
-    optional: ['key', 'keybinding', 'when', 'args'],
-    additionalProperties: false,
-  },
-};
-
-@Injectable()
-export class KeymapsParser {
-  protected readonly validate: Ajv.ValidateFunction;
-
-  constructor() {
-    // https://github.com/epoberezkin/ajv#validation-and-reporting-options
-    this.validate = new Ajv({
-      jsonPointers: true,
-    }).compile(keymapsSchema);
-  }
-
-  /**
-   * 解析快捷键，存储潜在的错误
-   * @param content 内容.
-   * @param errors 可选的错误存储指针.
-   */
-  parse(content: string, errors?: string[]): KeymapItem[] {
-    const strippedContent = parser.stripComments(content);
-    const parsingErrors: parser.ParseError[] | undefined = errors ? [] : undefined;
-    const bindings = parser.parse(strippedContent, parsingErrors);
-    if (parsingErrors && errors) {
-      for (const error of parsingErrors) {
-        errors.push(`${this.printParseErrorCode(error.error)} at ${error.offset} offset of ${error.length} length`);
-      }
-    }
-    if (this.validate(bindings)) {
-      return bindings;
-    }
-    if (errors && this.validate.errors) {
-      for (const error of this.validate.errors) {
-        errors.push(`${error.message} at ${error.dataPath}`);
-      }
-    }
-    return [];
-  }
-
-  /**
-   * 输出解析的错误代码
-   * @param code 错误码
-   */
-  // https://github.com/Microsoft/node-jsonc-parser/issues/13
-  protected printParseErrorCode(code: number | undefined) {
-    switch (code) {
-      case parser.ParseErrorCode.InvalidSymbol:
-        return 'InvalidSymbol';
-      case parser.ParseErrorCode.InvalidNumberFormat:
-        return 'InvalidNumberFormat';
-      case parser.ParseErrorCode.PropertyNameExpected:
-        return 'PropertyNameExpected';
-      case parser.ParseErrorCode.ValueExpected:
-        return 'ValueExpected';
-      case parser.ParseErrorCode.ColonExpected:
-        return 'ColonExpected';
-      case parser.ParseErrorCode.CommaExpected:
-        return 'CommaExpected';
-      case parser.ParseErrorCode.CloseBraceExpected:
-        return 'CloseBraceExpected';
-      case parser.ParseErrorCode.CloseBracketExpected:
-        return 'CloseBracketExpected';
-      case parser.ParseErrorCode.EndOfFileExpected:
-        return 'EndOfFileExpected';
-      case parser.ParseErrorCode.InvalidCommentToken:
-        return 'InvalidCommentToken';
-      case parser.ParseErrorCode.UnexpectedEndOfComment:
-        return 'UnexpectedEndOfComment';
-      case parser.ParseErrorCode.UnexpectedEndOfString:
-        return 'UnexpectedEndOfString';
-      case parser.ParseErrorCode.UnexpectedEndOfNumber:
-        return 'UnexpectedEndOfNumber';
-      case parser.ParseErrorCode.InvalidUnicode:
-        return 'InvalidUnicode';
-      case parser.ParseErrorCode.InvalidEscapeCharacter:
-        return 'InvalidEscapeCharacter';
-      case parser.ParseErrorCode.InvalidCharacter:
-        return 'InvalidCharacter';
-    }
-    return '<unknown ParseErrorCode>';
-  }
-}

package/src/browser/keymaps.contribution.ts

@@ -1,202 +0,0 @@
-import { Autowired, Injectable } from '@opensumi/di';
-import {
-  ClientAppContribution,
-  URI,
-  Domain,
-  CommandContribution,
-  CommandRegistry,
-  Command,
-  COMMON_COMMANDS,
-  KeybindingContribution,
-  KeybindingRegistry,
-  WithEventBus,
-  MaybePromise,
-  localize,
-  getIcon,
-  KeyboardNativeLayoutService,
-  KEYBOARD_COMMANDS,
-  getKeyboardLayoutId,
-  KeymapInfo,
-  formatLocalize,
-} from '@opensumi/ide-core-browser';
-import { MenuContribution, IMenuRegistry, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
-import { ResourceService, IResourceProvider, IResource } from '@opensumi/ide-editor';
-import { BrowserEditorContribution, EditorComponentRegistry } from '@opensumi/ide-editor/lib/browser';
-import { IFileServiceClient } from '@opensumi/ide-file-service/lib/common';
-import { QuickPickItem, QuickPickService } from '@opensumi/ide-quick-open';
-
-import { KEYMAPS_SCHEME, IKeymapService } from '../common';
-
-import { KeymapsView } from './keymaps.view';
-
-const KEYMAPS_PREVIEW_COMPONENT_ID = 'keymaps-preview';
-
-@Injectable()
-export class KeymapsResourceProvider extends WithEventBus implements IResourceProvider {
-  readonly scheme: string = KEYMAPS_SCHEME;
-
-  constructor() {
-    super();
-  }
-
-  provideResource(uri: URI): MaybePromise<IResource<any>> {
-    return {
-      supportsRevive: true,
-      name: localize('keymaps.tab.name'),
-      icon: getIcon('setting'),
-      uri,
-    };
-  }
-
-  provideResourceSubname(resource: IResource, groupResources: IResource[]): string | null {
-    return null;
-  }
-
-  async shouldCloseResource(resource: IResource, openedResources: IResource[][]): Promise<boolean> {
-    return true;
-  }
-}
-
-export namespace KeymapsContextMenu {
-  // 1_, 2_用于菜单排序，这样能保证分组顺序顺序
-  export const KEYMAPS = '2_keymaps';
-}
-
-export namespace KEYMAP_COMMANDS {
-  const CATEGORY = 'keymaps';
-
-  export const OPEN_SOURCE_FILE: Command = {
-    id: 'keymaps.open.source',
-    label: localize('keymaps.editorTitle.openSource'),
-    category: CATEGORY,
-  };
-}
-
-@Domain(CommandContribution, KeybindingContribution, ClientAppContribution, BrowserEditorContribution, MenuContribution)
-export class KeymapsContribution
-  implements
-    CommandContribution,
-    KeybindingContribution,
-    ClientAppContribution,
-    BrowserEditorContribution,
-    MenuContribution
-{
-  @Autowired(QuickPickService)
-  private readonly quickPickService: QuickPickService;
-
-  @Autowired(KeyboardNativeLayoutService)
-  private readonly layoutProvider: KeyboardNativeLayoutService;
-
-  @Autowired(IFileServiceClient)
-  protected readonly filesystem: IFileServiceClient;
-
-  @Autowired(KeymapsResourceProvider)
-  protected readonly keymapsResourceProvider: KeymapsResourceProvider;
-
-  @Autowired(IKeymapService)
-  protected readonly keymapService: IKeymapService;
-
-  registerCommands(commands: CommandRegistry) {
-    commands.registerCommand(COMMON_COMMANDS.OPEN_KEYMAPS, {
-      isEnabled: () => true,
-      execute: async () => {
-        await this.keymapService.open();
-      },
-    });
-    commands.registerCommand(KEYMAP_COMMANDS.OPEN_SOURCE_FILE, {
-      execute: async () => {
-        this.keymapService.openResource();
-      },
-    });
-    commands.registerCommand(KEYBOARD_COMMANDS.CHOOSE_KEYBOARD_LAYOUT, {
-      execute: () => {
-        this.chooseLayout();
-      },
-    });
-  }
-
-  registerMenus(menus: IMenuRegistry) {
-    menus.registerMenuItem(MenuId.SettingsIconMenu, {
-      command: COMMON_COMMANDS.OPEN_KEYMAPS.id,
-      group: KeymapsContextMenu.KEYMAPS,
-    });
-
-    menus.registerMenuItem(MenuId.EditorTitle, {
-      command: KEYMAP_COMMANDS.OPEN_SOURCE_FILE.id,
-      iconClass: getIcon('open'),
-      group: 'navigation',
-      order: 4,
-      when: `resourceScheme == ${KEYMAPS_SCHEME}`,
-    });
-
-    menus.registerMenuItem(MenuId.EditorTitle, {
-      command: COMMON_COMMANDS.OPEN_KEYMAPS.id,
-      iconClass: getIcon('open'),
-      group: 'navigation',
-      order: 4,
-      when: 'resourceFilename =~ /keymaps.json/',
-    });
-  }
-
-  registerKeybindings(keybindings: KeybindingRegistry): void {
-    keybindings.registerKeybinding({
-      command: COMMON_COMMANDS.OPEN_KEYMAPS.id,
-      keybinding: 'ctrlcmd+K ctrlcmd+S',
-    });
-  }
-
-  onStart() {
-    this.keymapService.init();
-  }
-
-  registerResource(resourceService: ResourceService) {
-    resourceService.registerResourceProvider(this.keymapsResourceProvider);
-  }
-
-  registerEditorComponent(editorComponentRegistry: EditorComponentRegistry) {
-    editorComponentRegistry.registerEditorComponent({
-      component: KeymapsView,
-      uid: KEYMAPS_PREVIEW_COMPONENT_ID,
-      scheme: KEYMAPS_SCHEME,
-    });
-
-    editorComponentRegistry.registerEditorComponentResolver(KEYMAPS_SCHEME, (_, __, resolve) => {
-      resolve!([
-        {
-          type: 'component',
-          componentId: KEYMAPS_PREVIEW_COMPONENT_ID,
-        },
-      ]);
-    });
-  }
-
-  protected async chooseLayout() {
-    const current = this.layoutProvider.currentLayoutData;
-    const autodetect: QuickPickItem<'autodetect'> = {
-      label: localize('keyboard.autoDetect.label'),
-      description:
-        current && this.layoutProvider.currentLayoutSource !== 'user-choice'
-          ? formatLocalize('keyboard.autoDetect.description', getKeyboardLayoutId(current.layout))
-          : undefined,
-      detail: localize('keyboard.autoDetect.detail'),
-      value: 'autodetect',
-    };
-    const otherLayouts = this.layoutProvider.allLayoutData.map((layout) =>
-      this.toQuickPickValue(layout, current === layout),
-    );
-
-    let layouts: QuickPickItem<KeymapInfo | 'autodetect'>[];
-    layouts = [autodetect, ...otherLayouts];
-    const chosen = await this.quickPickService.show(layouts, { placeholder: 'Choose a keyboard layout' });
-    if (chosen) {
-      return this.layoutProvider.setLayoutData(chosen);
-    }
-  }
-
-  protected toQuickPickValue(layout: KeymapInfo, isCurrent: boolean): QuickPickItem<KeymapInfo> {
-    return {
-      label: getKeyboardLayoutId(layout.layout),
-      value: layout,
-    };
-  }
-}