Merge pull request #51 from CodinGame/update-vscode-api

Update vscode api

Author: CGNonofr

package-lock.json

@@ -66,7 +66,7 @@
   ],
   "dependencies": {
     "monaco-editor": "npm:@codingame/monaco-editor@^0.33.6",
-    "vscode": "npm:@codingame/monaco-vscode-api@~1.67.9",
+    "vscode": "npm:@codingame/monaco-vscode-api@~1.67.19",
     "vscode-oniguruma": "^1.6.2"
   },
   "devDependencies": {
@@ -88,6 +88,7 @@
     "@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",

package.json

@@ -1,4 +1,7 @@
 import * as monaco from 'monaco-editor'
+import { IConfigurationChangeEvent, IConfigurationService } from 'vscode/services'
+import * as vscode from 'vscode'
+import { updateUserConfiguration } from 'vscode/service-override/configuration'
 import extensions from '../languages/extensions/extensions.json'
 
 const configurationRegistry = monaco.extra.Registry.as<monaco.extra.IConfigurationRegistry>(monaco.extra.ConfigurationExtensions.Configuration)
@@ -7,24 +10,27 @@ configurationRegistry.registerDefaultConfigurations([{
     'editor.codeLens': false,
     'editor.fontSize': 12,
     'editor.maxTokenizationLineLength': 1000,
-    'editor.quickSuggestions': false
+    'editor.quickSuggestions': false,
+    'files.eol': '\n'
   }
 }])
 
 configurationRegistry.registerDefaultConfigurations([{
   overrides: extensions.configurationDefaults
 }])
 
-const simpleConfigurationService = monaco.extra.StandaloneServices.get(monaco.extra.IConfigurationService) as monaco.extra.StandaloneConfigurationService
-
-export const onConfigurationChanged = simpleConfigurationService.onDidChangeConfiguration
+export function onConfigurationChanged (listener: (e: IConfigurationChangeEvent) => void): vscode.Disposable {
+  const configurationService = monaco.extra.StandaloneServices.get(IConfigurationService)
+  return configurationService.onDidChangeConfiguration(listener)
+}
 
 export function getConfiguration<C = Partial<monaco.editor.IEditorOptions>> (language?: string, section: string = 'editor'): C | undefined {
-  return simpleConfigurationService.getValue(section, { overrideIdentifier: language })
+  const configurationService = monaco.extra.StandaloneServices.get(IConfigurationService)
+  return configurationService.getValue(section, { overrideIdentifier: language })
 }
 
