fix: update imports

Author: CGNonofr

src/configuration/files.ts

@@ -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/index.ts

@@ -1,11 +1,10 @@
 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,
@@ -21,23 +20,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/extensions/autofold.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/features/extensionConfigurations.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/htmlContribution.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/languages/extensions/extensionConfigurationLoader.ts

@@ -1,6 +1,6 @@
 
 // Generated file, do not modify
-import * as monaco from 'monaco-editor'
+import type { IConfigurationNode } from 'vscode/service-override/configuration'
 
 /* eslint-disable */
 const loader = {
@@ -28,7 +28,7 @@ const loader = {
   'solidity': async () => (await import(/* webpackChunkName: "configuration-registration-solidity" */ /* webpackMode: "lazy" */ './configurations/solidity.json')).default,
   'vetur': async () => (await import(/* webpackChunkName: "configuration-registration-vetur" */ /* webpackMode: "lazy" */ './configurations/vetur.json')).default,
   'svelte.svelte-vscode': async () => (await import(/* webpackChunkName: "configuration-registration-svelte.svelte-vscode" */ /* webpackMode: "lazy" */ './configurations/svelte.svelte-vscode.json')).default
-} as unknown as Partial<Record<string, () => Promise<monaco.extra.IConfigurationNode[]>>>
+} as unknown as Partial<Record<string, () => Promise<IConfigurationNode[]>>>
 
 export default loader
 

src/languages/extensions/languageConfigurationLoader.ts

@@ -1,15 +1,5 @@
 
 // Generated file, do not modify
-import * as monaco from 'monaco-editor'
-
-export interface RawLanguageConfiguration extends Omit<monaco.extra.ILanguageConfiguration, 'folding'> {
-  folding?: Omit<monaco.extra.ILanguageConfiguration['folding'], 'markers'> & {
-    markers?: {
-      start: string
-      end: string
-    }
-  }
-}
 
 /* eslint-disable */
 const loader = {
@@ -102,7 +92,7 @@ const loader = {
   'vue-postcss': async () => (await import(/* webpackChunkName: "language-configuration-vue-postcss" */ /* webpackMode: "lazy" */ './languageConfigurations/vue-postcss.json')).default,
   'vue-sugarss': async () => (await import(/* webpackChunkName: "language-configuration-vue-sugarss" */ /* webpackMode: "lazy" */ './languageConfigurations/vue-sugarss.json')).default,
   'svelte': async () => (await import(/* webpackChunkName: "language-configuration-svelte" */ /* webpackMode: "lazy" */ './languageConfigurations/svelte.json')).default
-} as unknown as Partial<Record<string, () => Promise<RawLanguageConfiguration>>>
+} as unknown as Partial<Record<string, () => Promise<unknown>>>
 
 export default loader
 

src/languages/extensions/snippetLoader.ts

@@ -1,6 +1,5 @@
 
 // Generated file, do not modify
-import * as monaco from 'monaco-editor'
 
 /* eslint-disable */
 const loader = {
@@ -39,7 +38,7 @@ const loader = {
   'rmd': async () => (await import(/* webpackChunkName: "snippet-rmd" */ /* webpackMode: "lazy" */ './snippets/vscode-R-rmarkdown.json')).default,
   'solidity': async () => (await import(/* webpackChunkName: "snippet-solidity" */ /* webpackMode: "lazy" */ './snippets/solidity-solidity.json')).default,
   'svelte': async () => (await import(/* webpackChunkName: "snippet-svelte" */ /* webpackMode: "lazy" */ './snippets/svelte.svelte-vscode-svelte.json')).default
-} as unknown as Partial<Record<string, () => Promise<Record<string, monaco.extra.JsonSerializedSnippet>>>>
+} as unknown as Partial<Record<string, () => Promise<Record<string, unknown>>>>
 
 export default loader
 

src/languages/extensions/themeLoader.ts

@@ -1,6 +1,5 @@
 
 // Generated file, do not modify
-import { IVSCodeTheme } from '../../theme/tools'
 
 /* eslint-disable */
 const loader = {
@@ -10,7 +9,7 @@ const loader = {
   'theme-defaults:/themes/light_vs.json': async () => (await import(/* webpackChunkName: "theme-theme-defaults:/themes/light_vs.json" */ /* webpackMode: "eager" */ './themes/theme-defaults~light_vs.json')).default,
   'theme-defaults:/themes/hc_black.json': async () => (await import(/* webpackChunkName: "theme-theme-defaults:/themes/hc_black.json" */ /* webpackMode: "eager" */ './themes/theme-defaults~hc_black.json')).default,
   'theme-defaults:/themes/hc_light.json': async () => (await import(/* webpackChunkName: "theme-theme-defaults:/themes/hc_light.json" */ /* webpackMode: "eager" */ './themes/theme-defaults~hc_light.json')).default
-} as Partial<Record<string, () => Promise<IVSCodeTheme>>>
+} as Partial<Record<string, () => Promise<unknown>>>
 
 export default loader
 

src/monaco.ts

@@ -5,7 +5,7 @@ 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 { createConfiguredEditor, errorHandler } 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'
@@ -20,7 +20,7 @@ import EditorOpenHandlerRegistry, { EditorOpenHandler } from './tools/EditorOpen
 
 const editorOpenHandlerRegistry = new EditorOpenHandlerRegistry()
 
-monaco.extra.StandaloneServices.initialize({
+StandaloneServices.initialize({
   ...getModelEditorServiceOverride((model, input, sideBySide) => {
     return editorOpenHandlerRegistry.openCodeEditor(model, input, sideBySide)
   }),
@@ -33,7 +33,7 @@ setTimeout(() => {
   monaco.extra.StandaloneServices.get(monaco.editor.IStandaloneThemeService).setAutoDetectHighContrast(false)
 })
 
-monaco.errorHandler.setUnexpectedErrorHandler(error => {
+errorHandler.setUnexpectedErrorHandler(error => {
   console.warn('Unexpected error', error)
 })
 
@@ -45,8 +45,8 @@ function createEditor (domElement: HTMLElement, options?: monaco.editor.IStandal
   return editor
 }
 
-function registerTextModelContentProvider (scheme: string, provider: monaco.extra.ITextModelContentProvider): monaco.IDisposable {
-  const textModelService = monaco.extra.StandaloneServices.get(monaco.extra.ITextModelService)
+function registerTextModelContentProvider (scheme: string, provider: ITextModelContentProvider): monaco.IDisposable {
+  const textModelService = StandaloneServices.get(ITextModelService)
   return textModelService.registerTextModelContentProvider(scheme, provider)
 }