Merge pull request #57 from CodinGame/do-not-use-custom-monaco

Update to monaco 0.34

Author: CGNonofr

README.md

@@ -66,9 +66,7 @@ To enable them, import the following files:
 ##### Highlighting/theme
 
 This library uses VS Code themes instead of Monaco theme.
-To add your custom theme, use the `addVSCodeTheme` method.
-
-:warning: this method returns a promise, you need to wait for it before calling `monaco.editor.setTheme`.
+To add your custom theme, use the `defineVSCodeTheme` method.
 
 Default Monaco theme shouldn't be used.
 

package-lock.json

@@ -4,7 +4,8 @@
   "private": false,
   "description": "Enhanced Monaco editor with TextMate grammars and more",
   "scripts": {
-    "build": "npm run lint && rollup --config rollup.config.ts --configPlugin typescript && npm run generate-types",
+    "build": "npm run lint && npm run compile && npm run generate-types",
+    "compile": "rollup --config rollup.config.ts --configPlugin typescript",
     "generate-types": "tsc --project tsconfig.types.json",
     "update-extensions": "node --loader ts-node/esm update-extensions.ts",
     "lint": "eslint --ext .ts src update-extensions.ts"
@@ -65,36 +66,36 @@
     "stats.html"
   ],
   "dependencies": {
-    "monaco-editor": "npm:@codingame/monaco-editor@^0.33.6",
-    "vscode": "npm:@codingame/monaco-vscode-api@~1.67.19",
+    "monaco-editor": "npm:@codingame/monaco-editor@^0.34.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@~1.69.2",
     "vscode-oniguruma": "^1.6.2"
   },
   "devDependencies": {
-    "@babel/core": "7.18.5",
-    "@babel/plugin-proposal-class-properties": "7.17.12",
-    "@babel/plugin-proposal-optional-chaining": "7.17.12",
-    "@babel/preset-env": "7.18.2",
-    "@babel/preset-typescript": "7.17.12",
-    "@babel/runtime": "7.18.3",
-    "@codingame/eslint-config": "^1.1.2",
-    "@codingame/tsconfig": "^1.0.5",
+    "@babel/core": "7.18.10",
+    "@babel/plugin-proposal-class-properties": "7.18.6",
+    "@babel/plugin-proposal-optional-chaining": "7.18.9",
+    "@babel/preset-env": "7.18.10",
+    "@babel/preset-typescript": "7.18.6",
+    "@babel/runtime": "7.18.9",
+    "@codingame/eslint-config": "^1.1.6",
+    "@codingame/tsconfig": "^1.1.0",
     "@rollup/plugin-alias": "3.1.9",
     "@rollup/plugin-babel": "5.3.1",
-    "@rollup/plugin-commonjs": "22.0.0",
+    "@rollup/plugin-commonjs": "22.0.2",
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "13.3.0",
-    "@rollup/plugin-typescript": "^8.3.3",
+    "@rollup/plugin-typescript": "^8.3.4",
     "@types/ini": "1.3.31",
     "@types/js-yaml": "^4.0.5",
     "@types/node": "16.11.7",
     "@types/rollup-plugin-node-builtins": "^2.1.2",
-    "@types/vscode": "~1.67.0",
-    "@typescript-eslint/eslint-plugin": "5.27.1",
-    "@typescript-eslint/parser": "5.27.1",
-    "conventional-changelog-conventionalcommits": "^4.6.3",
+    "@types/vscode": "~1.69.1",
+    "@typescript-eslint/eslint-plugin": "5.33.1",
+    "@typescript-eslint/parser": "5.33.1",
+    "conventional-changelog-conventionalcommits": "^5.0.0",
     "cson-parser": "4.0.9",
     "deep-equal": "2.0.5",
-    "eslint": "8.17.0",
+    "eslint": "8.22.0",
     "eslint-config-standard": "17.0.0",
     "eslint-plugin-import": "2.26.0",
     "eslint-plugin-node": "11.1.0",
@@ -106,18 +107,18 @@
     "json5": "2.2.1",
     "monaco-emacs": "^0.3.0",
     "monaco-vim": "^0.3.4",
-    "postcss": "8.4.14",
-    "rollup": "2.75.6",
+    "postcss": "8.4.16",
+    "rollup": "2.78.0",
     "rollup-plugin-json5": "1.0.0",
     "rollup-plugin-node-builtins": "^2.1.2",
     "rollup-plugin-string": "^3.0.0",
     "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-visualizer": "5.6.0",
+    "rollup-plugin-visualizer": "5.7.1",
     "rollup-plugin-web-worker-loader": "1.6.1",
-    "ts-node": "10.8.1",
+    "ts-node": "10.9.1",
     "tslib": "^2.4.0",
-    "typescript": "4.7.3",
-    "vscode-textmate": "^6.0.0"
+    "typescript": "4.7.4",
+    "vscode-textmate": "^7.0.1"
   },
   "browserslist": [
     "defaults",

package.json

@@ -1,5 +1,4 @@
-import * as monaco from 'monaco-editor'
-const configurationRegistry = monaco.extra.Registry.as<monaco.extra.IConfigurationRegistry>(monaco.extra.ConfigurationExtensions.Configuration)
+import { configurationRegistry, ConfigurationScope } from 'vscode/service-override/configuration'
 
 /**
  * comes from https://github.com/microsoft/vscode/blob/16d0a319b28caa4b6cf4e6801fd508282b7533e0/src/vs/workbench/contrib/files/browser/files.contribution.ts#L132
@@ -8,7 +7,6 @@ const configurationRegistry = monaco.extra.Registry.as<monaco.extra.IConfigurati
 export const FILES_EXCLUDE_CONFIG = 'files.exclude'
 export const FILES_ASSOCIATIONS_CONFIG = 'files.associations'
 const isWeb = true
-const ConfigurationScope = monaco.extra.ConfigurationScope
 const nls = {
   localize: (key: string, defaultValue: string) => defaultValue
 }

src/configuration/files.ts

@@ -1,18 +1,33 @@
 import * as monaco from 'monaco-editor'
-import { IConfigurationChangeEvent, IConfigurationService } from 'vscode/services'
+import { StandaloneServices, IConfigurationChangeEvent, IConfigurationService } from 'vscode/services'
 import * as vscode from 'vscode'
-import { updateUserConfiguration } from 'vscode/service-override/configuration'
+import { configurationRegistry, updateUserConfiguration, IConfigurationNode, IConfigurationDefaults } from 'vscode/service-override/configuration'
 import extensions from '../languages/extensions/extensions.json'
 import './files'
 
-const configurationRegistry = monaco.extra.Registry.as<monaco.extra.IConfigurationRegistry>(monaco.extra.ConfigurationExtensions.Configuration)
 configurationRegistry.registerDefaultConfigurations([{
   overrides: {
     'editor.codeLens': false,
     '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'
+        }
+      }
+    }
   }
 }])
 
@@ -21,23 +36,23 @@ configurationRegistry.registerDefaultConfigurations([{
 }])
 
 export function onConfigurationChanged (listener: (e: IConfigurationChangeEvent) => void): vscode.Disposable {
-  const configurationService = monaco.extra.StandaloneServices.get(IConfigurationService)
+  const configurationService = StandaloneServices.get(IConfigurationService)
   return configurationService.onDidChangeConfiguration(listener)
 }
 
 export function getConfiguration<C = Partial<monaco.editor.IEditorOptions>> (language?: string, section: string = 'editor'): C | undefined {
-  const configurationService = monaco.extra.StandaloneServices.get(IConfigurationService)
+  const configurationService = StandaloneServices.get(IConfigurationService)
   return configurationService.getValue(section, { overrideIdentifier: language })
 }
 
 export {
   updateUserConfiguration
 }
 
-export function registerConfigurations (configurations: monaco.extra.IConfigurationNode[], validate?: boolean): void {
+export function registerConfigurations (configurations: IConfigurationNode[], validate?: boolean): void {
   configurationRegistry.registerConfigurations(configurations, validate)
 }
 
-export function registerDefaultConfigurations (defaultConfigurations: monaco.extra.IStringDictionary<unknown>[]): void {
+export function registerDefaultConfigurations (defaultConfigurations: IConfigurationDefaults['overrides'][]): void {
   configurationRegistry.registerDefaultConfigurations(defaultConfigurations.map(overrides => ({ overrides })))
 }

src/configuration/index.ts

@@ -1,20 +1,21 @@
 import * as monaco from 'monaco-editor'
+import { FoldingController, setCollapseStateForMatchingLines } from 'vscode/monaco'
 
 export default function setup (editor: monaco.editor.IStandaloneCodeEditor): void {
   editor.addAction({
     id: 'editor.foldAllAutofoldRegions',
     label: 'Fold all autofold regions',
     run: async (editor: monaco.editor.ICodeEditor) => {
-      const foldingController = monaco.extra.FoldingController.get(editor)
-      const foldingModelPromise: Promise<monaco.extra.FoldingModel> | null = foldingController?.getFoldingModel()
+      const foldingController = FoldingController.get(editor)
+      const foldingModelPromise = foldingController?.getFoldingModel()
       if (foldingModelPromise != null) {
         return foldingModelPromise.then(foldingModel => {
           const editorModel = editor.getModel()
-          if (editorModel == null) {
+          if (editorModel == null || foldingModel == null) {
             return
           }
           const regExp = /.*autofold.*/
-          monaco.extra.setCollapseStateForMatchingLines(foldingModel, regExp, true)
+          setCollapseStateForMatchingLines(foldingModel, regExp, true)
         })
       }
     }

