@codingame/monaco-vscode-api 1.85.6 → 2.0.0-v2.1

package/vscode/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.js

@@ -1,12 +1,12 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { Action } from 'monaco-editor/esm/vs/base/common/actions.js';
-import { IContextViewService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
-import { SelectActionViewItem } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionViewItems.js';
-import { defaultSelectBoxStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
-import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
-import { peekViewTitleBackground } from 'monaco-editor/esm/vs/editor/contrib/peekView/browser/peekView.js';
-import { editorBackground } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
+import { localizeWithPath } from '../../../../nls.js';
+import { Action } from '../../../../base/common/actions.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { SelectActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { defaultSelectBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { peekViewTitleBackground } from '../../../../editor/contrib/peekView/browser/peekView.js';
+import { editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
 let SwitchQuickDiffViewItem = class SwitchQuickDiffViewItem extends SelectActionViewItem {
     constructor(action, providers, selected, contextViewService, themeService) {
         const items = ( providers.map(provider => ({ provider, text: provider })));
@@ -20,7 +20,7 @@ let SwitchQuickDiffViewItem = class SwitchQuickDiffViewItem extends SelectAction
         const peekTitleColor = theme.getColor(peekViewTitleBackground);
         const opaqueTitleColor = peekTitleColor?.makeOpaque(editorBackgroundColor) ?? editorBackgroundColor;
         styles.selectBackground = ( ( opaqueTitleColor.lighten(.6)).toString());
-        super(null, action, items, startingSelection, contextViewService, styles, { ariaLabel: ( nls.localizeWithPath(
+        super(null, action, items, startingSelection, contextViewService, styles, { ariaLabel: ( localizeWithPath(
             'vs/workbench/contrib/scm/browser/dirtyDiffSwitcher',
             'remotes',
             'Switch quick diff base'
@@ -45,7 +45,7 @@ SwitchQuickDiffViewItem = ( __decorate([
 ], SwitchQuickDiffViewItem));
 class SwitchQuickDiffBaseAction extends Action {
     static { this.ID = 'quickDiff.base.switch'; }
-    static { this.LABEL = ( nls.localizeWithPath(
+    static { this.LABEL = ( localizeWithPath(
         'vs/workbench/contrib/scm/browser/dirtyDiffSwitcher',
         'quickDiff.base.switch',
         "Switch Quick Diff Base"

package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js

@@ -1,47 +1,47 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from '../../../../nls.js';
 import './media/dirtydiffDecorator.css.js';
-import { ThrottledDelayer } from 'monaco-editor/esm/vs/base/common/async.js';
-import { Disposable, DisposableStore, toDisposable, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Event, Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { ITextModelService } from 'monaco-editor/esm/vs/editor/common/services/resolverService.js';
-import { IEditorWorkerService } from 'monaco-editor/esm/vs/editor/common/services/editorWorker.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+import { ThrottledDelayer } from '../../../../base/common/async.js';
+import { Disposable, DisposableStore, toDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import { Event, Emitter } from '../../../../base/common/event.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ISCMService } from '../common/scm.js';
-import { ModelDecorationOptions } from 'monaco-editor/esm/vs/editor/common/model/textModel.js';
-import { IThemeService, themeColorFromId } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
-import { registerColor, editorErrorForeground, transparent } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
-import { isCodeEditor } from 'monaco-editor/esm/vs/editor/browser/editorBrowser.js';
-import { registerEditorAction, registerEditorContribution, EditorAction } from 'monaco-editor/esm/vs/editor/browser/editorExtensions.js';
-import { getOuterEditor, PeekViewWidget, peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground } from 'monaco-editor/esm/vs/editor/contrib/peekView/browser/peekView.js';
-import { ContextKeyExpr, RawContextKey, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { EditorContextKeys } from 'monaco-editor/esm/vs/editor/common/editorContextKeys.js';
-import { Position } from 'monaco-editor/esm/vs/editor/common/core/position.js';
-import { rot } from 'monaco-editor/esm/vs/base/common/numbers.js';
-import { KeybindingsRegistry } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
-import { EmbeddedDiffEditorWidget } from 'monaco-editor/esm/vs/editor/browser/widget/embeddedCodeEditorWidget.js';
-import { Action, ActionRunner } from 'monaco-editor/esm/vs/base/common/actions.js';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { basename } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { MenuRegistry, MenuId, IMenuService, MenuItemAction } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { createAndFillInActionBarActions } from 'monaco-editor/esm/vs/platform/actions/browser/menuEntryActionViewItem.js';
-import { shouldSynchronizeModel, OverviewRulerLane, MinimapPosition } from 'monaco-editor/esm/vs/editor/common/model.js';
-import { sortedDiff, equals } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
+import { IThemeService, themeColorFromId } from '../../../../platform/theme/common/themeService.js';
+import { registerColor, editorErrorForeground, transparent } from '../../../../platform/theme/common/colorRegistry.js';
+import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { registerEditorAction, registerEditorContribution, EditorAction } from '../../../../editor/browser/editorExtensions.js';
+import { getOuterEditor, PeekViewWidget, peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground } from '../../../../editor/contrib/peekView/browser/peekView.js';
+import { ContextKeyExpr, RawContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { rot } from '../../../../base/common/numbers.js';
+import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/embeddedCodeEditorWidget.js';
+import { Action, ActionRunner } from '../../../../base/common/actions.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { basename } from '../../../../base/common/resources.js';
+import { MenuRegistry, MenuId, IMenuService, MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { shouldSynchronizeModel, OverviewRulerLane, MinimapPosition } from '../../../../editor/common/model.js';
+import { sortedDiff, equals } from '../../../../base/common/arrays.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { createStyleSheet, prepend, $ } from '../../../../base/browser/dom.js';
 import { isTextFileEditorModel, ITextFileService } from '../../../services/textfile/common/textfiles.js';
-import { gotoPreviousLocation, gotoNextLocation } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
-import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
-import { onUnexpectedError } from 'monaco-editor/esm/vs/base/common/errors.js';
+import { gotoPreviousLocation, gotoNextLocation } from '../../../../platform/theme/common/iconRegistry.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { TextCompareEditorActiveContext } from '../../../common/contextkeys.js';
-import { IProgressService } from 'monaco-editor/esm/vs/platform/progress/common/progress.js';
-import { Color } from 'monaco-editor/esm/vs/base/common/color.js';
-import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
+import { IProgressService } from '../../../../platform/progress/common/progress.js';
+import { Color } from '../../../../base/common/color.js';
+import { ResourceMap } from '../../../../base/common/map.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
-import { IAudioCueService, AudioCue } from 'monaco-editor/esm/vs/platform/audioCues/browser/audioCueService.js';
-import { IAccessibilityService } from 'monaco-editor/esm/vs/platform/accessibility/common/accessibility.js';
+import { IAudioCueService, AudioCue } from '../../../../platform/audioCues/browser/audioCueService.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
 import { IQuickDiffService } from '../common/quickDiff.js';
 import { SwitchQuickDiffViewItem, SwitchQuickDiffBaseAction } from './dirtyDiffSwitcher.js';
 var DirtyDiffController_1, DirtyDiffDecorator_1;
@@ -217,7 +217,7 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         let detail;
         if (!this.shouldUseDropdown()) {
             detail = this.model.changes.length > 1
-                ? ( nls.localizeWithPath(
+                ? ( localizeWithPath(
                 'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
                 'changes',
                 "{0} - {1} of {2} changes",
@@ -225,7 +225,7 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
                 providerIndex + 1,
                 providerChanges.length
             ))
-                : ( nls.localizeWithPath(
+                : ( localizeWithPath(
                 'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
                 'change',
                 "{0} - {1} of {2} change",
@@ -237,14 +237,14 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         }
         else {
             detail = this.model.changes.length > 1
-                ? ( nls.localizeWithPath(
+                ? ( localizeWithPath(
                 'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
                 'multiChanges',
                 "{0} of {1} changes",
                 providerIndex + 1,
                 providerChanges.length
             ))
-                : ( nls.localizeWithPath(
+                : ( localizeWithPath(
                 'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
                 'multiChange',
                 "{0} of {1} change",
@@ -308,7 +308,7 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         this._actionbarWidget.clear();
         this._actionbarWidget.push(actions.reverse(), { label: false, icon: true });
         this._actionbarWidget.push([next, previous], { label: false, icon: true });
-        this._actionbarWidget.push(( new Action('peekview.close', ( nls.localizeWithPath(
+        this._actionbarWidget.push(( new Action('peekview.close', ( localizeWithPath(
             'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
             'label.close',
             "Close"
@@ -316,7 +316,7 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
     }
     _fillHead(container) {
         super._fillHead(container, true);
-        this.dropdownContainer = dom.prepend(this._titleElement, dom.$('.dropdown'));
+        this.dropdownContainer = prepend(this._titleElement, $('.dropdown'));
         this.dropdown = this.instantiationService.createInstance(SwitchQuickDiffViewItem, ( new SwitchQuickDiffBaseAction((event) => this.switchQuickDiff(event))), ( this.model.quickDiffs.map(quickDiffer => quickDiffer.label)), this.model.changes[this._index].label);
         this.dropdown.render(this.dropdownContainer);
         this.updateActions();
@@ -416,7 +416,7 @@ class ShowPreviousChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: 'editor.action.dirtydiff.previous',
-            label: ( nls.localizeWithPath(
+            label: ( localizeWithPath(
                 'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
                 'show previous change',
                 "Show Previous Change"
@@ -447,7 +447,7 @@ class ShowNextChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: 'editor.action.dirtydiff.next',
-            label: ( nls.localizeWithPath(
+            label: ( localizeWithPath(
                 'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
                 'show next change',
                 "Show Next Change"
@@ -478,7 +478,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '7_change_nav',
     command: {
         id: 'editor.action.dirtydiff.next',
-        title: ( nls.localizeWithPath(
+        title: ( localizeWithPath(
             'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
             { key: 'miGotoNextChange', comment: ['&& denotes a mnemonic'] },
             "Next &&Change"
@@ -490,7 +490,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '7_change_nav',
     command: {
         id: 'editor.action.dirtydiff.previous',
-        title: ( nls.localizeWithPath(
+        title: ( localizeWithPath(
             'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
             { key: 'miGotoPreviousChange', comment: ['&& denotes a mnemonic'] },
             "Previous &&Change"
@@ -502,7 +502,7 @@ class GotoPreviousChangeAction extends EditorAction {
     constructor() {
         super({
             id: 'workbench.action.editor.previousChange',
-            label: ( nls.localizeWithPath(
+            label: ( localizeWithPath(
                 'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
                 'move to previous change',
                 "Go to Previous Change"
@@ -540,7 +540,7 @@ class GotoNextChangeAction extends EditorAction {
     constructor() {
         super({
             id: 'workbench.action.editor.nextChange',
-            label: ( nls.localizeWithPath(
+            label: ( localizeWithPath(
                 'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
                 'move to next change',
                 "Go to Next Change"
@@ -634,7 +634,7 @@ let DirtyDiffController = class DirtyDiffController extends Disposable {
         this.enabled = false;
         this.gutterActionDisposables = ( new DisposableStore());
         this.enabled = !contextKeyService.getContextKeyValue('isInDiffEditor');
-        this.stylesheet = dom.createStyleSheet(undefined, undefined, this._store);
+        this.stylesheet = createStyleSheet(undefined, undefined, this._store);
         if (this.enabled) {
             this.isDirtyDiffVisible = isDirtyDiffVisible.bindTo(contextKeyService);
             this._register(editor.onDidChangeModel(() => this.close()));
@@ -861,7 +861,7 @@ const editorGutterModifiedBackground = registerColor('editorGutter.modifiedBackg
     light: '#2090D3',
     hcDark: '#1B81A8',
     hcLight: '#2090D3'
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
     'editorGutterModifiedBackground',
     "Editor gutter background color for lines that are modified."
@@ -871,7 +871,7 @@ const editorGutterAddedBackground = registerColor('editorGutter.addedBackground'
     light: '#48985D',
     hcDark: '#487E02',
     hcLight: '#48985D'
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
     'editorGutterAddedBackground',
     "Editor gutter background color for lines that are added."
@@ -881,7 +881,7 @@ const editorGutterDeletedBackground = registerColor('editorGutter.deletedBackgro
     light: editorErrorForeground,
     hcDark: editorErrorForeground,
     hcLight: editorErrorForeground
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
     'editorGutterDeletedBackground',
     "Editor gutter background color for lines that are deleted."
@@ -891,7 +891,7 @@ const minimapGutterModifiedBackground = registerColor('minimapGutter.modifiedBac
     light: editorGutterModifiedBackground,
     hcDark: editorGutterModifiedBackground,
     hcLight: editorGutterModifiedBackground
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
     'minimapGutterModifiedBackground',
     "Minimap gutter background color for lines that are modified."
@@ -901,7 +901,7 @@ const minimapGutterAddedBackground = registerColor('minimapGutter.addedBackgroun
     light: editorGutterAddedBackground,
     hcDark: editorGutterAddedBackground,
     hcLight: editorGutterAddedBackground
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
     'minimapGutterAddedBackground',
     "Minimap gutter background color for lines that are added."
@@ -911,22 +911,22 @@ const minimapGutterDeletedBackground = registerColor('minimapGutter.deletedBackg
     light: editorGutterDeletedBackground,
     hcDark: editorGutterDeletedBackground,
     hcLight: editorGutterDeletedBackground
-}, ( nls.localizeWithPath(
+}, ( localizeWithPath(
     'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
     'minimapGutterDeletedBackground',
     "Minimap gutter background color for lines that are deleted."
 )));
-const overviewRulerModifiedForeground = registerColor('editorOverviewRuler.modifiedForeground', { dark: ( transparent(editorGutterModifiedBackground, 0.6)), light: ( transparent(editorGutterModifiedBackground, 0.6)), hcDark: ( transparent(editorGutterModifiedBackground, 0.6)), hcLight: ( transparent(editorGutterModifiedBackground, 0.6)) }, ( nls.localizeWithPath(
+const overviewRulerModifiedForeground = registerColor('editorOverviewRuler.modifiedForeground', { dark: ( transparent(editorGutterModifiedBackground, 0.6)), light: ( transparent(editorGutterModifiedBackground, 0.6)), hcDark: ( transparent(editorGutterModifiedBackground, 0.6)), hcLight: ( transparent(editorGutterModifiedBackground, 0.6)) }, ( localizeWithPath(
     'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
     'overviewRulerModifiedForeground',
     'Overview ruler marker color for modified content.'
 )));
-const overviewRulerAddedForeground = registerColor('editorOverviewRuler.addedForeground', { dark: ( transparent(editorGutterAddedBackground, 0.6)), light: ( transparent(editorGutterAddedBackground, 0.6)), hcDark: ( transparent(editorGutterAddedBackground, 0.6)), hcLight: ( transparent(editorGutterAddedBackground, 0.6)) }, ( nls.localizeWithPath(
+const overviewRulerAddedForeground = registerColor('editorOverviewRuler.addedForeground', { dark: ( transparent(editorGutterAddedBackground, 0.6)), light: ( transparent(editorGutterAddedBackground, 0.6)), hcDark: ( transparent(editorGutterAddedBackground, 0.6)), hcLight: ( transparent(editorGutterAddedBackground, 0.6)) }, ( localizeWithPath(
     'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
     'overviewRulerAddedForeground',
     'Overview ruler marker color for added content.'
 )));
-const overviewRulerDeletedForeground = registerColor('editorOverviewRuler.deletedForeground', { dark: ( transparent(editorGutterDeletedBackground, 0.6)), light: ( transparent(editorGutterDeletedBackground, 0.6)), hcDark: ( transparent(editorGutterDeletedBackground, 0.6)), hcLight: ( transparent(editorGutterDeletedBackground, 0.6)) }, ( nls.localizeWithPath(
+const overviewRulerDeletedForeground = registerColor('editorOverviewRuler.deletedForeground', { dark: ( transparent(editorGutterDeletedBackground, 0.6)), light: ( transparent(editorGutterDeletedBackground, 0.6)), hcDark: ( transparent(editorGutterDeletedBackground, 0.6)), hcLight: ( transparent(editorGutterDeletedBackground, 0.6)) }, ( localizeWithPath(
     'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
     'overviewRulerDeletedForeground',
     'Overview ruler marker color for deleted content.'
@@ -1352,7 +1352,7 @@ let DirtyDiffWorkbenchController = class DirtyDiffWorkbenchController extends Di
         this.viewState = { width: 3, visibility: 'always' };
         this.items = ( new ResourceMap());
         this.transientDisposables = this._register(( new DisposableStore()));
-        this.stylesheet = dom.createStyleSheet(undefined, undefined, this._store);
+        this.stylesheet = createStyleSheet(undefined, undefined, this._store);
         const onDidChangeConfiguration = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorations'));
         this._register(onDidChangeConfiguration(this.onDidChangeConfiguration, this));
         this.onDidChangeConfiguration();

package/vscode/src/vs/workbench/contrib/scm/common/quickDiff.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 IQuickDiffService = ( createDecorator('quickDiff'));
 export { IQuickDiffService };

package/vscode/src/vs/workbench/contrib/scm/common/scm.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 VIEWLET_ID = 'workbench.view.scm';
 const VIEW_PANE_ID = 'workbench.scm';
 const REPOSITORIES_VIEW_PANE_ID = 'workbench.scm.repositories';

package/vscode/src/vs/workbench/contrib/search/browser/notebookSearch/searchNotebookHelpers.js

@@ -1,5 +1,5 @@
 import { TextSearchMatch } from '../../../../services/search/common/search.js';
-import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
+import { Range } from '../../../../../editor/common/core/range.js';
 import { genericCellMatchesToTextSearchMatches, rawCellPrefix } from '../../common/searchNotebookHelpers.js';
 function getIDFromINotebookCellMatch(match) {
     if (isINotebookCellMatchWithModel(match)) {

package/vscode/src/vs/workbench/contrib/search/browser/replace.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 IReplaceService = ( createDecorator('replaceService'));
 export { IReplaceService };

package/vscode/src/vs/workbench/contrib/search/browser/searchActionsBase.js

@@ -1,15 +1,15 @@
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
+import { isAncestorOfActiveElement } from '../../../../base/browser/dom.js';
+import { localizeWithPath } from '../../../../nls.js';
 import { searchComparer, FileMatch, Match, FolderMatch } from './searchModel.js';
 import { VIEW_ID } from '../../../services/search/common/search.js';
-const category = { value: ( nls.localizeWithPath(
+const category = { value: ( localizeWithPath(
     'vs/workbench/contrib/search/browser/searchActionsBase',
     'search',
     "Search"
 )), original: 'Search' };
 function isSearchViewFocused(viewsService) {
     const searchView = getSearchView(viewsService);
-    return !!(searchView && dom.isAncestorOfActiveElement(searchView.getContainer()));
+    return !!(searchView && isAncestorOfActiveElement(searchView.getContainer()));
 }
 function appendKeyBindingLabel(label, inputKeyBinding) {
     return doAppendKeyBindingLabel(label, inputKeyBinding);

package/vscode/src/vs/workbench/contrib/search/browser/searchActionsFind.js

@@ -1,32 +1,32 @@
-import { dirname } from 'monaco-editor/esm/vs/base/common/resources.js';
-import * as nls from 'monaco-editor/esm/vs/nls.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 { IListService } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
+import { dirname } from '../../../../base/common/resources.js';
+import { localizeWithPath } from '../../../../nls.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IListService } from '../../../../platform/list/browser/listService.js';
 import { IViewsService } from '../../../common/views.js';
 import { RestrictSearchToFolderId, SearchViewVisibleKey, ResourceFolderFocusKey, ExcludeFolderFromSearchId, RevealInSideBarForSearchResults, FileFocusKey, HasSearchResults, FindInFilesActionId, FindInFolderId, FindInWorkspaceId } from '../common/constants.js';
 import { OpenEditorCommandId } from '../../searchEditor/browser/constants.js';
 import { FileMatch, Match } from './searchModel.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
-import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { registerAction2, Action2, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js';
 import { resolveResourcesForSearchIncludes } from '../../../services/search/common/queryBuilder.js';
 import { IExplorerService, getMultiSelectedResources } from '../../files/browser/files.js';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { VIEWLET_ID, FilesExplorerFocusCondition, ExplorerFolderContext, ExplorerRootContext } from '../../files/common/files.js';
 import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
-import { onUnexpectedError } from 'monaco-editor/esm/vs/base/common/errors.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { category, getSearchView, openSearchView, getElementsToOperateOn } from './searchActionsBase.js';
 import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
 import { IHistoryService } from '../../../services/history/common/history.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
+import { Schemas } from '../../../../base/common/network.js';
 registerAction2(class RestrictSearchToFolderAction extends Action2 {
     constructor() {
         super({
             id: RestrictSearchToFolderId,
             title: {
-                value: ( nls.localizeWithPath(
+                value: ( localizeWithPath(
                     'vs/workbench/contrib/search/browser/searchActionsFind',
                     'restrictResultsToFolder',
                     "Restrict Search to Folder"
@@ -58,7 +58,7 @@ registerAction2(class ExcludeFolderFromSearchAction extends Action2 {
         super({
             id: ExcludeFolderFromSearchId,
             title: {
-                value: ( nls.localizeWithPath(
+                value: ( localizeWithPath(
                     'vs/workbench/contrib/search/browser/searchActionsFind',
                     'excludeFolderFromSearch',
                     "Exclude Folder from Search"
@@ -85,7 +85,7 @@ registerAction2(class RevealInSideBarForSearchResultsAction extends Action2 {
         super({
             id: RevealInSideBarForSearchResults,
             title: {
-                value: ( nls.localizeWithPath(
+                value: ( localizeWithPath(
                     'vs/workbench/contrib/search/browser/searchActionsFind',
                     'revealInSideBar',
                     "Reveal in Explorer View"
@@ -138,12 +138,12 @@ registerAction2(class FindInFilesAction extends Action2 {
         super({
             id: FindInFilesActionId,
             title: {
-                value: ( nls.localizeWithPath(
+                value: ( localizeWithPath(
                     'vs/workbench/contrib/search/browser/searchActionsFind',
                     'findInFiles',
                     "Find in Files"
                 )),
-                mnemonicTitle: ( nls.localizeWithPath(
+                mnemonicTitle: ( localizeWithPath(
                     'vs/workbench/contrib/search/browser/searchActionsFind',
                     { key: 'miFindInFiles', comment: ['&& denotes a mnemonic'] },
                     "Find &&in Files"
@@ -151,14 +151,14 @@ registerAction2(class FindInFilesAction extends Action2 {
                 original: 'Find in Files'
             },
             metadata: {
-                description: ( nls.localizeWithPath(
+                description: ( localizeWithPath(
                     'vs/workbench/contrib/search/browser/searchActionsFind',
                     'findInFiles.description',
                     "Open a workspace search"
                 )),
                 args: [
                     {
-                        name: ( nls.localizeWithPath(
+                        name: ( localizeWithPath(
                             'vs/workbench/contrib/search/browser/searchActionsFind',
                             'findInFiles.args',
                             "A set of options for the search"
@@ -204,7 +204,7 @@ registerAction2(class FindInFolderAction extends Action2 {
         super({
             id: FindInFolderId,
             title: {
-                value: ( nls.localizeWithPath(
+                value: ( localizeWithPath(
                     'vs/workbench/contrib/search/browser/searchActionsFind',
                     'findInFolder',
                     "Find in Folder..."
@@ -236,7 +236,7 @@ registerAction2(class FindInWorkspaceAction extends Action2 {
         super({
             id: FindInWorkspaceId,
             title: {
-                value: ( nls.localizeWithPath(
+                value: ( localizeWithPath(
                     'vs/workbench/contrib/search/browser/searchActionsFind',
                     'findInWorkspace',
                     "Find in Workspace..."

package/vscode/src/vs/workbench/contrib/search/browser/searchModel.js

@@ -1,29 +1,29 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/async.js';
-import { CancellationToken, CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancellation.js';
-import { comparePaths, compareFileNames, compareFileExtensions } from 'monaco-editor/esm/vs/base/common/comparers.js';
-import { memoize } from 'monaco-editor/esm/vs/base/common/decorators.js';
-import * as errors from 'monaco-editor/esm/vs/base/common/errors.js';
-import { Emitter, PauseableEmitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Lazy } from 'monaco-editor/esm/vs/base/common/lazy.js';
-import { Disposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { lcut } from 'monaco-editor/esm/vs/base/common/strings.js';
-import { TernarySearchTree } from 'monaco-editor/esm/vs/base/common/ternarySearchTree.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
-import { OverviewRulerLane, MinimapPosition, FindMatch } from 'monaco-editor/esm/vs/editor/common/model.js';
-import { ModelDecorationOptions } from 'monaco-editor/esm/vs/editor/common/model/textModel.js';
-import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { createDecorator, IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
-import { overviewRulerFindMatchForeground, minimapFindMatch } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
-import { themeColorFromId } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
-import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { comparePaths, compareFileNames, compareFileExtensions } from '../../../../base/common/comparers.js';
+import { memoize } from '../../../../base/common/decorators.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
+import { Emitter, PauseableEmitter, Event } from '../../../../base/common/event.js';
+import { Lazy } from '../../../../base/common/lazy.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { lcut } from '../../../../base/common/strings.js';
+import { TernarySearchTree } from '../../../../base/common/ternarySearchTree.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { OverviewRulerLane, MinimapPosition, FindMatch } from '../../../../editor/common/model.js';
+import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService, createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { overviewRulerFindMatchForeground, minimapFindMatch } from '../../../../platform/theme/common/colorRegistry.js';
+import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { FindMatchDecorationModel } from '../../notebook/browser/contrib/find/findMatchDecorationModel.js';
 import { NotebookEditorWidget } from '../../notebook/browser/notebookEditorWidget.js';
 import { INotebookEditorService } from '../../notebook/browser/services/notebookEditorService.js';
@@ -1751,7 +1751,7 @@ let SearchModel = class SearchModel extends Disposable {
         return completed;
     }
     onSearchError(e, duration) {
-        if (errors.isCancellationError(e)) {
+        if (isCancellationError(e)) {
             this.onSearchCompleted(this.searchCancelledForNewSearch
                 ? { exit: 1 , results: [], messages: [] }
                 : null, duration, '');

package/vscode/src/vs/workbench/contrib/search/common/cellSearchModel.js

@@ -1,7 +1,7 @@
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
-import { PieceTreeTextBufferBuilder } from 'monaco-editor/esm/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.js';
-import { SearchParams } from 'monaco-editor/esm/vs/editor/common/model/textModelSearch.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { PieceTreeTextBufferBuilder } from '../../../../editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.js';
+import { SearchParams } from '../../../../editor/common/model/textModelSearch.js';
 class CellSearchModel extends Disposable {
     constructor(_source, _inputTextBuffer, _outputs) {
         super();

package/vscode/src/vs/workbench/contrib/search/common/constants.js

@@ -1,4 +1,4 @@
-import { RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 const FindInFilesActionId = 'workbench.action.findInFiles';
 const FocusSearchFromResults = 'search.action.focusSearchFromResults';
 const OpenMatch = 'search.action.openResult';

package/vscode/src/vs/workbench/contrib/search/common/notebookSearch.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 INotebookSearchService = ( createDecorator('notebookSearchService'));
 export { INotebookSearchService };

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

@@ -1,14 +1,14 @@
-import { onUnexpectedExternalError } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
+import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
-import { CancellationToken } from 'monaco-editor/esm/vs/base/common/cancellation.js';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
-import { isNumber } from 'monaco-editor/esm/vs/base/common/types.js';
-import { RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { compare } from 'monaco-editor/esm/vs/base/common/strings.js';
-import { groupBy } from 'monaco-editor/esm/vs/base/common/arrays.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { isNumber } from '../../../../base/common/types.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { compare } from '../../../../base/common/strings.js';
+import { groupBy } from '../../../../base/common/arrays.js';
 var WorkspaceSymbolProviderRegistry;
 ( (function(WorkspaceSymbolProviderRegistry) {
     const _supports = [];