feat: use theme service override

Author: CGNonofr

src/configuration/index.ts

@@ -11,7 +11,23 @@ configurationRegistry.registerDefaultConfigurations([{
     'editor.fontSize': 12,
     'editor.maxTokenizationLineLength': 1000,
     'editor.quickSuggestions': false,
-    'files.eol': '\n'
+    'files.eol': '\n',
+    'editor.semanticTokenColorCustomizations': {
+      rules: {
+        '*.static': {
+          fontStyle: 'italic'
+        },
+        '*.final.static': {
+          fontStyle: 'italic bold'
+        },
+        '*.readonly': {
+          fontStyle: 'bold'
+        },
+        '*.deprecated': {
+          fontStyle: 'strikethrough'
+        }
+      }
+    }
   }
 }])
 

src/monaco.ts

@@ -1,9 +1,11 @@
 import * as monaco from 'monaco-editor'
 import './languages'
 import './theme'
+import { StandaloneServices, ITextModelService, ITextModelContentProvider } from 'vscode/services'
 import getModelEditorServiceOverride from 'vscode/service-override/modelEditor'
 import getMessageServiceOverride from 'vscode/service-override/messages'
 import getConfigurationServiceOverride from 'vscode/service-override/configuration'
+import getThemeServiceOverride from 'vscode/service-override/theme'
 import './worker'
 import { createConfiguredEditor, errorHandler } from 'vscode/monaco'
 import setupExtensions from './extensions'
@@ -25,7 +27,8 @@ StandaloneServices.initialize({
     return editorOpenHandlerRegistry.openCodeEditor(model, input, sideBySide)
   }),
   ...getMessageServiceOverride(document.body),
-  ...getConfigurationServiceOverride()
+  ...getConfigurationServiceOverride(),
+  ...getThemeServiceOverride()
 })
 // Disable high contrast autodetection because it fallbacks on the hc-black no matter what
 setTimeout(() => {

src/theme/index.ts

@@ -1,44 +1,45 @@
-import * as monaco from 'monaco-editor'
-import { defineVSCodeTheme } from './registry'
-import './semanticHighlight'
-import { IVSCodeTheme } from './tools'
+import { setThemes, setDefaultThemes, IThemeExtensionPoint } from 'vscode/service-override/theme'
+import { Disposable } from 'vscode'
 import defaultThemes from '../languages/extensions/themes.json'
 import themeLoader from '../languages/extensions/themeLoader'
 
-const DEFAULT_VSCODE_THEMES: Partial<Record<string, monaco.editor.BuiltinTheme>> = {
-  'Default Light+': 'vs',
-  'Default Dark+': 'vs-dark',
-  'Default High Contrast': 'hc-black'
-  // 'Default High Contrast Light': 'hc-white' // FIXME: Uncomment me with monaco 0.34 which support hc-light theme
+interface DefaultTheme extends IThemeExtensionPoint {
+  extension: string
 }
-// FIXME: Remove me with monaco 0.34 which support hc-light theme
-const VSCODE_THEME_BLACKLIST = new Set(['Default High Contrast Light'])
 
-function generateMonacoThemeId (vsCodeThemeId: string) {
-  return vsCodeThemeId.replace(/ /g, '-').toLowerCase().replace(/[^a-z0-9-]/g, '')
+interface VSCodeTheme extends IThemeExtensionPoint {
+  load: () => Promise<string>
 }
 
-interface VSCodeTheme extends Omit<monaco.extra.IThemeExtensionPoint, '_watch'> {
-  extension: string
+setDefaultThemes((defaultThemes as DefaultTheme[]).map(themeExtensionPoint => ({
+  ...themeExtensionPoint,
+  load: async () => JSON.stringify(await themeLoader[`${themeExtensionPoint.extension}:${themeExtensionPoint.path.slice(1)}`]!())
+})), async (themeExtensionPoint) => themeExtensionPoint.load())
+
+let themes: VSCodeTheme[] = []
+function updateThemes () {
+  setThemes(themes, async (themeExtensionPoint) => themeExtensionPoint.load())
 }
+updateThemes()
 
-for (const themeExtensionPoint of (defaultThemes as VSCodeTheme[])) {
-  if (VSCODE_THEME_BLACKLIST.has(themeExtensionPoint.id)) {
-    continue
+function defineVSCodeTheme (id: string, load: () => Promise<string>): Disposable {
+  const theme: VSCodeTheme = {
+    id,
+    path: `/${id}.json`,
+    load,
+    _watch: false
   }
-  const loader = async (uri?: monaco.Uri): Promise<IVSCodeTheme> => {
-    return themeLoader[`${themeExtensionPoint.extension}:${uri?.path ?? themeExtensionPoint.path.slice(1)}`]!()
+  themes = [
+    ...themes,
+    theme
+  ]
+  updateThemes()
+  return {
+    dispose () {
+      themes = themes.filter(_theme => _theme !== theme)
+      updateThemes()
+    }
   }
-
-  const monacoThemeId = DEFAULT_VSCODE_THEMES[themeExtensionPoint.id] ?? generateMonacoThemeId(themeExtensionPoint.id)
-  defineVSCodeTheme(monacoThemeId, loader, themeExtensionPoint, {
-    extensionName: themeExtensionPoint.extension,
-    extensionIsBuiltin: true
-  }).catch((error: Error) => {
-    monaco.errorHandler.onUnexpectedError(new Error(`Unable to define "${themeExtensionPoint.id}" vscode theme`, {
-      cause: error
-    }))
-  })
 }
 
 export {