@codingame/monaco-vscode-api 1.85.4 → 2.0.0-rework-ci.1

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.js

@@ -1,20 +1,20 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { Separator } from 'monaco-editor/esm/vs/base/common/actions.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable, toDisposable, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { AudioCue, IAudioCueService } from 'monaco-editor/esm/vs/platform/audioCues/browser/audioCueService.js';
-import { IClipboardService } from 'monaco-editor/esm/vs/platform/clipboard/common/clipboardService.js';
-import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { Severity, INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
-import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
-import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
-import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
+import { addDisposableListener, EventType } from '../../../../../base/browser/dom.js';
+import { Separator } from '../../../../../base/common/actions.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable, toDisposable, dispose } from '../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { localizeWithPath } from '../../../../../nls.js';
+import { AudioCue, IAudioCueService } from '../../../../../platform/audioCues/browser/audioCueService.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { Severity, INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
 import { terminalDecorationMark, terminalDecorationIncomplete, terminalDecorationError, terminalDecorationSuccess } from '../terminalIcons.js';
 import { TerminalDecorationHoverManager, updateLayout } from './decorationStyles.js';
 import { TERMINAL_COMMAND_DECORATION_DEFAULT_BACKGROUND_COLOR, TERMINAL_COMMAND_DECORATION_ERROR_BACKGROUND_COLOR, TERMINAL_COMMAND_DECORATION_SUCCESS_BACKGROUND_COLOR } from '../../common/terminalColorRegistry.js';
@@ -298,7 +298,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         }
     }
     _createContextMenu(element, command) {
-        return dom.addDisposableListener(element, dom.EventType.CLICK, async () => {
+        return addDisposableListener(element, EventType.CLICK, async () => {
             this._terminalDecorationHoverService.hideHover();
             const actions = await this._getCommandActions(command);
             this._contextMenuService.showContextMenu({ getAnchor: () => element, getActions: () => actions });

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/decorationStyles.js

@@ -1,12 +1,12 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { Delayer } from 'monaco-editor/esm/vs/base/common/async.js';
+import { addDisposableListener, EventType } from '../../../../../base/browser/dom.js';
+import { Delayer } from '../../../../../base/common/async.js';
 import { fromNow } from '../../../../../base/common/date.js';
-import { MarkdownString } from 'monaco-editor/esm/vs/base/common/htmlContent.js';
-import { Disposable, combinedDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Disposable, combinedDisposable } from '../../../../../base/common/lifecycle.js';
+import { localizeWithPath } from '../../../../../nls.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
 import { IHoverService } from '../../../../services/hover/browser/hover.js';
 let TerminalDecorationHoverManager = class TerminalDecorationHoverManager extends Disposable {
     constructor(_hoverService, configurationService, contextMenuService) {
@@ -22,7 +22,7 @@ let TerminalDecorationHoverManager = class TerminalDecorationHoverManager extend
         this._hoverService.hideHover();
     }
     createHover(element, command, hoverMessage) {
-        return combinedDisposable(dom.addDisposableListener(element, dom.EventType.MOUSE_ENTER, () => {
+        return combinedDisposable(addDisposableListener(element, EventType.MOUSE_ENTER, () => {
             if (this._contextMenuVisible) {
                 return;
             }
@@ -78,7 +78,7 @@ let TerminalDecorationHoverManager = class TerminalDecorationHoverManager extend
                 }
                 this._hoverService.showHover({ content: ( new MarkdownString(hoverContent)), target: element });
             });
-        }), dom.addDisposableListener(element, dom.EventType.MOUSE_LEAVE, () => this.hideHover()), dom.addDisposableListener(element, dom.EventType.MOUSE_OUT, () => this.hideHover()));
+        }), addDisposableListener(element, EventType.MOUSE_LEAVE, () => this.hideHover()), addDisposableListener(element, EventType.MOUSE_OUT, () => this.hideHover()));
     }
 };
 TerminalDecorationHoverManager = ( __decorate([

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.d.ts

@@ -1,3 +1,5 @@
+import '../../../../../editor/editor.api.js';
+
 declare const enum ScrollPosition {
     Top = 0,
     Middle = 1

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.js

@@ -1,10 +1,10 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { coalesce } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { Disposable, MutableDisposable, dispose, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { timeout } from 'monaco-editor/esm/vs/base/common/async.js';
-import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
+import { coalesce } from '../../../../../base/common/arrays.js';
+import { Disposable, MutableDisposable, dispose, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { timeout } from '../../../../../base/common/async.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
 import { TERMINAL_OVERVIEW_RULER_CURSOR_FOREGROUND_COLOR } from '../../common/terminalColorRegistry.js';
-import { getWindow } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { getWindow } from '../../../../../base/browser/dom.js';
 var Boundary;
 ( (function(Boundary) {
     Boundary[Boundary["Top"] = 0] = "Top";

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/suggestAddon.js

@@ -1,17 +1,17 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { findParentWithClass, Dimension } from '../../../../../base/browser/dom.js';
 import { SimpleCompletionItem } from '../../../../services/suggest/browser/simpleCompletionItem.js';
 import { LineContext, SimpleCompletionModel } from '../../../../services/suggest/browser/simpleCompletionModel.js';
 import { SimpleSuggestWidget } from '../../../../services/suggest/browser/simpleSuggestWidget.js';
-import { timeout } from 'monaco-editor/esm/vs/base/common/async.js';
-import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { editorSuggestWidgetSelectedBackground } from 'monaco-editor/esm/vs/editor/contrib/suggest/browser/suggestWidget.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-import { activeContrastBorder } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
-import { getListStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
+import { timeout } from '../../../../../base/common/async.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { editorSuggestWidgetSelectedBackground } from '../../../../../editor/contrib/suggest/browser/suggestWidget.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { activeContrastBorder } from '../../../../../platform/theme/common/colorRegistry.js';
+import { getListStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
 const pwshTypeToIconMap = {
     0: Codicon.symbolText,
     1: Codicon.history,
@@ -219,7 +219,7 @@ let SuggestAddon = class SuggestAddon extends Disposable {
             return;
         }
         const xtermBox = this._terminal.element.getBoundingClientRect();
-        const panelElement = dom.findParentWithClass(this._container, 'panel').offsetParent;
+        const panelElement = findParentWithClass(this._container, 'panel').offsetParent;
         const panelBox = panelElement.getBoundingClientRect();
         suggestWidget.showSuggestions(model, 0, false, false, {
             left: (xtermBox.left - panelBox.left) + this._terminal.buffer.active.cursorX * dimensions.width,
@@ -237,7 +237,7 @@ let SuggestAddon = class SuggestAddon extends Disposable {
     _ensureSuggestWidget(terminal) {
         this._terminalSuggestWidgetVisibleContextKey.set(true);
         if (!this._suggestWidget) {
-            this._suggestWidget = this._register(this._instantiationService.createInstance(SimpleSuggestWidget, dom.findParentWithClass(this._container, 'panel'), this._instantiationService.createInstance(PersistedWidgetSize), {}));
+            this._suggestWidget = this._register(this._instantiationService.createInstance(SimpleSuggestWidget, findParentWithClass(this._container, 'panel'), this._instantiationService.createInstance(PersistedWidgetSize), {}));
             this._suggestWidget.list.style(getListStyles({
                 listInactiveFocusBackground: editorSuggestWidgetSelectedBackground,
                 listInactiveFocusOutline: activeContrastBorder
@@ -343,7 +343,7 @@ let SuggestAddon = class SuggestAddon extends Disposable {
                 return;
             }
             const xtermBox = this._terminal.element.getBoundingClientRect();
-            const panelElement = dom.findParentWithClass(this._container, 'panel').offsetParent;
+            const panelElement = findParentWithClass(this._container, 'panel').offsetParent;
             const panelBox = panelElement.getBoundingClientRect();
             this._suggestWidget?.showSuggestions(this._suggestWidget._completionModel, 0, false, false, {
                 left: (xtermBox.left - panelBox.left) + this._terminal.buffer.active.cursorX * dimensions.width,
@@ -369,8 +369,8 @@ let PersistedWidgetSize = class PersistedWidgetSize {
         const raw = this._storageService.get(this._key, 0 ) ?? '';
         try {
             const obj = JSON.parse(raw);
-            if (dom.Dimension.is(obj)) {
-                return dom.Dimension.lift(obj);
+            if (Dimension.is(obj)) {
+                return Dimension.lift(obj);
             }
         }
         catch {

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.js

@@ -1,31 +1,31 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { Disposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { isAncestorOfActiveElement, getActiveWindow, addDisposableListener, getWindow, getDocument, EventType } from '../../../../../base/browser/dom.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { ITerminalLogService } from '../../../../../platform/terminal/common/terminal.js';
-import { isSafari } from 'monaco-editor/esm/vs/base/browser/browser.js';
-import { LogLevel } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-import { Severity, INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
+import { isSafari } from '../../../../../base/browser/browser.js';
+import { LogLevel } from '../../../../../platform/log/common/log.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { Severity, INotificationService } from '../../../../../platform/notification/common/notification.js';
 import { MarkNavigationAddon } from './markNavigationAddon.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
+import { localizeWithPath } from '../../../../../nls.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
 import { PANEL_BACKGROUND } from '../../../../common/theme.js';
 import { TERMINAL_BACKGROUND_COLOR, TERMINAL_FIND_MATCH_BACKGROUND_COLOR, TERMINAL_FIND_MATCH_BORDER_COLOR, TERMINAL_OVERVIEW_RULER_CURSOR_FOREGROUND_COLOR, TERMINAL_FIND_MATCH_HIGHLIGHT_BACKGROUND_COLOR, TERMINAL_FIND_MATCH_HIGHLIGHT_BORDER_COLOR, TERMINAL_OVERVIEW_RULER_FIND_MATCH_FOREGROUND_COLOR, TERMINAL_FOREGROUND_COLOR, TERMINAL_CURSOR_FOREGROUND_COLOR, TERMINAL_CURSOR_BACKGROUND_COLOR, TERMINAL_SELECTION_BACKGROUND_COLOR, TERMINAL_INACTIVE_SELECTION_BACKGROUND_COLOR, TERMINAL_SELECTION_FOREGROUND_COLOR, ansiColorIdentifiers } from '../../common/terminalColorRegistry.js';
 import { ShellIntegrationAddon } from '../../../../../platform/terminal/common/xterm/shellIntegrationAddon.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { DecorationAddon } from './decorationAddon.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
 import { SuggestAddon } from './suggestAddon.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { TerminalContextKeys } from '../../common/terminalContextKey.js';
-import { IClipboardService } from 'monaco-editor/esm/vs/platform/clipboard/common/clipboardService.js';
-import { debounce } from 'monaco-editor/esm/vs/base/common/decorators.js';
-import { MouseWheelClassifier } from 'monaco-editor/esm/vs/base/browser/ui/scrollbar/scrollableElement.js';
-import { StandardWheelEvent } from 'monaco-editor/esm/vs/base/browser/mouseEvent.js';
-import { IAccessibleNotificationService } from 'monaco-editor/esm/vs/platform/accessibility/common/accessibility.js';
-import { ILayoutService } from 'monaco-editor/esm/vs/platform/layout/browser/layoutService.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { debounce } from '../../../../../base/common/decorators.js';
+import { MouseWheelClassifier } from '../../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { StandardWheelEvent } from '../../../../../base/browser/mouseEvent.js';
+import { IAccessibleNotificationService } from '../../../../../platform/accessibility/common/accessibility.js';
+import { ILayoutService } from '../../../../../platform/layout/browser/layoutService.js';
 var XtermTerminal_1;
 let CanvasAddon;
 let ImageAddon;
@@ -69,7 +69,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         if (!this.raw.element) {
             return false;
         }
-        return dom.isAncestorOfActiveElement(this.raw.element);
+        return isAncestorOfActiveElement(this.raw.element);
     }
     constructor(xtermCtor, _configHelper, cols, rows, _xtermColorProvider, _capabilities, shellIntegrationNonce, _terminalSuggestWidgetVisibleContextKey, disableShellIntegrationReporting, _configurationService, _instantiationService, _logService, _notificationService, _storageService, _themeService, _telemetryService, _clipboardService, contextKeyService, _accessibleNotificationService, layoutService) {
         super();
@@ -104,7 +104,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         this.onDidChangeFocus = this._onDidChangeFocus.event;
         this._onDidDispose = this._register(( new Emitter()));
         this.onDidDispose = this._onDidDispose.event;
-        const font = this._configHelper.getFont(dom.getActiveWindow(), undefined, true);
+        const font = this._configHelper.getFont(getActiveWindow(), undefined, true);
         const config = this._configHelper.config;
         const editorOptions = this._configurationService.getValue('editor');
         this.raw = this._register(( new xtermCtor({
@@ -240,10 +240,10 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         }
         const ad = this._attachedDisposables;
         ad.clear();
-        ad.add(dom.addDisposableListener(this.raw.textarea, 'focus', () => this._setFocused(true)));
-        ad.add(dom.addDisposableListener(this.raw.textarea, 'blur', () => this._setFocused(false)));
-        ad.add(dom.addDisposableListener(this.raw.textarea, 'focusout', () => this._setFocused(false)));
-        ad.add(dom.addDisposableListener(this.raw.element, dom.EventType.MOUSE_WHEEL, (e) => {
+        ad.add(addDisposableListener(this.raw.textarea, 'focus', () => this._setFocused(true)));
+        ad.add(addDisposableListener(this.raw.textarea, 'blur', () => this._setFocused(false)));
+        ad.add(addDisposableListener(this.raw.textarea, 'focusout', () => this._setFocused(false)));
+        ad.add(addDisposableListener(this.raw.element, EventType.MOUSE_WHEEL, (e) => {
             const classifier = MouseWheelClassifier.INSTANCE;
             classifier.acceptStandardWheelEvent(( new StandardWheelEvent(e)));
             const value = classifier.isPhysicalMouseWheel();
@@ -375,7 +375,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         this._searchAddon?.clearActiveDecoration();
     }
     getFont() {
-        return this._configHelper.getFont(dom.getWindow(this.raw.element), this._core);
+        return this._configHelper.getFont(getWindow(this.raw.element), this._core);
     }
     getLongestViewportWrappedLineLength() {
         let maxLineLength = 0;
@@ -473,7 +473,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
                     e.clipboardData.setData('text/html', textAsHtml);
                     e.preventDefault();
                 }
-                const doc = dom.getDocument(this.raw.element);
+                const doc = getDocument(this.raw.element);
                 doc.addEventListener('copy', listener);
                 doc.execCommand('copy');
                 doc.removeEventListener('copy', listener);

package/vscode/src/vs/workbench/contrib/terminal/common/environmentVariable.js

@@ -1,3 +1,3 @@
-import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 const IEnvironmentVariableService = ( createDecorator('environmentVariableService'));
 export { IEnvironmentVariableService };

package/vscode/src/vs/workbench/contrib/terminal/common/terminal.js

@@ -1,5 +1,5 @@
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { localizeWithPath } from '../../../../nls.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 const TERMINAL_VIEW_ID = 'terminal';
 const TERMINAL_CREATION_COMMANDS = ['workbench.action.terminal.toggleTerminal', 'workbench.action.terminal.new', 'workbench.action.togglePanel', 'workbench.action.terminal.focus'];
 const TERMINAL_CONFIG_SECTION = 'terminal.integrated';
@@ -169,7 +169,7 @@ const terminalContributionsDescriptor = {
         }
     },
     jsonSchema: {
-        description: ( nls.localizeWithPath(
+        description: ( localizeWithPath(
             'vs/workbench/contrib/terminal/common/terminal',
             'vscode.extension.contributes.terminal',
             'Contributes terminal functionality.'
@@ -178,7 +178,7 @@ const terminalContributionsDescriptor = {
         properties: {
             profiles: {
                 type: 'array',
-                description: ( nls.localizeWithPath(
+                description: ( localizeWithPath(
                     'vs/workbench/contrib/terminal/common/terminal',
                     'vscode.extension.contributes.terminal.profiles',
                     "Defines additional terminal profiles that the user can create."
@@ -194,7 +194,7 @@ const terminalContributionsDescriptor = {
                         }],
                     properties: {
                         id: {
-                            description: ( nls.localizeWithPath(
+                            description: ( localizeWithPath(
                                 'vs/workbench/contrib/terminal/common/terminal',
                                 'vscode.extension.contributes.terminal.profiles.id',
                                 "The ID of the terminal profile provider."
@@ -202,7 +202,7 @@ const terminalContributionsDescriptor = {
                             type: 'string',
                         },
                         title: {
-                            description: ( nls.localizeWithPath(
+                            description: ( localizeWithPath(
                                 'vs/workbench/contrib/terminal/common/terminal',
                                 'vscode.extension.contributes.terminal.profiles.title',
                                 "Title for this terminal profile."
@@ -210,7 +210,7 @@ const terminalContributionsDescriptor = {
                             type: 'string',
                         },
                         icon: {
-                            description: ( nls.localizeWithPath(
+                            description: ( localizeWithPath(
                                 'vs/workbench/contrib/terminal/common/terminal',
                                 'vscode.extension.contributes.terminal.types.icon',
                                 "A codicon, URI, or light and dark URIs to associate with this terminal type."
@@ -222,7 +222,7 @@ const terminalContributionsDescriptor = {
                                     type: 'object',
                                     properties: {
                                         light: {
-                                            description: ( nls.localizeWithPath(
+                                            description: ( localizeWithPath(
                                                 'vs/workbench/contrib/terminal/common/terminal',
                                                 'vscode.extension.contributes.terminal.types.icon.light',
                                                 'Icon path when a light theme is used'
@@ -230,7 +230,7 @@ const terminalContributionsDescriptor = {
                                             type: 'string'
                                         },
                                         dark: {
-                                            description: ( nls.localizeWithPath(
+                                            description: ( localizeWithPath(
                                                 'vs/workbench/contrib/terminal/common/terminal',
                                                 'vscode.extension.contributes.terminal.types.icon.dark',
                                                 'Icon path when a dark theme is used'

package/vscode/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.js

@@ -1,8 +1,8 @@
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { registerColor, editorSelectionBackground, transparent, editorFindMatch, editorHoverHighlight, editorFindMatchHighlight, overviewRulerFindMatchForeground } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
+import { localizeWithPath } from '../../../../nls.js';
+import { registerColor, editorSelectionBackground, transparent, editorFindMatch, editorHoverHighlight, editorFindMatchHighlight, overviewRulerFindMatchForeground } from '../../../../platform/theme/common/colorRegistry.js';
 import { PANEL_BORDER, EDITOR_DRAG_AND_DROP_BACKGROUND, TAB_ACTIVE_BORDER } from '../../../common/theme.js';
 const ansiColorIdentifiers = [];
-const TERMINAL_BACKGROUND_COLOR = registerColor('terminal.background', null, ( nls.localizeWithPath(
+const TERMINAL_BACKGROUND_COLOR = registerColor('terminal.background', null, ( localizeWithPath(
     'vs/workbench/contrib/terminal/common/terminalColorRegistry',
     'terminal.background',
     'The background color of the terminal, this allows coloring the terminal differently to the panel.'
@@ -12,17 +12,17 @@ const TERMINAL_FOREGROUND_COLOR = registerColor('terminal.foreground', {
     dark: '#CCCCCC',
     hcDark: '#FFFFFF',
     hcLight: '#292929'
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/terminal/common/terminalColorRegistry',
     'terminal.foreground',
     'The foreground color of the terminal.'
 )));
-const TERMINAL_CURSOR_FOREGROUND_COLOR = registerColor('terminalCursor.foreground', null, ( nls.localizeWithPath(
+const TERMINAL_CURSOR_FOREGROUND_COLOR = registerColor('terminalCursor.foreground', null, ( localizeWithPath(
     'vs/workbench/contrib/terminal/common/terminalColorRegistry',
     'terminalCursor.foreground',
     'The foreground color of the terminal cursor.'
 )));
-const TERMINAL_CURSOR_BACKGROUND_COLOR = registerColor('terminalCursor.background', null, ( nls.localizeWithPath(
+const TERMINAL_CURSOR_BACKGROUND_COLOR = registerColor('terminalCursor.background', null, ( localizeWithPath(
     'vs/workbench/contrib/terminal/common/terminalColorRegistry',
     'terminalCursor.background',
     'The background color of the terminal cursor. Allows customizing the color of a character overlapped by a block cursor.'
@@ -32,7 +32,7 @@ const TERMINAL_SELECTION_BACKGROUND_COLOR = registerColor('terminal.selectionBac
     dark: editorSelectionBackground,
     hcDark: editorSelectionBackground,
     hcLight: editorSelectionBackground
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/terminal/common/terminalColorRegistry',
     'terminal.selectionBackground',
     'The selection background color of the terminal.'
@@ -42,7 +42,7 @@ const TERMINAL_INACTIVE_SELECTION_BACKGROUND_COLOR = registerColor('terminal.ina
     dark: ( transparent(TERMINAL_SELECTION_BACKGROUND_COLOR, 0.5)),
     hcDark: ( transparent(TERMINAL_SELECTION_BACKGROUND_COLOR, 0.7)),
     hcLight: ( transparent(TERMINAL_SELECTION_BACKGROUND_COLOR, 0.5))
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/terminal/common/terminalColorRegistry',
     'terminal.inactiveSelectionBackground',
     'The selection background color of the terminal when it does not have focus.'
@@ -52,7 +52,7 @@ const TERMINAL_SELECTION_FOREGROUND_COLOR = registerColor('terminal.selectionFor
     dark: null,
     hcDark: '#000000',
     hcLight: '#ffffff'
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/terminal/common/terminalColorRegistry',
     'terminal.selectionForeground',
     'The selection foreground color of the terminal. When this is null the selection foreground will be retained and have the minimum contrast ratio feature applied.'
@@ -62,7 +62,7 @@ const TERMINAL_COMMAND_DECORATION_DEFAULT_BACKGROUND_COLOR = registerColor('term
     dark: '#ffffff40',
     hcDark: '#ffffff80',
     hcLight: '#00000040',
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/terminal/common/terminalColorRegistry',
     'terminalCommandDecoration.defaultBackground',
     'The default terminal command decoration background color.'
@@ -72,7 +72,7 @@ const TERMINAL_COMMAND_DECORATION_SUCCESS_BACKGROUND_COLOR = registerColor('term
     light: '#2090D3',
     hcDark: '#1B81A8',
     hcLight: '#007100'
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/terminal/common/terminalColorRegistry',
     'terminalCommandDecoration.successBackground',
     'The terminal command decoration background color for successful commands.'
@@ -82,7 +82,7 @@ const TERMINAL_COMMAND_DECORATION_ERROR_BACKGROUND_COLOR = registerColor('termin
     light: '#E51400',
     hcDark: '#F14C4C',
     hcLight: '#B5200D'
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/terminal/common/terminalColorRegistry',
     'terminalCommandDecoration.errorBackground',
     'The terminal command decoration background color for error commands.'
@@ -92,7 +92,7 @@ const TERMINAL_OVERVIEW_RULER_CURSOR_FOREGROUND_COLOR = registerColor('terminalO
     light: '#A0A0A0CC',
     hcDark: '#A0A0A0CC',
     hcLight: '#A0A0A0CC'
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/terminal/common/terminalColorRegistry',
     'terminalOverviewRuler.cursorForeground',
     'The overview ruler cursor color.'
@@ -102,7 +102,7 @@ registerColor('terminal.border', {
     light: PANEL_BORDER,
     hcDark: PANEL_BORDER,
     hcLight: PANEL_BORDER
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/terminal/common/terminalColorRegistry',
     'terminal.border',
     'The color of the border that separates split panes within the terminal. This defaults to panel.border.'
@@ -112,7 +112,7 @@ const TERMINAL_FIND_MATCH_BACKGROUND_COLOR = registerColor('terminal.findMatchBa
     light: editorFindMatch,
     hcDark: null,
     hcLight: '#0F4A85'
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/terminal/common/terminalColorRegistry',
     'terminal.findMatchBackground',
     'Color of the current search match in the terminal. The color must not be opaque so as not to hide underlying terminal content.'
@@ -122,7 +122,7 @@ registerColor('terminal.hoverHighlightBackground', {
     light: ( transparent(editorHoverHighlight, 0.5)),
     hcDark: ( transparent(editorHoverHighlight, 0.5)),
     hcLight: ( transparent(editorHoverHighlight, 0.5))
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/terminal/common/terminalColorRegistry',
     'terminal.findMatchHighlightBorder',
     'Border color of the other search matches in the terminal.'
@@ -132,7 +132,7 @@ const TERMINAL_FIND_MATCH_BORDER_COLOR = registerColor('terminal.findMatchBorder
     light: null,
     hcDark: '#f38518',
     hcLight: '#0F4A85'
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/terminal/common/terminalColorRegistry',
     'terminal.findMatchBorder',
     'Border color of the current search match in the terminal.'
@@ -142,7 +142,7 @@ const TERMINAL_FIND_MATCH_HIGHLIGHT_BACKGROUND_COLOR = registerColor('terminal.f
     light: editorFindMatchHighlight,
     hcDark: null,
     hcLight: null
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/terminal/common/terminalColorRegistry',
     'terminal.findMatchHighlightBackground',
     'Color of the other search matches in the terminal. The color must not be opaque so as not to hide underlying terminal content.'
@@ -152,7 +152,7 @@ const TERMINAL_FIND_MATCH_HIGHLIGHT_BORDER_COLOR = registerColor('terminal.findM
     light: null,
     hcDark: '#f38518',
     hcLight: '#0F4A85'
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/terminal/common/terminalColorRegistry',
     'terminal.findMatchHighlightBorder',
     'Border color of the other search matches in the terminal.'
@@ -162,7 +162,7 @@ const TERMINAL_OVERVIEW_RULER_FIND_MATCH_FOREGROUND_COLOR = registerColor('termi
     light: overviewRulerFindMatchForeground,
     hcDark: '#f38518',
     hcLight: '#0F4A85'
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/terminal/common/terminalColorRegistry',
     'terminalOverviewRuler.findMatchHighlightForeground',
     'Overview ruler marker color for find matches in the terminal.'
@@ -172,7 +172,7 @@ registerColor('terminal.dropBackground', {
     light: EDITOR_DRAG_AND_DROP_BACKGROUND,
     hcDark: EDITOR_DRAG_AND_DROP_BACKGROUND,
     hcLight: EDITOR_DRAG_AND_DROP_BACKGROUND
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/terminal/common/terminalColorRegistry',
     'terminal.dragAndDropBackground',
     "Background color when dragging on top of terminals. The color should have transparency so that the terminal contents can still shine through."
@@ -182,7 +182,7 @@ registerColor('terminal.tab.activeBorder', {
     light: TAB_ACTIVE_BORDER,
     hcDark: TAB_ACTIVE_BORDER,
     hcLight: TAB_ACTIVE_BORDER
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/terminal/common/terminalColorRegistry',
     'terminal.tab.activeBorder',
     'Border on the side of the terminal tab in the panel. This defaults to tab.activeBorder.'
@@ -337,7 +337,7 @@ function registerColors() {
     for (const id in ansiColorMap) {
         const entry = ansiColorMap[id];
         const colorName = id.substring(13);
-        ansiColorIdentifiers[entry.index] = registerColor(id, entry.defaults, ( nls.localizeWithPath(
+        ansiColorIdentifiers[entry.index] = registerColor(id, entry.defaults, ( localizeWithPath(
             'vs/workbench/contrib/terminal/common/terminalColorRegistry',
             'terminal.ansiColor',
             '\'{0}\' ANSI color in the terminal.',

package/vscode/src/vs/workbench/contrib/terminal/common/terminalContextKey.js

@@ -1,5 +1,5 @@
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { localizeWithPath } from '../../../../nls.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 var TerminalContextKeys;
 ( (function(TerminalContextKeys) {
     TerminalContextKeys.isOpen = ( new RawContextKey("terminalIsOpen" , false, true));

package/vscode/src/vs/workbench/contrib/terminal/common/terminalExtensionPoints.js

@@ -1,7 +1,7 @@
 import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
 import { terminalContributionsDescriptor } from './terminal.js';
-import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { URI } from '../../../../base/common/uri.js';
 const terminalsExtPoint = ( ExtensionsRegistry.registerExtensionPoint(terminalContributionsDescriptor));
 const ITerminalContributionService = ( createDecorator('terminalContributionsService'));
 class TerminalContributionService {

package/vscode/src/vs/workbench/contrib/terminalContrib/links/browser/links.js

@@ -1,3 +1,3 @@
-import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
 const ITerminalLinkProviderService = ( createDecorator('terminalLinkProviderService'));
 export { ITerminalLinkProviderService };

package/vscode/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix.js

@@ -1,4 +1,4 @@
-import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
 const ITerminalQuickFixService = ( createDecorator('terminalQuickFixService'));
 var TerminalQuickFixType;
 ( (function(TerminalQuickFixType) {

package/vscode/src/vs/workbench/contrib/testing/common/getComputedState.js

@@ -1,4 +1,4 @@
-import { Iterable } from 'monaco-editor/esm/vs/base/common/iterator.js';
+import { Iterable } from '../../../../base/common/iterator.js';
 import { statePriority, maxPriority, makeEmptyCounts } from './testingStates.js';
 const isDurationAccessor = (accessor) => 'getOwnDuration' in accessor;
 const getComputedState = (accessor, node, force = false) => {

package/vscode/src/vs/workbench/contrib/testing/common/observableValue.js

@@ -1,5 +1,5 @@
-import { Event, Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 const staticObservableValue = (value) => ({
     onDidChange: Event.None,
     value,

package/vscode/src/vs/workbench/contrib/testing/common/storedValue.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
 const defaultSerialization = {
     deserialize: d => JSON.parse(d),
     serialize: d => JSON.stringify(d),