[monaco] removed overriding dark-plus theming

Fixes eclipse-theia#5188 Signed-off-by: Sven Efftinge <[email protected]>
fangnx · May 21, 2019 · f39185a · f39185a
1 parent c52b47d
commit f39185a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 40 deletions.
diff --git a/packages/core/src/browser/theming.ts b/packages/core/src/browser/theming.ts
@@ -201,7 +201,7 @@ export class BuiltinThemeProvider {
         id: 'dark',
         label: 'Dark Theme',
         description: 'Bright fonts on dark backgrounds.',
-        editorTheme: 'vs-dark',
+        editorTheme: 'dark-plus', // loaded in /packages/monaco/src/browser/textmate/monaco-theme-registry.ts
         activate() {
             BuiltinThemeProvider.darkCss.use();
         },
@@ -214,7 +214,7 @@ export class BuiltinThemeProvider {
         id: 'light',
         label: 'Light Theme',
         description: 'Dark fonts on light backgrounds.',
-        editorTheme: 'vs',
+        editorTheme: 'light-plus', // loaded in /packages/monaco/src/browser/textmate/monaco-theme-registry.ts
         activate() {
             BuiltinThemeProvider.lightCss.use();
         },

diff --git a/packages/monaco/src/browser/textmate/monaco-textmate-builtin-theme-provider.ts b/packages/monaco/src/browser/textmate/monaco-textmate-builtin-theme-provider.ts
diff --git a/packages/monaco/src/browser/textmate/monaco-textmate-frontend-bindings.ts b/packages/monaco/src/browser/textmate/monaco-textmate-frontend-bindings.ts
@@ -17,8 +17,6 @@
 import { interfaces } from 'inversify';
 import { FrontendApplicationContribution, isBasicWasmSupported } from '@theia/core/lib/browser';
 import { bindContributionProvider } from '@theia/core';
-import { ThemeService } from '@theia/core/lib/browser/theming';
-import { BuiltinTextmateThemeProvider } from './monaco-textmate-builtin-theme-provider';
 import { TextmateRegistry } from './textmate-registry';
 import { LanguageGrammarDefinitionContribution } from './textmate-contribution';
 import { MonacoTextmateService, OnigasmPromise } from './monaco-textmate-service';
@@ -68,7 +66,4 @@ export default (bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: inter
     bindContributionProvider(bind, LanguageGrammarDefinitionContribution);
     bind(TextmateRegistry).toSelf().inSingletonScope();
     bind(MonacoThemeRegistry).toDynamicValue(() => MonacoThemeRegistry.SINGLETON).inSingletonScope();
-
-    const themeService = ThemeService.get();
-    themeService.register(...BuiltinTextmateThemeProvider.theiaTextmateThemes);
 };