@theia/monaco 1.77.0-next.95 → 1.77.0

package/src/browser/monaco-formatting-conflicts.ts

@@ -17,13 +17,13 @@
 import { injectable, inject } from '@theia/core/shared/inversify';
 import { FrontendApplicationContribution } from '@theia/core/lib/browser';
 import { EditorManager } from '@theia/editor/lib/browser';
-import { MonacoQuickInputService } from './monaco-quick-input-service';
+import { MonacoQuickInputService } from './monaco-quick-input-service.js';
 import * as monaco from '@theia/monaco-editor-core';
-import { FormattingConflicts, FormattingMode } from '@theia/monaco-editor-core/esm/vs/editor/contrib/format/browser/format';
-import { DocumentFormattingEditProvider, DocumentRangeFormattingEditProvider } from '@theia/monaco-editor-core/esm/vs/editor/common/languages';
-import { ITextModel } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
+import { FormattingConflicts, FormattingMode } from '@theia/monaco-editor-core/esm/vs/editor/contrib/format/browser/format.js';
+import { DocumentFormattingEditProvider, DocumentRangeFormattingEditProvider } from '@theia/monaco-editor-core/esm/vs/editor/common/languages.js';
+import { ITextModel } from '@theia/monaco-editor-core/esm/vs/editor/common/model.js';
 import { nls, PreferenceScope } from '@theia/core';
-import { MonacoFormatterService } from './monaco-formatter-service';
+import { MonacoFormatterService } from './monaco-formatter-service.js';
 
 type FormattingEditProvider = DocumentFormattingEditProvider | DocumentRangeFormattingEditProvider;
 

package/src/browser/monaco-frontend-application-contribution.ts

@@ -16,22 +16,22 @@
 
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
 import { ColorTheme, CssStyleCollector, FrontendApplicationContribution, QuickAccessRegistry, StylingParticipant } from '@theia/core/lib/browser';
-import { MonacoSnippetSuggestProvider } from './monaco-snippet-suggest-provider';
+import { MonacoSnippetSuggestProvider } from './monaco-snippet-suggest-provider.js';
 import * as monaco from '@theia/monaco-editor-core';
-import { setSnippetSuggestSupport } from '@theia/monaco-editor-core/esm/vs/editor/contrib/suggest/browser/suggest';
-import { CompletionItemProvider } from '@theia/monaco-editor-core/esm/vs/editor/common/languages';
-import { MonacoTextModelService } from './monaco-text-model-service';
-import { MonacoThemingService } from './monaco-theming-service';
+import { setSnippetSuggestSupport } from '@theia/monaco-editor-core/esm/vs/editor/contrib/suggest/browser/suggest.js';
+import { CompletionItemProvider } from '@theia/monaco-editor-core/esm/vs/editor/common/languages.js';
+import { MonacoTextModelService } from './monaco-text-model-service.js';
+import { MonacoThemingService } from './monaco-theming-service.js';
 import { isHighContrast } from '@theia/core/lib/common/theme';
-import { editorOptionsRegistry, IEditorOption } from '@theia/monaco-editor-core/esm/vs/editor/common/config/editorOptions';
+import { editorOptionsRegistry, IEditorOption } from '@theia/monaco-editor-core/esm/vs/editor/common/config/editorOptions.js';
 import { DisposableCollection, MAX_SAFE_INTEGER, PreferenceSchemaService } from '@theia/core';
 import { editorGeneratedPreferenceProperties } from '@theia/editor/lib/common/editor-generated-preference-schema';
 import { WorkspaceFileService } from '@theia/workspace/lib/common/workspace-file-service';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
-import { MonacoStandaloneThemeService } from './monaco-standalone-theme-service';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
+import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme.js';
+import { MonacoStandaloneThemeService } from './monaco-standalone-theme-service.js';
 import { SecondaryWindowService } from '@theia/core/lib/browser/window/secondary-window-service';
