Skip to content

Commit 41a6aeb

Browse files
committed
refactor: Use new configuration service override
1 parent d35e9b2 commit 41a6aeb

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

src/configuration/index.ts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
import * as monaco from 'monaco-editor'
2+
import { IConfigurationChangeEvent, IConfigurationService } from 'vscode/services'
3+
import * as vscode from 'vscode'
4+
import { updateUserConfiguration } from 'vscode/service-override/configuration'
25
import extensions from '../languages/extensions/extensions.json'
36

47
const configurationRegistry = monaco.extra.Registry.as<monaco.extra.IConfigurationRegistry>(monaco.extra.ConfigurationExtensions.Configuration)
@@ -16,19 +19,18 @@ configurationRegistry.registerDefaultConfigurations([{
1619
overrides: extensions.configurationDefaults
1720
}])
1821

19-
export function onConfigurationChanged (listener: (e: monaco.extra.IConfigurationChangeEvent) => void): monaco.IDisposable {
20-
const simpleConfigurationService = monaco.extra.StandaloneServices.get(monaco.extra.IConfigurationService) as monaco.extra.StandaloneConfigurationService
21-
return simpleConfigurationService.onDidChangeConfiguration(listener)
22+
export function onConfigurationChanged (listener: (e: IConfigurationChangeEvent) => void): vscode.Disposable {
23+
const configurationService = monaco.extra.StandaloneServices.get(IConfigurationService)
24+
return configurationService.onDidChangeConfiguration(listener)
2225
}
2326

2427
export function getConfiguration<C = Partial<monaco.editor.IEditorOptions>> (language?: string, section: string = 'editor'): C | undefined {
25-
const simpleConfigurationService = monaco.extra.StandaloneServices.get(monaco.extra.IConfigurationService) as monaco.extra.StandaloneConfigurationService
26-
return simpleConfigurationService.getValue(section, { overrideIdentifier: language })
28+
const configurationService = monaco.extra.StandaloneServices.get(IConfigurationService)
29+
return configurationService.getValue(section, { overrideIdentifier: language })
2730
}
2831

29-
export function updateUserConfiguration (configurationJson: string): void {
30-
const simpleConfigurationService = monaco.extra.StandaloneServices.get(monaco.extra.IConfigurationService) as monaco.extra.StandaloneConfigurationService
31-
simpleConfigurationService.updateUserConfiguration(configurationJson)
32+
export {
33+
updateUserConfiguration
3234
}
3335

3436
export function registerConfigurations (configurations: monaco.extra.IConfigurationNode[], validate?: boolean): void {

src/monaco.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import './languages'
33
import './theme'
44
import getModelEditorServiceOverride from 'vscode/service-override/modelEditor'
55
import getMessageServiceOverride from 'vscode/service-override/messages'
6+
import getConfigurationServiceOverride from 'vscode/service-override/configuration'
67
import './worker'
78
import setupExtensions from './extensions'
89
import 'monaco-editor/esm/vs/editor/editor.all'
@@ -22,7 +23,8 @@ monaco.extra.StandaloneServices.initialize({
2223
...getModelEditorServiceOverride((model, input, sideBySide) => {
2324
return editorOpenHandlerRegistry.openCodeEditor(model, input, sideBySide)
2425
}),
25-
...getMessageServiceOverride(document.body)
26+
...getMessageServiceOverride(document.body),
27+
...getConfigurationServiceOverride()
2628
})
2729
// Disable high contrast autodetection because it fallbacks on the hc-black no matter what
2830
setTimeout(() => {

0 commit comments

Comments
 (0)