1+ import { MonacoOverrides } from './override/monacoOverride/index' ;
12import { Injectable , Injector , ConstructorOf , Provider } from '@opensumi/di' ;
23import {
34 BrowserModule ,
67 PreferenceProviderProvider ,
78 PreferenceScope ,
89 PreferenceProvider ,
9- IContextKeyService ,
10- KeybindingService ,
1110} from '@opensumi/ide-core-browser' ;
1211import { ClientApp as BasicClientApp } from '@opensumi/ide-core-browser/lib/bootstrap/app' ;
1312
@@ -34,51 +33,31 @@ import { FileSchemeContribution } from './file-scheme/index.contribution';
3433import { PreferenceSettingContribution } from './preference/preference.setting.contribution' ;
3534import { LayoutRestoreContributation } from './layout/index.contribution' ;
3635
37- import {
38- MonacoCodeService ,
39- IMonacoCodeService ,
40- monacoCodeServiceProxy ,
41- } from './override/monacoOverride/codeEditorService' ;
42- import { ICodeEditorService } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService' ;
4336import { BreadCrumbServiceImplOverride , IBreadCrumbService } from './override/breadcrumb.service' ;
4437import { SearchContribution } from './search/index.contribution' ;
4538import {
4639 MonacoSnippetSuggestProviderOverride ,
4740 MonacoSnippetSuggestProvider ,
4841} from './override/snippet.service' ;
49- import { MonacoContextKeyService } from './override/monacoContextKeyService' ;
42+ import { IMonacoOverrideService , MonacoOverrideService } from './override/monacoContextKeyService' ;
5043import {
5144 VSCodeContributesServiceOverride ,
5245 VSCodeContributesServiceToken ,
5346} from './override/vscodeContributesService' ;
5447
55- import { ExtensionNodeServiceServerPath } from '@opensumi/ide-extension' ;
56- import {
57- IMonacoTextModelService ,
58- MonacoTextModelService ,
59- monacoTextModelServiceProxy ,
60- } from './override/monacoOverride/textModelService' ;
61- import {
62- IMonacoBulkEditServiceProxy ,
63- MonacoBulkEditService ,
64- monacoBulkEditServiceProxy ,
65- } from './override/monacoOverride/workspaceEditService' ;
66- import { ICommandServiceToken } from '@opensumi/ide-monaco/lib/browser/contrib/command' ;
67- import { MonacoCommandService } from '@opensumi/ide-editor/lib/browser/monaco-contrib/command/command.service' ;
68- import { IBulkEditServiceShape } from '@opensumi/ide-workspace-edit' ;
69- // @ts -ignore
7048import {
7149 IMonacoCommandServiceProxy ,
7250 monacoCommandServiceProxy ,
7351} from './override/monacoOverride/commandService' ;
52+ import { ICommandServiceToken } from '@opensumi/ide-monaco/lib/browser/contrib/command' ;
53+ import { MonacoCommandService } from '@opensumi/ide-editor/lib/browser/monaco-contrib/command/command.service' ;
7454import {
75- IScopedContextKeyServiceProxy ,
76- MonacoContextKeyServiceOverride ,
77- // IMonacoCommandServiceProxy,
78- // monacoCommandServiceProxy,
79- ScopedContextKeyServiceProxy ,
80- } from './override/monacoOverride/contextKeyService' ;
81- import { customKeybindingService } from './override/monacoOverride/customKeybindingService' ;
55+ IMonacoCodeService ,
56+ MonacoCodeService ,
57+ monacoCodeServiceProxy ,
58+ } from './override/monacoOverride/codeEditorService' ;
59+
60+ // import { MonacoOverrides } from './override/monacoOverride';
8261export * from './override/monacoOverride/codeEditorService' ;
8362
8463export { ExtensionManagerModule as ExtensionClientManagerModule } from './extension-manager' ;
@@ -110,36 +89,7 @@ export class ClientModule extends BrowserModule {
11089 LayoutRestoreContributation ,
11190
11291 /* monaco override*/
113- {
114- token : MonacoCodeService ,
115- useValue : monacoCodeServiceProxy ,
116- override : true ,
117- } ,
118- {
119- token : IMonacoCodeService ,
120- useClass : MonacoCodeService ,
121- } ,
122- // MonacoTextModelService
123- {
124- token : MonacoTextModelService ,
125- useValue : monacoTextModelServiceProxy ,
126- override : true ,
127- } ,
128- {
129- token : IMonacoTextModelService ,
130- useClass : MonacoTextModelService ,
131- } ,
132- // IBulkEditServiceShape
133- {
134- token : IBulkEditServiceShape ,
135- useValue : monacoBulkEditServiceProxy ,
136- override : true ,
137- } ,
138- {
139- token : IMonacoBulkEditServiceProxy ,
140- useClass : MonacoBulkEditService ,
141- } ,
142- // MonacoCommandService
92+ // ...MonacoOverrides,
14393 {
14494 token : ICommandServiceToken ,
14595 useValue : monacoCommandServiceProxy ,
@@ -150,32 +100,14 @@ export class ClientModule extends BrowserModule {
150100 useClass : MonacoCommandService ,
151101 } ,
152102 {
153- token : KeybindingService ,
154- useValue : customKeybindingService ,
155- } ,
156- // MonacoContextKeyService
157- {
158- token : IContextKeyService ,
159- useClass : MonacoContextKeyServiceOverride ,
103+ token : MonacoCodeService ,
104+ useValue : monacoCodeServiceProxy ,
160105 override : true ,
161106 } ,
162107 {
163- token : IScopedContextKeyServiceProxy ,
164- useClass : ScopedContextKeyServiceProxy ,
108+ token : IMonacoCodeService ,
109+ useClass : MonacoCodeService ,
165110 } ,
166- // {
167- // token: IScopedContextKeyServiceProxy,
168- // useClass: MonacoCommandService,
169- // },
170- // {
171- // token: ScopedContextKeyServiceProxy,
172- // useFactory: (injector) => {
173- // const contextKeyService = injector.get(ScopedContextKeyServiceProxy);
174-
175- // return new ScopedContextKeyServiceProxy(,injector);
176- // },
177- // // override: true,
178- // },
179111 /* monaco override */
180112 {
181113 token : IBreadCrumbService ,
@@ -192,6 +124,10 @@ export class ClientModule extends BrowserModule {
192124 useClass : VSCodeContributesServiceOverride ,
193125 override : true ,
194126 } ,
127+ {
128+ token : IMonacoOverrideService ,
129+ useClass : MonacoOverrideService ,
130+ } ,
195131 ] ;
196132 preferences = injectDebugPreferences ;
197133}
@@ -216,15 +152,12 @@ export class ClientApp extends BasicClientApp {
216152 super ( opts ) ;
217153 this . modules = opts . modules ;
218154 this . initServer ( opts ) ;
219- // monaco override proxy 防止组件卸载后 monaco override 实例被销毁
220155 this . initMonacoProxy ( ) ;
221156 }
222157
223158 initMonacoProxy ( ) {
224- this . disposer . addDispose ( monacoCodeServiceProxy . setInjector ( this . injector ) ) ;
225- this . disposer . addDispose ( monacoTextModelServiceProxy . setInjector ( this . injector ) ) ;
226- this . disposer . addDispose ( monacoBulkEditServiceProxy . setInjector ( this . injector ) ) ;
227159 this . disposer . addDispose ( monacoCommandServiceProxy . setInjector ( this . injector ) ) ;
160+ this . disposer . addDispose ( monacoCodeServiceProxy . setInjector ( this . injector ) ) ;
228161 }
229162
230163 private initServer ( opts : IAppOpts ) {
0 commit comments