src/extensions/autofold.ts

@@ -1,8 +1,6 @@
-import * as monaco from 'monaco-editor'
+import { configurationRegistry } from 'vscode/service-override/configuration'
 import extensionConfigurationLoader from '../languages/extensions/extensionConfigurationLoader'
 
-const configurationRegistry = monaco.extra.Registry.as<monaco.extra.IConfigurationRegistry>(monaco.extra.ConfigurationExtensions.Configuration)
-
 export async function loadConfigurationForExtension (extensionId: string): Promise<void> {
   const loader = extensionConfigurationLoader[extensionId]
   if (loader == null) {

src/features/extensionConfigurations.ts

@@ -1,7 +1,10 @@
 import * as monaco from 'monaco-editor'
 import 'monaco-editor/esm/vs/language/html/monaco.contribution'
-import { getConfiguration, onConfigurationChanged, registerConfigurations } from '../configuration'
+import { ConfigurationScope } from 'vscode/service-override/configuration'
+import { DisposableStore } from 'vscode/monaco'
+import { StandaloneServices, ICodeEditorService } from 'vscode/services'
 import { registerWorkerLoader } from '../worker'
+import { getConfiguration, onConfigurationChanged, registerConfigurations } from '../configuration'
 
 const workerLoader = async () => (await import(/* webpackChunkName: "MonacoHtmlWorker" */'monaco-editor/esm/vs/language/html/html.worker?worker')).default
 registerWorkerLoader('html', workerLoader)
@@ -21,7 +24,7 @@ registerConfigurations([{
   properties: {
     'html.autoClosingTags': {
       type: 'boolean',
-      scope: monaco.extra.ConfigurationScope.RESOURCE,
+      scope: ConfigurationScope.RESOURCE,
       default: true,
       description: 'Enable/disable autoclosing of HTML tags.'
     }
@@ -41,7 +44,7 @@ setTimeout(() => {
 })
 
 function autoCloseHtmlTags (editor: monaco.editor.ICodeEditor): monaco.IDisposable {
-  const disposableStore = new monaco.DisposableStore()
+  const disposableStore = new DisposableStore()
 
   let timeout: number | undefined
   disposableStore.add({
@@ -107,7 +110,7 @@ function autoCloseHtmlTags (editor: monaco.editor.ICodeEditor): monaco.IDisposab
 
 setTimeout(() => {
   // In a timeout so the service can be overriden
-  const codeEditors = monaco.extra.StandaloneServices.get(monaco.extra.ICodeEditorService).listCodeEditors()
+  const codeEditors = StandaloneServices.get(ICodeEditorService).listCodeEditors()
   for (const editor of codeEditors) {
     autoCloseHtmlTags(editor)
   }

src/features/htmlContribution.ts

@@ -1,80 +1,21 @@
 import 'monaco-editor/esm/vs/language/json/monaco.contribution'
 import * as monaco from 'monaco-editor'
+import { getJsonSchemas, onDidChangeJsonSchema } from 'vscode/monaco'
 import { registerWorkerLoader } from '../worker'
 
-const registry = monaco.extra.Registry.as<monaco.extra.IJSONContributionRegistry>(monaco.extra.JsonContributionExtensions.JSONContribution)
-
-// Hack because the commands are filled by a code not run in monaco-editor
-{
-  const allCommands = monaco.extra.CommandsRegistry.getCommands()
-  const keybindingsCommandSchema = (registry.getSchemaContributions().schemas['vscode://schemas/keybindings']!.items as monaco.extra.IJSONSchema).properties!.command!.anyOf![0]!
-  keybindingsCommandSchema.enum = Array.from(allCommands.keys())
-  keybindingsCommandSchema.enumDescriptions = <string[]>Array.from(allCommands.values()).map(command => command.description?.description)
-}
-
-const vimKeybindingsSchema = {
-  type: 'object',
-  properties: {
-    before: {
-      type: 'array',
-      items: {
-        type: 'string'
-      }
-    },
-    after: {
-      type: 'array',
-      items: {
-        type: 'string'
-      }
-    }
-  }
-}
-
 function updateDiagnosticsOptions () {
   monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
     comments: 'ignore',
     validate: true,
-    schemas: [{
-      uri: 'vscode://schemas/settings/resourceLanguage',
-      schema: registry.getSchemaContributions().schemas['vscode://schemas/settings/resourceLanguage']
-    }, {
-      uri: 'vscode://schemas/keybindings',
-      fileMatch: ['file:///keybindings.json'],
-      schema: registry.getSchemaContributions().schemas['vscode://schemas/keybindings']
-    },
-    {
-      uri: 'vscode://schemas/settings/user',
-      fileMatch: ['file:///settings.json'],
-      schema: {
-        properties: {
-          ...monaco.extra.allSettings.properties,
-          'vim.normalModeKeyBindings': {
-            type: 'array',
-            description: 'Remapped keys in Normal mode.',
-            items: vimKeybindingsSchema
-          },
-          'vim.insertModeKeyBindings': {
-            type: 'array',
-            description: 'Remapped keys in Insert mode.',
-            items: vimKeybindingsSchema
-          },
-          'vim.visualModeKeyBindings': {
-            type: 'array',
-            description: 'Remapped keys in Visual mode.',
-            items: vimKeybindingsSchema
-          }
-        },
-        patternProperties: monaco.extra.allSettings.patternProperties,
-        additionalProperties: true,
-        allowTrailingCommas: true,
-        allowComments: true
-      }
-    }]
+    schemas: getJsonSchemas({
+      keybindings: ['file:///keybindings.json'],
+      'settings/user': ['file:///settings.json']
+    })
   })
 }
 
 updateDiagnosticsOptions()
-registry.onDidChangeSchema(updateDiagnosticsOptions)
+onDidChangeJsonSchema(updateDiagnosticsOptions)
 
 const workerLoader = async () => (await import(/* webpackChunkName: "MonacoJsonWorker" */'monaco-editor/esm/vs/language/json/json.worker?worker')).default
 registerWorkerLoader('json', workerLoader)

src/features/jsonContribution.ts

@@ -47,42 +47,6 @@ monaco.languages.typescript.javascriptDefaults.addExtraLib(typescriptGlobal, 'no
 monaco.languages.typescript.javascriptDefaults.addExtraLib(typescriptConsole, 'node/console.d.ts')
 monaco.languages.typescript.javascriptDefaults.addExtraLib(typescriptProcess, 'node/process.d.ts')
 
-const reactCompilerOptions: Parameters<typeof monaco.languages.typescript.typescriptDefaults.setCompilerOptions>[0] = {
-  ...compilerOptions,
-  jsx: monaco.languages.typescript.JsxEmit.React,
-  esModuleInterop: true
-}
-
-const typescriptReactDefaults = new monaco.languages.typescript.LanguageServiceDefaultsImpl(
-  reactCompilerOptions,
-  { noSemanticValidation: false, noSyntaxValidation: false, onlyVisible: false },
-  {},
-  {}
-)
-
-const javascriptReactDefaults = new monaco.languages.typescript.LanguageServiceDefaultsImpl(
-  reactCompilerOptions,
-  { noSemanticValidation: true, noSyntaxValidation: false, onlyVisible: false },
-  {},
-  {}
-)
-
 const workerLoader = async () => (await import(/* webpackChunkName: "MonacoTypescriptWorker" */'monaco-editor/esm/vs/language/typescript/ts.worker?worker')).default
 registerWorkerLoader('typescript', workerLoader)
 registerWorkerLoader('javascript', workerLoader)
-
-// Add support for typescriptreact/javascriptreact which don't come out of the box
-registerWorkerLoader('typescriptreact', workerLoader)
-registerWorkerLoader('javascriptreact', workerLoader)
-
-monaco.languages.onLanguage('typescriptreact', () => {
-  void monaco.languages.typescript.setupMode(typescriptReactDefaults, 'typescriptreact')
-})
-monaco.languages.onLanguage('javascriptreact', () => {
-  void monaco.languages.typescript.setupMode(javascriptReactDefaults, 'javascriptreact')
-})
-
-export {
-  typescriptReactDefaults,
-  javascriptReactDefaults
-}