-import { registerWindow } from '@theia/monaco-editor-core/esm/vs/base/browser/dom';
+import { registerWindow } from '@theia/monaco-editor-core/esm/vs/base/browser/dom.js';
 
 type CodeWindow = Window & typeof globalThis & {
     vscodeWindowId: number;

package/src/browser/monaco-frontend-module.ts

@@ -18,74 +18,75 @@ import '../../src/browser/style/index.css';
 import { ContainerModule, interfaces } from '@theia/core/shared/inversify';
 import {
     MenuContribution, CommandContribution, quickInputServicePath, createPreferenceProxy,
-    OVERRIDE_PROPERTY_PATTERN, PreferenceChange, PreferenceScope, PreferenceService,
+    PreferenceChange, PreferenceScope, PreferenceService,
     PreferenceSchemaService
 } from '@theia/core/lib/common';
 import {
     FrontendApplicationContribution, KeybindingContribution, QuickInputService, StylingParticipant, WebSocketConnectionProvider, UndoRedoHandler, WidgetStatusBarContribution
 } from '@theia/core/lib/browser';
 import { TextEditorProvider, DiffNavigatorProvider, TextEditor, FormatterService } from '@theia/editor/lib/browser';
-import { MonacoEditorProvider, MonacoEditorFactory, SaveParticipant } from './monaco-editor-provider';
-import { MonacoEditorMenuContribution } from './monaco-menu';
-import { MonacoEditorCommandHandlers } from './monaco-command';
-import { MonacoKeybindingContribution } from './monaco-keybinding';
-import { MonacoLanguages } from './monaco-languages';
-import { MonacoWorkspace } from './monaco-workspace';
-import { ActiveMonacoEditorContribution, MonacoEditorService, MonacoEditorServiceFactory, VSCodeContextKeyService, VSCodeThemeService } from './monaco-editor-service';
-import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
-import { MonacoTextModelService, MonacoEditorModelFactory, MonacoEditorModelFilter } from './monaco-text-model-service';
-import { MonacoContextMenuService } from './monaco-context-menu';
-import { MonacoOutlineContribution } from './monaco-outline-contribution';
-import { MonacoStatusBarContribution } from './monaco-status-bar-contribution';
-import { MonacoCommandService } from './monaco-command-service';
-import { MonacoCommandRegistry } from './monaco-command-registry';
-import { MonacoDiffNavigatorFactory } from './monaco-diff-navigator-factory';
-import { MonacoFrontendApplicationContribution } from './monaco-frontend-application-contribution';
-import MonacoTextmateModuleBinder from './textmate/monaco-textmate-frontend-bindings';
-import { MonacoBulkEditService } from './monaco-bulk-edit-service';
-import { MonacoOutlineDecorator } from './monaco-outline-decorator';
+import { MonacoEditorProvider, MonacoEditorFactory, SaveParticipant } from './monaco-editor-provider.js';
+import { MonacoEditorMenuContribution } from './monaco-menu.js';
+import { MonacoEditorCommandHandlers } from './monaco-command.js';
+import { MonacoKeybindingContribution } from './monaco-keybinding.js';
+import { MonacoLanguages } from './monaco-languages.js';
+import { MonacoWorkspace } from './monaco-workspace.js';
+import { ActiveMonacoEditorContribution, MonacoEditorService, MonacoEditorServiceFactory, VSCodeContextKeyService, VSCodeThemeService } from './monaco-editor-service.js';
+import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService.js';
+import { MonacoTextModelService, MonacoEditorModelFactory, MonacoEditorModelFilter } from './monaco-text-model-service.js';
+import { MonacoContextMenuService } from './monaco-context-menu.js';
+import { MonacoOutlineContribution } from './monaco-outline-contribution.js';
+import { MonacoStatusBarContribution } from './monaco-status-bar-contribution.js';
+import { MonacoCommandService } from './monaco-command-service.js';
+import { MonacoCommandRegistry } from './monaco-command-registry.js';
+import { MonacoDiffNavigatorFactory } from './monaco-diff-navigator-factory.js';
+import { MonacoFrontendApplicationContribution } from './monaco-frontend-application-contribution.js';
+import MonacoTextmateModuleBinder from './textmate/monaco-textmate-frontend-bindings.js';
+import { MonacoBulkEditService } from './monaco-bulk-edit-service.js';
+import { MonacoOutlineDecorator } from './monaco-outline-decorator.js';
 import { OutlineTreeDecorator } from '@theia/outline-view/lib/browser/outline-decorator-service';
-import { MonacoSnippetSuggestProvider } from './monaco-snippet-suggest-provider';
+import { MonacoSnippetSuggestProvider } from './monaco-snippet-suggest-provider.js';
 import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
-import { MonacoContextKeyService } from './monaco-context-key-service';
-import { MonacoMimeService } from './monaco-mime-service';
+import { MonacoContextKeyService } from './monaco-context-key-service.js';
+import { MonacoMimeService } from './monaco-mime-service.js';
 import { MimeService } from '@theia/core/lib/browser/mime-service';
-import { MonacoEditorServices } from './monaco-editor';
-import { MonacoColorRegistry } from './monaco-color-registry';
+import { MonacoEditorServices } from './monaco-editor.js';
+import { MonacoColorRegistry } from './monaco-color-registry.js';
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
-import { MonacoIconRegistry } from './monaco-icon-registry';
+import { MonacoIconRegistry } from './monaco-icon-registry.js';
 import { IconRegistry } from '@theia/core/lib/browser/icon-registry';
-import { MonacoThemingService } from './monaco-theming-service';
+import { MonacoThemingService } from './monaco-theming-service.js';
 import { bindRootContributionProvider } from '@theia/core';
-import { WorkspaceSymbolCommand } from './workspace-symbol-command';
+import { WorkspaceSymbolCommand } from './workspace-symbol-command.js';
 import { LanguageService } from '@theia/core/lib/browser/language-service';
-import { MonacoToProtocolConverter } from './monaco-to-protocol-converter';
-import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
-import { MonacoFormattingConflictsContribution } from './monaco-formatting-conflicts';
-import { MonacoFormatterService } from './monaco-formatter-service';
-import { MonacoQuickInputImplementation, MonacoQuickInputService } from './monaco-quick-input-service';
-import { GotoLineQuickAccessContribution } from './monaco-gotoline-quick-access';
-import { GotoSymbolQuickAccessContribution } from './monaco-gotosymbol-quick-access';
+import { MonacoToProtocolConverter } from './monaco-to-protocol-converter.js';
+import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter.js';
+import { MonacoFormattingConflictsContribution } from './monaco-formatting-conflicts.js';
+import { MonacoFormatterService } from './monaco-formatter-service.js';
+import { MonacoQuickInputImplementation, MonacoQuickInputService } from './monaco-quick-input-service.js';
+import { GotoLineQuickAccessContribution } from './monaco-gotoline-quick-access.js';
+import { GotoSymbolQuickAccessContribution } from './monaco-gotosymbol-quick-access.js';
 import { QuickAccessContribution, QuickAccessRegistry } from '@theia/core/lib/browser/quick-input/quick-access';
-import { MonacoQuickAccessRegistry } from './monaco-quick-access-registry';
-import { ConfigurationTarget, IConfigurationChangeEvent, IConfigurationService } from '@theia/monaco-editor-core/esm/vs/platform/configuration/common/configuration.js';
-import { StandaloneConfigurationService, StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
+import { MonacoQuickAccessRegistry } from './monaco-quick-access-registry.js';
+import { ConfigurationTarget, IConfigurationChangeEvent,
+    IConfigurationOverrides, IConfigurationService } from '@theia/monaco-editor-core/esm/vs/platform/configuration/common/configuration.js';
+import { StandaloneConfigurationService, StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
 import { Configuration } from '@theia/monaco-editor-core/esm/vs/platform/configuration/common/configurationModels.js';
 import { MarkdownRenderer } from '@theia/core/lib/browser/markdown-rendering/markdown-renderer';
-import { MonacoMarkdownRenderer } from './markdown-renderer/monaco-markdown-renderer';
+import { MonacoMarkdownRenderer } from './markdown-renderer/monaco-markdown-renderer.js';
 import { ThemeService } from '@theia/core/lib/browser/theming';
-import { ThemeServiceWithDB } from './monaco-indexed-db';
+import { ThemeServiceWithDB } from './monaco-indexed-db.js';
 import { IContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey.js';
 import { IThemeService } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService.js';
-import { ActiveMonacoUndoRedoHandler, FocusedMonacoUndoRedoHandler } from './monaco-undo-redo-handler';
-import { ILogService } from '@theia/monaco-editor-core/esm/vs/platform/log/common/log';
-import { DefaultContentHoverWidgetPatcher } from './default-content-hover-widget-patcher';
-import { MonacoWorkspaceContextService } from './monaco-workspace-context-service';
-import { MonacoCodeActionSaveParticipant } from './monaco-code-action-save-participant';
-import { MonacoCodeActionService, MonacoCodeActionServiceImpl } from './monaco-code-action-service';
-import { MonacoDiffComputer } from './monaco-diff-computer';
+import { ActiveMonacoUndoRedoHandler, FocusedMonacoUndoRedoHandler } from './monaco-undo-redo-handler.js';
+import { ILogService } from '@theia/monaco-editor-core/esm/vs/platform/log/common/log.js';
+import { DefaultContentHoverWidgetPatcher } from './default-content-hover-widget-patcher.js';
+import { MonacoWorkspaceContextService } from './monaco-workspace-context-service.js';
+import { MonacoCodeActionSaveParticipant } from './monaco-code-action-save-participant.js';
+import { MonacoCodeActionService, MonacoCodeActionServiceImpl } from './monaco-code-action-service.js';
+import { MonacoDiffComputer } from './monaco-diff-computer.js';
 import { DiffComputer } from '@theia/core/lib/common/diff';
-import { MonacoEditorContentMenuContribution } from './monaco-editor-content-menu';
+import { MonacoEditorContentMenuContribution } from './monaco-editor-content-menu.js';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(MonacoThemingService).toSelf().inSingletonScope();
@@ -224,11 +225,9 @@ export function createMonacoConfigurationService(container: interfaces.Container
     const service = new StandaloneConfigurationService(StandaloneServices.get(ILogService));
     const _configuration: Configuration = service['_configuration'];
 
-    _configuration.getValue = (section, overrides) => {
-        const overrideIdentifier: string | undefined = (overrides && 'overrideIdentifier' in overrides && typeof overrides.overrideIdentifier === 'string')
-            ? overrides['overrideIdentifier']
-            : undefined;
-        const resourceUri: string | undefined = (overrides && 'resource' in overrides && !!overrides['resource']) ? overrides['resource'].toString() : undefined;
+    _configuration.getValue = (section, overrides: IConfigurationOverrides) => {
+        const overrideIdentifier = overrides.overrideIdentifier || undefined;
+        const resourceUri = overrides.resource?.toString();
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const proxy = createPreferenceProxy<{ [key: string]: any }>(preferences, preferenceSchemaService.getJSONSchema(PreferenceScope.Folder), {
             resourceUri, overrideIdentifier, style: 'both'
@@ -296,15 +295,8 @@ export function createMonacoConfigurationService(container: interfaces.Container
                     return false;
                 }
                 for (const change of context.changes) {
-                    const overridden = preferences.overriddenPreferenceName(change.preferenceName);
-                    const preferenceName = overridden ? overridden.preferenceName : change.preferenceName;
-                    if (preferenceName.startsWith(prefix)) {
-                        if (options?.overrideIdentifier !== undefined) {
-                            if (overridden && overridden.overrideIdentifier !== options?.overrideIdentifier) {
-                                continue;
-                            }
-                        }
-                        if (change.affects(options?.resource?.toString())) {
+                    if (change.preferenceName.startsWith(prefix)) {
+                        if (change.affects(options?.resource?.toString(), options?.overrideIdentifier || undefined)) {
                             return true;
                         }
                     }
@@ -317,8 +309,7 @@ export function createMonacoConfigurationService(container: interfaces.Container
     preferences.onPreferencesChanged(event => {
         let source: ConfigurationTarget | undefined;
         let context = newFireDidChangeConfigurationContext();
-        for (let key of Object.keys(event)) {
-            const change = event[key];
+        for (const change of event) {
             const target = toTarget(change.scope);
             if (source !== undefined && target !== source) {
                 fireDidChangeConfiguration(source, context);
@@ -327,28 +318,23 @@ export function createMonacoConfigurationService(container: interfaces.Container
             context.changes.push(change);
             source = target;
 
-            let overrideKeys: Set<string> | undefined;
-            if (key.startsWith('[')) {
-                const index = key.indexOf('.');
-                const override = key.substring(0, index);
-                const overrideIdentifier = override.match(OVERRIDE_PROPERTY_PATTERN)?.[1];
-                if (overrideIdentifier) {
-                    context.keys.add(override);
-                    context.affectedKeys.add(override);
-                    overrideKeys = context.overrides.get(overrideIdentifier) || new Set<string>();
-                    context.overrides.set(overrideIdentifier, overrideKeys);
-                    key = key.substring(index + 1);
-                }
-            }
+            let key = change.preferenceName;
+            const overrideKeys = new Set<string>();
             while (key) {
-                if (overrideKeys) {
-                    overrideKeys.add(key);
-                }
+                overrideKeys.add(key);
                 context.keys.add(key);
                 context.affectedKeys.add(key);
                 const index = key.lastIndexOf('.');
                 key = key.substring(0, index);
             }
+
+            if (preferenceSchemaService.getSchemaProperty(change.preferenceName)?.overridable) {
+                for (const override of change.affectedOverrides) {
+                    const existingOverrides = context.overrides.get(override) || new Set<string>();
+                    context.overrides.set(override, existingOverrides);
+                    overrideKeys.forEach(k => existingOverrides.add(k));
+                }
+            }
         }
         if (source) {
             fireDidChangeConfiguration(source, context);

package/src/browser/monaco-gotoline-quick-access.ts

@@ -16,12 +16,12 @@
 
 import { QuickAccessContribution } from '@theia/core/lib/browser/quick-input';
 import { injectable } from '@theia/core/shared/inversify';
-import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
-import { StandaloneGotoLineQuickAccessProvider } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/quickAccess/standaloneGotoLineQuickAccess';
-import { IQuickAccessRegistry, Extensions } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickAccess';
-import { Registry } from '@theia/monaco-editor-core/esm/vs/platform/registry/common/platform';
-import { IStorageService } from '@theia/monaco-editor-core/esm/vs/platform/storage/common/storage';
+import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService.js';
+import { StandaloneGotoLineQuickAccessProvider } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/quickAccess/standaloneGotoLineQuickAccess.js';
+import { IQuickAccessRegistry, Extensions } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickAccess.js';
+import { Registry } from '@theia/monaco-editor-core/esm/vs/platform/registry/common/platform.js';
+import { IStorageService } from '@theia/monaco-editor-core/esm/vs/platform/storage/common/storage.js';
 
 export class GotoLineQuickAccess extends StandaloneGotoLineQuickAccessProvider {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/browser/monaco-gotosymbol-quick-access.ts

@@ -16,13 +16,13 @@
 
 import { QuickAccessContribution } from '@theia/core/lib/browser/quick-input';
 import { injectable } from '@theia/core/shared/inversify';
-import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
-import { ILanguageFeaturesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageFeatures';
-import { IOutlineModelService } from '@theia/monaco-editor-core/esm/vs/editor/contrib/documentSymbols/browser/outlineModel';
-import { StandaloneGotoSymbolQuickAccessProvider } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/quickAccess/standaloneGotoSymbolQuickAccess';
-import { IQuickAccessRegistry, Extensions } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickAccess';
-import { Registry } from '@theia/monaco-editor-core/esm/vs/platform/registry/common/platform';
+import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService.js';
+import { ILanguageFeaturesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageFeatures.js';
+import { IOutlineModelService } from '@theia/monaco-editor-core/esm/vs/editor/contrib/documentSymbols/browser/outlineModel.js';
+import { StandaloneGotoSymbolQuickAccessProvider } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/quickAccess/standaloneGotoSymbolQuickAccess.js';
+import { IQuickAccessRegistry, Extensions } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickAccess.js';
+import { Registry } from '@theia/monaco-editor-core/esm/vs/platform/registry/common/platform.js';
 
 export class GotoSymbolQuickAccess extends StandaloneGotoSymbolQuickAccessProvider {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/browser/monaco-icon-registry.ts

@@ -16,7 +16,7 @@
 
 import { injectable } from '@theia/core/shared/inversify';
 import { IconRegistry } from '@theia/core/lib/browser/icon-registry';
-import { getIconRegistry } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/iconRegistry';
+import { getIconRegistry } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/iconRegistry.js';
 import { IconDefinition, IconFontDefinition, ThemeIcon } from '@theia/core/lib/common/theme';
 
 @injectable()

package/src/browser/monaco-indexed-db.ts

@@ -19,7 +19,7 @@ import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposa
 import { ThemeService } from '@theia/core/lib/browser/theming';
 import * as monaco from '@theia/monaco-editor-core';
 import { injectable } from '@theia/core/shared/inversify';
-import type { ThemeMix } from './textmate/monaco-theme-types';
+import type { ThemeMix } from './textmate/monaco-theme-types.js';
 import { Theme } from '@theia/core/lib/common/theme';
 import { Emitter, Event, isObject } from '@theia/core';
 

package/src/browser/monaco-init.spec.ts

@@ -33,10 +33,10 @@ window.matchMedia = () => ({
 
 import { expect } from 'chai';
 import { Disposable } from '@theia/core';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { IInstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation';
-import { InstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiationService';
-import { ServiceCollection } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/serviceCollection';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
+import { IInstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation.js';
+import { InstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiationService.js';
+import { ServiceCollection } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/serviceCollection.js';
 
 disableJSDOM();
 

package/src/browser/monaco-init.ts

@@ -32,38 +32,38 @@
 // packages/monaco/src/browser/monaco-nls.ts.
 
 import { Container } from '@theia/core/shared/inversify';
-import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { SyncDescriptor } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/descriptors';
-import { IInstantiationService, createDecorator } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation';
-import { InstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiationService';
-import { ServiceCollection } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/serviceCollection';
-import { MonacoEditorServiceFactory, MonacoEditorServiceFactoryType } from './monaco-editor-service';
-import { IConfigurationService } from '@theia/monaco-editor-core/esm/vs/platform/configuration/common/configuration';
-import { ITextModelService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/resolverService';
-import { MonacoConfigurationService } from './monaco-frontend-module';
-import { MonacoTextModelService } from './monaco-text-model-service';
-import { MonacoContextMenuService } from './monaco-context-menu';
-import { IContextMenuService } from '@theia/monaco-editor-core/esm/vs/platform/contextview/browser/contextView';
-import { IContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
-import { IThemeService } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService';
-import { MonacoBulkEditService } from './monaco-bulk-edit-service';
-import { MonacoCommandService } from './monaco-command-service';
-import { IBulkEditService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService';
-import { ICommandService } from '@theia/monaco-editor-core/esm/vs/platform/commands/common/commands';
-import { MonacoQuickInputImplementation } from './monaco-quick-input-service';
-import { IQuickInputService } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickInput';
-import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
-import { MonacoStandaloneThemeService } from './monaco-standalone-theme-service';
-import { createContentHoverWidgetPatcher } from './content-hover-widget-patcher';
-import { IHoverService } from '@theia/monaco-editor-core/esm/vs/platform/hover/browser/hover';
-import { setBaseLayerHoverDelegate } from '@theia/monaco-editor-core/esm/vs/base/browser/ui/hover/hoverDelegate2';
-import { IWorkspaceContextService } from '@theia/monaco-editor-core/esm/vs/platform/workspace/common/workspace';
-import { MonacoWorkspaceContextService } from './monaco-workspace-context-service';
-import { ILayoutService } from '@theia/monaco-editor-core/esm/vs/platform/layout/browser/layoutService';
-import { Event } from '@theia/monaco-editor-core/esm/vs/base/common/event';
-import * as dom from '@theia/monaco-editor-core/esm/vs/base/browser/dom';
-import { mainWindow } from '@theia/monaco-editor-core/esm/vs/base/browser/window';
+import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService.js';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
+import { SyncDescriptor } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/descriptors.js';
+import { IInstantiationService, createDecorator } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation.js';
+import { InstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiationService.js';
+import { ServiceCollection } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/serviceCollection.js';
+import { MonacoEditorServiceFactory, MonacoEditorServiceFactoryType } from './monaco-editor-service.js';
+import { IConfigurationService } from '@theia/monaco-editor-core/esm/vs/platform/configuration/common/configuration.js';
+import { ITextModelService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/resolverService.js';
+import { MonacoConfigurationService } from './monaco-frontend-module.js';
+import { MonacoTextModelService } from './monaco-text-model-service.js';
+import { MonacoContextMenuService } from './monaco-context-menu.js';
+import { IContextMenuService } from '@theia/monaco-editor-core/esm/vs/platform/contextview/browser/contextView.js';
+import { IContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey.js';
+import { IThemeService } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService.js';
+import { MonacoBulkEditService } from './monaco-bulk-edit-service.js';
+import { MonacoCommandService } from './monaco-command-service.js';
+import { IBulkEditService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService.js';
+import { ICommandService } from '@theia/monaco-editor-core/esm/vs/platform/commands/common/commands.js';
+import { MonacoQuickInputImplementation } from './monaco-quick-input-service.js';
+import { IQuickInputService } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickInput.js';
+import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme.js';
+import { MonacoStandaloneThemeService } from './monaco-standalone-theme-service.js';
+import { createContentHoverWidgetPatcher } from './content-hover-widget-patcher.js';
+import { IHoverService } from '@theia/monaco-editor-core/esm/vs/platform/hover/browser/hover.js';
+import { setBaseLayerHoverDelegate } from '@theia/monaco-editor-core/esm/vs/base/browser/ui/hover/hoverDelegate2.js';
+import { IWorkspaceContextService } from '@theia/monaco-editor-core/esm/vs/platform/workspace/common/workspace.js';
+import { MonacoWorkspaceContextService } from './monaco-workspace-context-service.js';
+import { ILayoutService } from '@theia/monaco-editor-core/esm/vs/platform/layout/browser/layoutService.js';
+import { Event } from '@theia/monaco-editor-core/esm/vs/base/common/event.js';
+import * as dom from '@theia/monaco-editor-core/esm/vs/base/browser/dom.js';
+import { mainWindow } from '@theia/monaco-editor-core/esm/vs/base/browser/window.js';
 import { Disposable } from '@theia/core';
 
 export const contentHoverWidgetPatcher = createContentHoverWidgetPatcher();

package/src/browser/monaco-keybinding.spec.ts

@@ -13,15 +13,14 @@ let disableJSDOM = enableJSDOM();
 
 import { expect } from 'chai';
 import { Key, KeybindingRegistry, KeyCode } from '@theia/core/lib/browser';
-import * as os from '@theia/core/lib/common/os';
 import * as monaco from '@theia/monaco-editor-core';
-import * as MonacoPlatform from '@theia/monaco-editor-core/esm/vs/base/common/platform';
-import { KeyCode as MonacoKeyCode } from '@theia/monaco-editor-core/esm/vs/base/common/keyCodes';
-import { KeyCodeChord } from '@theia/monaco-editor-core/esm/vs/base/common/keybindings';
-import { USLayoutResolvedKeybinding } from '@theia/monaco-editor-core/esm/vs/platform/keybinding/common/usLayoutResolvedKeybinding';
-import * as sinon from 'sinon';
-import { MonacoKeybindingContribution } from './monaco-keybinding';
-import { MonacoResolvedKeybinding } from './monaco-resolved-keybinding';
+import * as MonacoPlatform from '@theia/monaco-editor-core/esm/vs/base/common/platform.js';
+import { KeyCode as MonacoKeyCode } from '@theia/monaco-editor-core/esm/vs/base/common/keyCodes.js';
+import { KeyCodeChord } from '@theia/monaco-editor-core/esm/vs/base/common/keybindings.js';
+import { USLayoutResolvedKeybinding } from '@theia/monaco-editor-core/esm/vs/platform/keybinding/common/usLayoutResolvedKeybinding.js';
+import { OSStub, stubOS } from '@theia/core/lib/common/test/stub-os';
+import { MonacoKeybindingContribution } from './monaco-keybinding.js';
+import { MonacoResolvedKeybinding } from './monaco-resolved-keybinding.js';
 
 class TestMonacoKeybindingContribution extends MonacoKeybindingContribution {
     encode(code: KeyCode): number {
@@ -43,10 +42,15 @@ describe('Monaco keybinding adapter', () => {
 
     beforeEach(() => contribution = new TestMonacoKeybindingContribution());
 
-    afterEach(() => sinon.restore());
+    let platform: OSStub | undefined;
+
+    afterEach(() => {
+        platform?.restore();
+        platform = undefined;
+    });
 
     it('encodes non-macOS Ctrl as Monaco CtrlCmd', () => {
-        sinon.stub(os, 'isOSX').value(false);
+        platform = stubOS('isOSX', false);
 
         const encoded = contribution.encode(new KeyCode({ key: Key.KEY_A, ctrl: true }));
 
@@ -55,7 +59,7 @@ describe('Monaco keybinding adapter', () => {
     });
 
     it('preserves macOS Ctrl and Command encoding', () => {
-        sinon.stub(os, 'isOSX').value(true);
+        platform = stubOS('isOSX', true);
 
         const encoded = contribution.encode(new KeyCode({ key: Key.KEY_A, ctrl: true, meta: true }));
 

package/src/browser/monaco-keybinding.ts

@@ -18,15 +18,15 @@ import { injectable, inject, postConstruct, named } from '@theia/core/shared/inv
 import {
     KeybindingContribution, KeybindingRegistry, KeybindingScope, KeyCode, layoutModifiersIncludeAltGraph, layoutModifiersIncludeShift
 } from '@theia/core/lib/browser';
-import { MonacoCommands } from './monaco-command';
-import { MonacoCommandRegistry } from './monaco-command-registry';
+import { MonacoCommands } from './monaco-command.js';
+import { MonacoCommandRegistry } from './monaco-command-registry.js';
 import { CommandRegistry, DisposableCollection, environment, isOSX, ILogger } from '@theia/core';
-import { MonacoResolvedKeybinding } from './monaco-resolved-keybinding';
-import { KeybindingsRegistry } from '@theia/monaco-editor-core/esm/vs/platform/keybinding/common/keybindingsRegistry';
-import { StandaloneKeybindingService, StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { IKeybindingService } from '@theia/monaco-editor-core/esm/vs/platform/keybinding/common/keybinding';
-import { MonacoContextKeyService } from './monaco-context-key-service';
-import { KEY_CODE_MAP } from './monaco-keycode-map';
+import { MonacoResolvedKeybinding } from './monaco-resolved-keybinding.js';
+import { KeybindingsRegistry } from '@theia/monaco-editor-core/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
+import { StandaloneKeybindingService, StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
+import { IKeybindingService } from '@theia/monaco-editor-core/esm/vs/platform/keybinding/common/keybinding.js';
+import { MonacoContextKeyService } from './monaco-context-key-service.js';
+import { KEY_CODE_MAP } from './monaco-keycode-map.js';
 import * as monaco from '@theia/monaco-editor-core';
 
 @injectable()

package/src/browser/monaco-keycode-map.ts

@@ -20,8 +20,8 @@
 
 import * as browser from '@theia/core/lib/browser';
 // This is exported as part of the public API, but we use it with private API's so we need to refer to the private version.
-import { KeyCode } from '@theia/monaco-editor-core/esm/vs/base/common/keyCodes';
-import * as MonacoPlatform from '@theia/monaco-editor-core/esm/vs/base/common/platform';
+import { KeyCode } from '@theia/monaco-editor-core/esm/vs/base/common/keyCodes.js';
+import * as MonacoPlatform from '@theia/monaco-editor-core/esm/vs/base/common/platform.js';
 
 export const KEY_CODE_MAP: KeyCode[] = [];
 (function (): void {

package/src/browser/monaco-languages.ts

@@ -22,13 +22,13 @@ import { MaybePromise, Mutable } from '@theia/core/lib/common/types';
 import { Disposable } from '@theia/core/lib/common/disposable';
 import { CancellationToken } from '@theia/core/lib/common/cancellation';
 import { Language, LanguageService } from '@theia/core/lib/browser/language-service';
-import { MonacoMarkerCollection } from './monaco-marker-collection';
-import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
+import { MonacoMarkerCollection } from './monaco-marker-collection.js';
+import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter.js';
 import * as monaco from '@theia/monaco-editor-core';
 import { FileStat } from '@theia/filesystem/lib/common/files';
 import { FileStatNode } from '@theia/filesystem/lib/browser';
-import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/language';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
+import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/language.js';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
 
 export interface WorkspaceSymbolProvider {
     provideWorkspaceSymbols(params: WorkspaceSymbolParams, token: CancellationToken): MaybePromise<SymbolInformation[] | undefined>;

package/src/browser/monaco-marker-collection.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { Diagnostic } from '@theia/core/shared/vscode-languageserver-protocol';
-import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
+import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter.js';
 import * as monaco from '@theia/monaco-editor-core';
 import { Marker } from '@theia/markers/lib/common/marker';
 import URI from '@theia/core/lib/common/uri';

package/src/browser/monaco-menu.ts

@@ -18,9 +18,9 @@ import { MAIN_MENU_BAR, MenuAction, MenuContribution, MenuModelRegistry, MenuPat
 import { nls } from '@theia/core/lib/common/nls';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { EDITOR_CONTEXT_MENU, EditorMainMenu } from '@theia/editor/lib/browser';
-import { IMenuItem, MenuId, MenuRegistry, isIMenuItem } from '@theia/monaco-editor-core/esm/vs/platform/actions/common/actions';
-import { MonacoCommands } from './monaco-command';
-import { MonacoCommandRegistry } from './monaco-command-registry';
+import { IMenuItem, MenuId, MenuRegistry, isIMenuItem } from '@theia/monaco-editor-core/esm/vs/platform/actions/common/actions.js';
+import { MonacoCommands } from './monaco-command.js';
+import { MonacoCommandRegistry } from './monaco-command-registry.js';
 
 export interface MonacoActionGroup {
     id: string;

package/src/browser/monaco-mime-service.ts

@@ -14,14 +14,14 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import debounce = require('@theia/core/shared/lodash.debounce');
+import debounce from '@theia/core/shared/lodash.debounce';
 import { injectable } from '@theia/core/shared/inversify';
 import { MimeAssociation, MimeService } from '@theia/core/lib/browser/mime-service';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/language';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
+import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/language.js';
 import * as monaco from '@theia/monaco-editor-core';
-import { clearConfiguredLanguageAssociations, registerConfiguredLanguageAssociation } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languagesAssociations';
-import { LanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageService';
+import { clearConfiguredLanguageAssociations, registerConfiguredLanguageAssociation } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languagesAssociations.js';
+import { LanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageService.js';
 
 @injectable()
 export class MonacoMimeService extends MimeService {

package/src/browser/monaco-nls.ts

@@ -25,7 +25,7 @@
  */
 
 // Re-export the message store — imported via a path that is NOT aliased.
-export { getNLSLanguage, getNLSMessages } from '@theia/monaco-editor-core/esm/vs/nls.messages';
+export { getNLSLanguage, getNLSMessages } from '@theia/monaco-editor-core/esm/vs/nls.messages.js';
 
 import { nls } from '@theia/core/lib/common/nls';
 import { FormatType, Localization } from '@theia/core/lib/common/i18n/localization';