-export function updateUserConfiguration (configurationJson: string): void {
-  simpleConfigurationService.updateUserConfiguration(configurationJson)
+export {
+  updateUserConfiguration
 }
 
 export function registerConfigurations (configurations: monaco.extra.IConfigurationNode[], validate?: boolean): void {

src/configuration/index.ts

@@ -28,11 +28,16 @@ registerConfigurations([{
   }
 }])
 
-let autoClosingTags = getConfiguration<boolean>(undefined, 'html.autoClosingTags')!
-onConfigurationChanged(e => {
-  if (e.affectsConfiguration('html.autoClosingTags')) {
-    autoClosingTags = getConfiguration<boolean>(undefined, 'html.autoClosingTags')!
-  }
+let autoClosingTags = false
+
+setTimeout(() => {
+  // In a timeout so the service can be overriden
+  autoClosingTags = getConfiguration<boolean>(undefined, 'html.autoClosingTags')!
+  onConfigurationChanged(e => {
+    if (e.affectsConfiguration('html.autoClosingTags')) {
+      autoClosingTags = getConfiguration<boolean>(undefined, 'html.autoClosingTags')!
+    }
+  })
 })
 
 function autoCloseHtmlTags (editor: monaco.editor.ICodeEditor): monaco.IDisposable {
@@ -100,13 +105,17 @@ function autoCloseHtmlTags (editor: monaco.editor.ICodeEditor): monaco.IDisposab
   return disposableStore
 }
 
-const codeEditors = monaco.extra.StandaloneServices.get(monaco.extra.ICodeEditorService).listCodeEditors()
-for (const editor of codeEditors) {
-  autoCloseHtmlTags(editor)
-}
-monaco.editor.onDidCreateEditor(editor => {
-  autoCloseHtmlTags(editor)
+setTimeout(() => {
+  // In a timeout so the service can be overriden
+  const codeEditors = monaco.extra.StandaloneServices.get(monaco.extra.ICodeEditorService).listCodeEditors()
+  for (const editor of codeEditors) {
+    autoCloseHtmlTags(editor)
+  }
+  monaco.editor.onDidCreateEditor(editor => {
+    autoCloseHtmlTags(editor)
+  })
 })
+
 /**
  * End autoclosing html tags
  */

src/features/htmlContribution.ts

@@ -1,7 +1,6 @@
 import * as monaco from 'monaco-editor'
 
-const keybindingService = monaco.extra.StandaloneServices.get(monaco.extra.IKeybindingService) as monaco.extra.StandaloneKeybindingService
-
 export function updateKeybindings (bindings: monaco.extra.IUserFriendlyKeybinding[]): void {
+  const keybindingService = monaco.extra.StandaloneServices.get(monaco.extra.IKeybindingService) as monaco.extra.StandaloneKeybindingService
   keybindingService.setUserKeybindings(bindings)
 }

src/keybindings/keybindingHelper.ts

@@ -26,7 +26,6 @@ for (const [languageId, aliases] of Object.entries(customAliases)) {
   })
 }
 
-const languageService = monaco.extra.StandaloneServices.get(monaco.languages.ILanguageService)
 const languagesIds = Array.from(new Set([
   ...Object.keys(monarchLanguageLoader),
   ...textMateLanguages.map(rawLanguage => rawLanguage.id)
@@ -91,19 +90,24 @@ async function loadLanguageConfiguration (languageId: string) {
   }
 }
 
-languageService.onDidEncounterLanguage(async (languageId) => {
-  if (languageId === 'plaintext') {
-    return
-  }
+setTimeout(() => {
+  // In a timeout so the service can be overriden
+  const languageService = monaco.extra.StandaloneServices.get(monaco.languages.ILanguageService)
+  languageService.onDidEncounterLanguage(async (languageId) => {
+    if (languageId === 'plaintext') {
+      return
+    }
 
-  loadLanguageConfiguration(languageId).catch(error => {
-    monaco.errorHandler.onUnexpectedError(new Error(`Unable to load language configuration for language ${languageId}`, {
-      cause: error
-    }))
+    loadLanguageConfiguration(languageId).catch(error => {
+      monaco.errorHandler.onUnexpectedError(new Error(`Unable to load language configuration for language ${languageId}`, {
+        cause: error
+      }))
+    })
   })
 })
 
 function getMonacoLanguage (languageOrModeId: string): string {
+  const languageService = monaco.extra.StandaloneServices.get(monaco.languages.ILanguageService)
   const modeId = languageService.getLanguageIdByLanguageName(languageOrModeId.toLowerCase())
   if (modeId != null) {
     return modeId

src/languages/index.ts

@@ -37,6 +37,9 @@ class SimpleSnippetService implements monaco.extra.ISnippetsService {
   }
 }
 
-const languageService = monaco.extra.StandaloneServices.get(monaco.languages.ILanguageService)
-const languageConfigurationService = monaco.extra.StandaloneServices.get(monaco.languages.ILanguageConfigurationService)
-monaco.extra.setSnippetSuggestSupport(new monaco.extra.SnippetCompletionProvider(languageService, new SimpleSnippetService(), languageConfigurationService))
+setTimeout(() => {
+  // In a timeout so the service can be overriden
+  const languageService = monaco.extra.StandaloneServices.get(monaco.languages.ILanguageService)
+  const languageConfigurationService = monaco.extra.StandaloneServices.get(monaco.languages.ILanguageConfigurationService)
+  monaco.extra.setSnippetSuggestSupport(new monaco.extra.SnippetCompletionProvider(languageService, new SimpleSnippetService(), languageConfigurationService))
+})

src/languages/snippets/index.ts

@@ -32,8 +32,8 @@ function getOrCreateGrammarFactory (): CGTMGrammarFactory {
   return textMateGrammarFactory
 }
 
-const languageService = monaco.extra.StandaloneServices.get(monaco.languages.ILanguageService)
 async function createTextMateTokensProvider (languageId: string): Promise<monaco.languages.ITokenizationSupport | null> {
+  const languageService = monaco.extra.StandaloneServices.get(monaco.languages.ILanguageService)
   const grammarFactory = getOrCreateGrammarFactory()
   const encodedLanguageId = languageService.languageIdCodec.encodeLanguageId(languageId)
   if (!grammarFactory.has(languageId)) {

src/languages/textMate/index.ts

@@ -3,7 +3,9 @@ import './languages'
 import './theme'
 import getModelEditorServiceOverride from 'vscode/service-override/modelEditor'
 import getMessageServiceOverride from 'vscode/service-override/messages'
+import getConfigurationServiceOverride from 'vscode/service-override/configuration'
 import './worker'
+import { createConfiguredEditor } from 'vscode/monaco'
 import setupExtensions from './extensions'
 import 'monaco-editor/esm/vs/editor/editor.all'
 import 'monaco-editor/esm/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp'
@@ -22,25 +24,21 @@ monaco.extra.StandaloneServices.initialize({
   ...getModelEditorServiceOverride((model, input, sideBySide) => {
     return editorOpenHandlerRegistry.openCodeEditor(model, input, sideBySide)
   }),
-  ...getMessageServiceOverride(document.body)
+  ...getMessageServiceOverride(document.body),
+  ...getConfigurationServiceOverride()
 })
 // Disable high contrast autodetection because it fallbacks on the hc-black no matter what
-monaco.extra.StandaloneServices.get(monaco.editor.IStandaloneThemeService).setAutoDetectHighContrast(false)
-
-// Force EOL to be '\n' even on Windows
-const configurationService = monaco.extra.StandaloneServices.get(monaco.extra.IConfigurationService)
-configurationService.updateValue('files.eol', '\n').catch((error: Error) => {
-  monaco.errorHandler.onUnexpectedError(new Error('Unable to set file eol', {
-    cause: error
-  }))
+setTimeout(() => {
+  // In a timeout so the service can be overriden
+  monaco.extra.StandaloneServices.get(monaco.editor.IStandaloneThemeService).setAutoDetectHighContrast(false)
 })
 
 monaco.errorHandler.setUnexpectedErrorHandler(error => {
   console.warn('Unexpected error', error)
 })
 
 function createEditor (domElement: HTMLElement, options?: monaco.editor.IStandaloneEditorConstructionOptions): monaco.editor.IStandaloneCodeEditor {
-  const editor = monaco.editor.create(domElement, options)
+  const editor = createConfiguredEditor(domElement, options)
 
   setupExtensions(editor)