fix: 修复editor主题初始化未注册fromExtension

Author: guqiankun

packages/alex/src/core/editor/editor.extension.ts

@@ -23,6 +23,7 @@ class ExtensionServiceImplOverride extends ExtensionServiceImpl {
     await this.initExtensionMetaData();
     await this.initExtensionInstanceData();
     await this.runExtensionContributes();
+    await this.initThemeAndColor();
     this.doActivate();
   }
 }

packages/alex/src/core/editor/editor.module.ts

@@ -149,6 +149,7 @@ class ThemeContribution extends Disposable implements ClientAppContribution {
       GeekTheme.packageJSON.contributes!.themes,
       URI.parse(getExtensionPath(GeekTheme.extension, 'public'))
     );
+    await this.themeService.applyTheme(undefined, true);
     // 强制用集成设置的默认主题
     await this.themeService.applyTheme(this.defaultPreferenceProvider.get('general.theme'));
   }

packages/alex/src/core/extension/metadata.ts

@@ -87,13 +87,13 @@ export const GeekTheme: IExtensionBasicMetadata = {
       themes: [
         {
           id: 'alipay-geek-dark',
-          label: 'IDE Dark',
+          label: 'IDE Geek Dark',
           uiTheme: 'vs-dark',
           path: './themes/dark/plus.json',
         },
         {
           id: 'alipay-geek-light',
-          label: 'IDE Light',
+          label: 'IDE Geek Light',
           uiTheme: 'vs',
           path: './themes/light/plus.json',
         },

packages/integrations/src/editor/index.tsx

@@ -11,7 +11,7 @@ import Select from 'antd/lib/select';
 import Cascader from 'antd/lib/cascader';
 import Button from 'antd/lib/button';
 import './style.less';
-import editorPlugin from '../common/plugin';
+import * as editorPlugin from './plugin';
 import { LocalExtensionModule } from '../common/local-extension.module';
 
 (window as any).alex = Alex;
@@ -131,27 +131,15 @@ const App = () => {
         </Select>
         <Button
           onClick={() => {
-            const commands = editorPlugin.commands;
+            const commands = editorPlugin.api.commands;
             if (commands) {
-              commands.executeCommand('plugin.command.test', 1, 2);
+              commands.executeCommand('plugin.command.changeTheme', 'ide-dark');
             }
           }}
           size="small"
         >
           command test
         </Button>
-        <Button
-          onClick={() => {
-            const commands = editorPlugin.commands;
-            if (commands) {
-              commands.executeCommand('alex.settings');
-            }
-          }}
-          size="small"
-          style={{ marginLeft: 8 }}
-        >
-          更改偏好设置
-        </Button>
       </div>
       <div style={{ display: 'flex' }}>
         <div style={{ width: '50%', minHeight: 500 }}>

packages/integrations/src/editor/plugin.ts

@@ -13,9 +13,13 @@ export const api = {
 export const activate = ({ context, commands }: IPluginAPI) => {
   _commands = commands;
   context.subscriptions.push(
-    commands.registerCommand('plugin.command.add', (x: number) => {
+    commands.registerCommand('plugin.command.add', async (x: number) => {
       commands.executeCommand('plugin.command.say', 'alex is great');
+      await commands.executeCommand('theme.toggle');
       return x + x;
+    }),
+    commands.registerCommand('plugin.command.changeTheme', (value) => {
+      commands.executeCommand('alex.setDefaultPreference', 'general.theme', value, 1);
     })
   );
 };