opensumi · Aaaaash · Oct 27, 2022 · Oct 11, 2022 · Oct 19, 2022 · Oct 19, 2022
diff --git a/packages/connection/package.json b/packages/connection/package.json
@@ -19,7 +19,7 @@
     "@opensumi/ide-core-common": "2.20.9",
     "@opensumi/vscode-jsonrpc": "^8.0.0-next.2",
     "path-match": "^1.2.4",
-    "ws": "^7.2.0"
+    "ws": "^8.9.0"
   },
   "devDependencies": {
     "@opensumi/ide-components": "2.20.9",

diff --git a/packages/connection/src/node/common-channel-handler.ts b/packages/connection/src/node/common-channel-handler.ts
@@ -108,7 +108,10 @@ export class CommonChannelHandler extends WebSocketHandler {
 
   private initWSServer() {
     this.logger.log('init Common Channel Handler');
-    this.wsServer = new ws.Server({ noServer: true, ...this.options.wsServerOptions });
+    this.wsServer = new ws.Server({
+      noServer: true,
+      ...this.options.wsServerOptions,
+    });
     this.wsServer.on('connection', (connection: ws) => {
       let connectionId;
       connection.on('message', (msg: string) => {
@@ -194,6 +197,7 @@ export class CommonChannelHandler extends WebSocketHandler {
       });
     });
   }
+
   private channelConnectionSend = (connection: ws) => (content: string) => {
     if (connection.readyState === connection.OPEN) {
       connection.send(content, (err: any) => {

diff --git a/packages/core-browser/src/bootstrap/app.ts b/packages/core-browser/src/bootstrap/app.ts
@@ -69,6 +69,7 @@ import { electronEnv } from '../utils';
 import { renderClientApp, IAppRenderer } from './app.view';
 import { createClientConnection2, bindConnectionService } from './connection';
 import { injectInnerProviders } from './inner-providers';
+import { AppLifeCycleService, AppLifeCycleServiceToken, LifeCyclePhase } from './lifecycle.service';
 
 export type ModuleConstructor = ConstructorOf<BrowserModule>;
 export type ContributionConstructor = ConstructorOf<ClientAppContribution>;
@@ -240,6 +241,17 @@ export class ClientApp implements IClientApp, IDisposable {
     }
   }
 
+  get lifeCycleService(): AppLifeCycleService {
+    return this.injector.get(AppLifeCycleServiceToken);
+  }
+
+  /**
+   * LifeCycle
+   * 1. Prepare
+   * 2. Initialize
+   * 3. Starting
+   * 4. Ready
+   */
   public async start(
     container: HTMLElement | IAppRenderer,
     type?: 'electron' | 'web',
@@ -248,6 +260,8 @@ export class ClientApp implements IClientApp, IDisposable {
     const reporterService: IReporterService = this.injector.get(IReporterService);
     const measureReporter = reporterService.time(REPORT_NAME.MEASURE);
 
+    this.lifeCycleService.phase = LifeCyclePhase.Prepare;
+
     if (connection) {
       await bindConnectionService(this.injector, this.modules, connection);
     } else {
@@ -283,6 +297,7 @@ export class ClientApp implements IClientApp, IDisposable {
     this.stateService.state = 'started_contributions';
     this.stateService.state = 'ready';
 
+    this.lifeCycleService.phase = LifeCyclePhase.Ready;
     measureReporter.timeEnd('Framework.ready');
   }
 
@@ -370,6 +385,7 @@ export class ClientApp implements IClientApp, IDisposable {
     // 先渲染 layout，模块视图的时序由layout控制
     await this.measure('RenderApp.render', () => this.renderApp(container));
 
+    this.lifeCycleService.phase = LifeCyclePhase.Initialize;
     await this.measure('Contributions.initialize', () => this.initializeContributions());
 
     // 初始化命令、快捷键与菜单
@@ -378,6 +394,7 @@ export class ClientApp implements IClientApp, IDisposable {
     // 核心模块初始化完毕
     this.stateService.state = 'core_module_initialized';
 
+    this.lifeCycleService.phase = LifeCyclePhase.Starting;
     await this.measure('Contributions.onStart', () => this.onStartContributions());
 
     await this.runContributionsPhase(this.contributions, 'onDidStart');
@@ -396,8 +413,6 @@ export class ClientApp implements IClientApp, IDisposable {
    * run contribution#initialize
    */
   private async initializeContributions() {
-    this.logger.verbose('startContributions clientAppContributions', this.contributions);
-
     await this.runContributionsPhase(this.contributions, 'initialize');
     this.appInitialized.resolve();
 

diff --git a/packages/core-browser/src/bootstrap/inner-providers.ts b/packages/core-browser/src/bootstrap/inner-providers.ts
@@ -42,7 +42,7 @@ import { ClientAppStateService } from '../application/application-state-service'
 import { ApplicationService } from '../application/application.service';
 import { AuthenticationService } from '../authentication/authentication.service';
 import { ClientAppContribution } from '../common';
-import { ExtensionsPointServiceImpl, IExtensionsPointService } from '../extensions';
+import { ExtensionsPointServiceImpl, IExtensionsSchemaService } from '../extensions';
 import { FsProviderContribution } from '../fs';
 import { KeybindingContribution, KeybindingService, KeybindingRegistryImpl, KeybindingRegistry } from '../keybinding';
 import { BrowserKeyboardLayoutImpl, KeyValidator } from '../keyboard';
@@ -88,6 +88,8 @@ import { VariableRegistry, VariableRegistryImpl, VariableContribution } from '..
 import { IWindowService } from '../window';
 import { WindowService } from '../window/window.service';
 
+import { AppLifeCycleService, AppLifeCycleServiceToken } from './lifecycle.service';
+
 export function injectInnerProviders(injector: Injector) {
   // 生成 ContributionProvider
   createContributionProvider(injector, ClientAppContribution);
@@ -250,9 +252,13 @@ export function injectInnerProviders(injector: Injector) {
       useClass: HashCalculateServiceImpl,
     },
     {
-      token: IExtensionsPointService,
+      token: IExtensionsSchemaService,
       useClass: ExtensionsPointServiceImpl,
     },
+    {
+      token: AppLifeCycleServiceToken,
+      useClass: AppLifeCycleService,
+    },
   ];
   injector.addProviders(...providers);
 

diff --git a/packages/core-browser/src/bootstrap/lifecycle.service.ts b/packages/core-browser/src/bootstrap/lifecycle.service.ts
@@ -0,0 +1,28 @@
+import { Injectable } from '@opensumi/di';
+import { Emitter } from '@opensumi/ide-core-common';
+
+export const AppLifeCycleServiceToken = Symbol('AppLifeCycleService');
+
+export const enum LifeCyclePhase {
+  Prepare = 1,
+  Initialize = 2,
+  Starting = 3,
+  Ready = 4,
+}
+
+@Injectable()
+export class AppLifeCycleService {
+  private onDidChangeLifecyclePhaseEmitter: Emitter<LifeCyclePhase> = new Emitter();
+  public >
+
+  private lifeCyclePhase: LifeCyclePhase;
+
+  set phase(value: LifeCyclePhase) {
+    this.lifeCyclePhase = value;
+    this.onDidChangeLifecyclePhaseEmitter.fire(this.lifeCyclePhase);
+  }
+
+  get phase() {
+    return this.lifeCyclePhase;
+  }
+}
diff --git a/packages/core-browser/src/extensions/extensions-point.service.ts b/packages/core-browser/src/extensions/extensions-point.service.ts
@@ -22,15 +22,15 @@ export interface IExtensionPointDescriptor {
   frameworkKind?: FrameworkKind[];
 }
 
-export const IExtensionsPointService = Symbol('IExtensionsPointService');
+export const IExtensionsSchemaService = Symbol('IExtensionsSchemaService');
 
-export interface IExtensionsPointService {
+export interface IExtensionsSchemaService {
   registerExtensionPoint(desc: IExtensionPointDescriptor): void;
   appendExtensionPoint(points: string[], desc: IExtensionPointDescriptor): void;
 }
 
 @Injectable()
-export class ExtensionsPointServiceImpl implements IExtensionsPointService {
+export class ExtensionsPointServiceImpl implements IExtensionsSchemaService {
   @Autowired(IJSONSchemaRegistry)
   private schemaRegistry: IJSONSchemaRegistry;
 

diff --git a/packages/core-browser/src/monaco/index.ts b/packages/core-browser/src/monaco/index.ts
@@ -71,6 +71,12 @@ export interface MonacoContribution {
       contribCtor: new (editor: ICodeEditor, ...services: Services) => IEditorContribution,
     ) => void,
   ): void;
+
+  /**
+   * [{ id: association.id, mime: mimetype, filepattern: association.filePattern }]
+   * @param register
+   */
+  registerPlatformLanguageAssociations?(register: (mime: MimeAssociation[]) => void): void;
 }
 
 export const Extensions = {
@@ -111,15 +117,8 @@ export const ISchemaStore = Symbol('ISchemaStore');
 
 export interface MimeAssociation {
   readonly id: string;
-  readonly filePattern: string;
-}
-
-export const IMimeService = Symbol('IMimeService');
-export interface IMimeService {
-  /**
-   * 更新 mime
-   */
-  updateMime(): void;
+  readonly filepattern: string;
+  readonly mime: string;
 }
 
 export interface SuggestEventPayload {

diff --git a/packages/core-browser/src/preferences/preference-contribution.ts b/packages/core-browser/src/preferences/preference-contribution.ts
@@ -156,7 +156,7 @@ export class PreferenceSchemaProvider extends PreferenceProvider {
     const overridable = schema.overridable || false;
     for (const preferenceName of Object.keys(schema.properties)) {
       if (this.combinedSchema.properties[preferenceName] && !override) {
-        this.logger.error('Preference name collision detected in the schema for property: ' + preferenceName);
+        this.logger.warn('Preference name collision detected in the schema for property: ' + preferenceName);
         continue;
       } else {
         const schemaProps = PreferenceDataProperty.fromPreferenceSchemaProperty(

diff --git a/packages/core-common/src/storage.ts b/packages/core-common/src/storage.ts
@@ -74,14 +74,15 @@ export class DefaultStorageProvider {
       return this.storageCacheMap.get(storageId.toString());
     }
     const resolvers = this.resolversProvider.getContributions();
-    for (const resolver of resolvers) {
-      const storageResolver = await resolver.resolve(storageId);
-      if (storageResolver) {
-        this.storageCacheMap.set(storageId.toString(), storageResolver);
-        return storageResolver;
-      }
-    }
-    return;
+    return Promise.race(
+      resolvers.map(async (resolver) => {
+        const storageResolver = await resolver.resolve(storageId);
+        if (storageResolver) {
+          this.storageCacheMap.set(storageId.toString(), storageResolver);
+          return storageResolver;
+        }
+      }),
+    );
   }
 }
 

diff --git a/packages/debug/src/browser/debug-contribution.ts b/packages/debug/src/browser/debug-contribution.ts
@@ -21,7 +21,7 @@ import {
   PreferenceService,
   IPreferenceSettingsService,
   COMMON_COMMANDS,
-  IExtensionsPointService,
+  IExtensionsSchemaService,
 } from '@opensumi/ide-core-browser';
 import { browserViews } from '@opensumi/ide-core-browser/lib/extensions/schema/browserViews';
 import { ToolbarRegistry, TabBarToolbarContribution } from '@opensumi/ide-core-browser/lib/layout';
@@ -334,8 +334,8 @@ export class DebugContribution
   @Autowired(DebugContextKey)
   protected readonly debugContextKey: DebugContextKey;
 
-  @Autowired(IExtensionsPointService)
-  protected readonly extensionsPointService: IExtensionsPointService;
+  @Autowired(IExtensionsSchemaService)
+  protected readonly extensionsPointService: IExtensionsSchemaService;
 
   private firstSessionStart = true;
 

diff --git a/packages/editor/src/browser/doc-model/editor-document-model.ts b/packages/editor/src/browser/doc-model/editor-document-model.ts
@@ -170,6 +170,17 @@ export class EditorDocumentModel extends Disposable implements IEditorDocumentMo
     this.readCacheToApply();
 
     this.addDispose(this._onDidChangeEncoding);
+
+    this.addDispose(
+      this.monacoModel.onDidChangeLanguage((e) => {
+        this.eventBus.fire(
+          new EditorDocumentModelOptionChangedEvent({
+            uri: this.uri,
+            languageId: e.newLanguage,
+          }),
+        );
+      }),
+    );
   }
 
   updateOptions(options) {

diff --git a/packages/editor/src/browser/editor.contribution.ts b/packages/editor/src/browser/editor.contribution.ts
@@ -34,13 +34,15 @@ import {
   SUPPORTED_ENCODINGS,
   FILE_COMMANDS,
   electronEnv,
+  CorePreferences,
 } from '@opensumi/ide-core-browser';
 import { ComponentContribution, ComponentRegistry } from '@opensumi/ide-core-browser/lib/layout';
 import { MenuContribution, IMenuRegistry, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
 import { AbstractContextMenuService } from '@opensumi/ide-core-browser/lib/menu/next/menu.interface';
 import { ICtxMenuRenderer } from '@opensumi/ide-core-browser/lib/menu/next/renderer/ctxmenu/base';
 import { isWindows, isOSX, PreferenceScope, ILogger, OnEvent, WithEventBus } from '@opensumi/ide-core-common';
 import { IElectronMainUIService } from '@opensumi/ide-core-common/lib/electron';
+import { ITextmateTokenizer, ITextmateTokenizerService } from '@opensumi/ide-monaco/lib/browser/contrib/tokenizer';
 import { EOL } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
 import { EditorContextKeys } from '@opensumi/monaco-editor-core/esm/vs/editor/common/editorContextKeys';
 import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
@@ -53,7 +55,6 @@ import {
   EditorGroupSplitAction,
   ILanguageService,
   Direction,
-  ResourceDecorationChangeEvent,
   IDocPersistentCacheProvider,
   IEditor,
   SaveReason,
@@ -74,7 +75,7 @@ import { EditorContextMenuController } from './menu/editor.context';
 import { NavigationMenuContainer } from './navigation.view';
 import { GoToLineQuickOpenHandler } from './quick-open/go-to-line';
 import { WorkspaceSymbolQuickOpenHandler } from './quick-open/workspace-symbol-quickopen';
-import { EditorGroupsResetSizeEvent, BrowserEditorContribution, IEditorFeatureRegistry } from './types';
+import { EditorGroupsResetSizeEvent, BrowserEditorContribution, IEditorFeatureRegistry, ResourceDecorationChangeEvent } from './types';
 import { EditorSuggestWidgetContribution } from './view/suggest-widget';
 import { EditorTopPaddingContribution } from './view/topPadding';
 import { WorkbenchEditorServiceImpl, EditorGroup } from './workbench-editor.service';
@@ -160,6 +161,12 @@ export class EditorContribution
   @Autowired(PreferenceService)
   private readonly preferenceService: PreferenceService;
 
+  @Autowired(ITextmateTokenizer)
+  private readonly textmateService: ITextmateTokenizerService;
+
+  @Autowired(CorePreferences)
+  private readonly corePreferences: CorePreferences;
+
   @Autowired(IEditorDocumentModelContentRegistry)
   contentRegistry: IEditorDocumentModelContentRegistry;
 
@@ -235,6 +242,29 @@ export class EditorContribution
     );
   }
 
+  protected getMimeForMode(langId: string): string | undefined {
+    for (const language of this.textmateService.getLanguages()) {
+      if (language.id === langId && language.mimetypes) {
+        return language.mimetypes[0];
+      }
+    }
+    return undefined;
+  }
+
+  registerPlatformLanguageAssociations(register) {
+    const association = this.corePreferences['files.associations'];
+    if (!association) {
+      return;
+    }
+
+    const mimeAssociation = Object.keys(association).map((filepattern) => ({
+      id: association[filepattern],
+      filepattern,
+      mime: this.getMimeForMode(association[filepattern]) || `text/x-${association.id}`,
+    }));
+    register(mimeAssociation);
+  }
+
   protected async interceptOpen(uri: URI) {
     try {
       await this.openerService.open(uri);

diff --git a/packages/editor/src/browser/language/language.service.ts b/packages/editor/src/browser/language/language.service.ts
@@ -8,6 +8,7 @@ import {
   IRelatedInformation,
   MarkerSeverity,
 } from '@opensumi/ide-core-common';
+import { ITextmateTokenizer, ITextmateTokenizerService } from '@opensumi/ide-monaco/lib/browser/contrib/tokenizer';
 import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
 import {
@@ -83,6 +84,9 @@ export class LanguageService implements ILanguageService {
   @Autowired()
   private markerManager: MarkerManager;
 
+  @Autowired(ITextmateTokenizer)
+  private textmateService: ITextmateTokenizerService;
+
   protected readonly markers = new Map<string, MonacoDiagnosticCollection>();
 
   readonly workspaceSymbolProviders: WorkspaceSymbolProvider[] = [];
@@ -99,13 +103,13 @@ export class LanguageService implements ILanguageService {
   }
 
   get languages(): Language[] {
-    return [...this.mergeLanguages(monaco.languages.getLanguages()).values()];
+    return [...this.mergeLanguages(this.textmateService.getLanguages()).values()];
   }
 
   getLanguage(languageId: string): Language | undefined {
-    return this.mergeLanguages(monaco.languages.getLanguages().filter((language) => language.id === languageId)).get(
-      languageId,
-    );
+    return this.mergeLanguages(
+      this.textmateService.getLanguages().filter((language) => language.id === languageId),
+    ).get(languageId);
   }
 
   protected mergeLanguages(registered: monaco.languages.ILanguageExtensionPoint[]): Map<string, Mutable<Language>> {