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

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

package/vscode/src/vs/workbench/contrib/chat/common/chatModel.js

@@ -1,15 +1,15 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { asArray, firstOrDefault } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { DeferredPromise } from 'monaco-editor/esm/vs/base/common/async.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { isMarkdownString, MarkdownString } from 'monaco-editor/esm/vs/base/common/htmlContent.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { revive } from 'monaco-editor/esm/vs/base/common/marshalling.js';
-import { basename } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { generateUuid } from 'monaco-editor/esm/vs/base/common/uuid.js';
-import { OffsetRange } from 'monaco-editor/esm/vs/editor/common/core/offsetRange.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
+import { asArray, firstOrDefault } from '../../../../base/common/arrays.js';
+import { DeferredPromise } from '../../../../base/common/async.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { isMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { revive } from '../../../../base/common/marshalling.js';
+import { basename } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { OffsetRange } from '../../../../editor/common/core/offsetRange.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 import { IChatAgentService } from './chatAgents.js';
 import { reviveParsedChatRequest, ChatRequestTextPart } from './chatParserTypes.js';
 import { isIUsedContext } from './chatService.js';

package/vscode/src/vs/workbench/contrib/chat/common/chatParserTypes.js

@@ -1,5 +1,5 @@
-import { revive } from 'monaco-editor/esm/vs/base/common/marshalling.js';
-import { OffsetRange } from 'monaco-editor/esm/vs/editor/common/core/offsetRange.js';
+import { revive } from '../../../../base/common/marshalling.js';
+import { OffsetRange } from '../../../../editor/common/core/offsetRange.js';
 class ChatRequestTextPart {
     static { this.Kind = 'text'; }
     constructor(range, editorRange, text) {

package/vscode/src/vs/workbench/contrib/chat/common/chatProvider.js

@@ -1,5 +1,5 @@
-import { toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { toDisposable } from '../../../../base/common/lifecycle.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 const IChatProviderService = ( createDecorator('chatProviderService'));
 class ChatProviderService {
     constructor() {

package/vscode/src/vs/workbench/contrib/chat/common/chatRequestParser.js

@@ -1,8 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { CancellationToken } from 'monaco-editor/esm/vs/base/common/cancellation.js';
-import { OffsetRange } from 'monaco-editor/esm/vs/editor/common/core/offsetRange.js';
-import { Position } from 'monaco-editor/esm/vs/editor/common/core/position.js';
-import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { OffsetRange } from '../../../../editor/common/core/offsetRange.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
 import { IChatAgentService } from './chatAgents.js';
 import { chatVariableLeader, chatAgentLeader, chatSubcommandLeader, ChatRequestTextPart, ChatRequestAgentPart, ChatRequestVariablePart, ChatRequestSlashCommandPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart } from './chatParserTypes.js';
 import { IChatSlashCommandService } from './chatSlashCommands.js';

package/vscode/src/vs/workbench/contrib/chat/common/chatService.js

@@ -1,6 +1,6 @@
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
-import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 function isIDocumentContext(obj) {
     return (!!obj &&
         typeof obj === 'object' &&

package/vscode/src/vs/workbench/contrib/chat/common/chatSlashCommands.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 const IChatSlashCommandService = ( createDecorator('chatSlashCommandService'));
 let ChatSlashCommandService = class ChatSlashCommandService extends Disposable {

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

package/vscode/src/vs/workbench/contrib/chat/common/chatViewModel.js

@@ -1,8 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 import { ChatModelInitState } from './chatModel.js';
 import { countWords } from './chatWordCounter.js';
 function isRequestVM(item) {

package/vscode/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
 import { Memento } from '../../../common/memento.js';
 const IChatWidgetHistoryService = ( createDecorator('IChatWidgetHistoryService'));
 let ChatWidgetHistoryService = class ChatWidgetHistoryService {

package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActions.contribution.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Extensions } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { Extensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
 import { Extensions as Extensions$1 } from '../../../common/contributions.js';
 import { codeActionsExtensionPointDescriptor } from '../common/codeActionsExtensionPoint.js';
 import { documentationExtensionPointDescriptor } from '../common/documentationExtensionPoint.js';

package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js

@@ -1,39 +1,39 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { editorConfigurationBaseNode } from 'monaco-editor/esm/vs/editor/common/config/editorConfigurationSchema.js';
-import { codeActionCommandId, refactorCommandId, sourceActionCommandId } from 'monaco-editor/esm/vs/editor/contrib/codeAction/browser/codeAction.js';
-import { CodeActionKind } from 'monaco-editor/esm/vs/editor/contrib/codeAction/common/types.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { Extensions } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { editorConfigurationBaseNode } from '../../../../editor/common/config/editorConfigurationSchema.js';
+import { codeActionCommandId, refactorCommandId, sourceActionCommandId } from '../../../../editor/contrib/codeAction/browser/codeAction.js';
+import { CodeActionKind } from '../../../../editor/contrib/codeAction/common/types.js';
+import { localizeWithPath } from '../../../../nls.js';
+import { Extensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
 const createCodeActionsAutoSave = (description) => {
     return {
         type: ['string', 'boolean'],
         enum: ['always', 'explicit', 'never', true, false],
         enumDescriptions: [
-            ( nls.localizeWithPath(
+            ( localizeWithPath(
                 'vs/workbench/contrib/codeActions/browser/codeActionsContribution',
                 'alwaysSave',
                 'Triggers Code Actions on explicit saves and auto saves triggered by window or focus changes.'
             )),
-            ( nls.localizeWithPath(
+            ( localizeWithPath(
                 'vs/workbench/contrib/codeActions/browser/codeActionsContribution',
                 'explicitSave',
                 'Triggers Code Actions only when explicitly saved'
             )),
-            ( nls.localizeWithPath(
+            ( localizeWithPath(
                 'vs/workbench/contrib/codeActions/browser/codeActionsContribution',
                 'neverSave',
                 'Never triggers Code Actions on save'
             )),
-            ( nls.localizeWithPath(
+            ( localizeWithPath(
                 'vs/workbench/contrib/codeActions/browser/codeActionsContribution',
                 'explicitSaveBoolean',
                 'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "explicit".'
             )),
-            ( nls.localizeWithPath(
+            ( localizeWithPath(
                 'vs/workbench/contrib/codeActions/browser/codeActionsContribution',
                 'neverSaveBoolean',
                 'Never triggers Code Actions on save. This value will be deprecated in favor of "never".'
@@ -44,7 +44,7 @@ const createCodeActionsAutoSave = (description) => {
     };
 };
 const codeActionsOnSaveDefaultProperties = ( Object.freeze({
-    'source.fixAll': createCodeActionsAutoSave(( nls.localizeWithPath(
+    'source.fixAll': createCodeActionsAutoSave(( localizeWithPath(
         'vs/workbench/contrib/codeActions/browser/codeActionsContribution',
         'codeActionsOnSave.fixAll',
         "Controls whether auto fix action should be run on file save."
@@ -64,7 +64,7 @@ const codeActionsOnSaveSchema = {
             items: { type: 'string' }
         }
     ],
-    markdownDescription: ( nls.localizeWithPath(
+    markdownDescription: ( localizeWithPath(
         'vs/workbench/contrib/codeActions/browser/codeActionsContribution',
         'editor.codeActionsOnSave',
         'Run Code Actions for the editor on save. Code Actions must be specified and the editor must not be shutting down. Example: `"source.organizeImports": "explicit" `'
@@ -101,7 +101,7 @@ let CodeActionsContribution = class CodeActionsContribution extends Disposable {
     updateConfigurationSchema(codeActionContributions) {
         const newProperties = { ...codeActionsOnSaveDefaultProperties };
         for (const [sourceAction, props] of this.getSourceActions(codeActionContributions)) {
-            newProperties[sourceAction] = createCodeActionsAutoSave(( nls.localizeWithPath(
+            newProperties[sourceAction] = createCodeActionsAutoSave(( localizeWithPath(
                 'vs/workbench/contrib/codeActions/browser/codeActionsContribution',
                 'codeActionsOnSave.generic',
                 "Controls whether '{0}' actions should be run on file save.",

package/vscode/src/vs/workbench/contrib/codeActions/browser/documentationContribution.js

@@ -1,8 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { ILanguageFeaturesService } from 'monaco-editor/esm/vs/editor/common/services/languageFeatures.js';
-import { CodeActionKind } from 'monaco-editor/esm/vs/editor/contrib/codeAction/common/types.js';
-import { ContextKeyExpr, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { CodeActionKind } from '../../../../editor/contrib/codeAction/common/types.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 let CodeActionDocumentationContribution = class CodeActionDocumentationContribution extends Disposable {
     constructor(extensionPoint, contextKeyService, languageFeaturesService) {
         super();

package/vscode/src/vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint.js

@@ -1,4 +1,4 @@
-import * as nls from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from '../../../../nls.js';
 import { languagesExtPoint } from '../../../services/language/common/languageService.js';
 var CodeActionExtensionPointFields;
 ( (function(CodeActionExtensionPointFields) {
@@ -10,7 +10,7 @@ var CodeActionExtensionPointFields;
 })(CodeActionExtensionPointFields || (CodeActionExtensionPointFields = {})));
 const codeActionsExtensionPointSchema = ( Object.freeze({
     type: 'array',
-    markdownDescription: ( nls.localizeWithPath(
+    markdownDescription: ( localizeWithPath(
         'vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint',
         'contributes.codeActions',
         "Configure which editor to use for a resource."
@@ -21,7 +21,7 @@ const codeActionsExtensionPointSchema = ( Object.freeze({
         properties: {
             [CodeActionExtensionPointFields.languages]: {
                 type: 'array',
-                description: ( nls.localizeWithPath(
+                description: ( localizeWithPath(
                     'vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint',
                     'contributes.codeActions.languages',
                     "Language modes that the code actions are enabled for."
@@ -34,7 +34,7 @@ const codeActionsExtensionPointSchema = ( Object.freeze({
                 properties: {
                     [CodeActionExtensionPointFields.kind]: {
                         type: 'string',
-                        markdownDescription: ( nls.localizeWithPath(
+                        markdownDescription: ( localizeWithPath(
                             'vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint',
                             'contributes.codeActions.kind',
                             "`CodeActionKind` of the contributed code action."
@@ -42,7 +42,7 @@ const codeActionsExtensionPointSchema = ( Object.freeze({
                     },
                     [CodeActionExtensionPointFields.title]: {
                         type: 'string',
-                        description: ( nls.localizeWithPath(
+                        description: ( localizeWithPath(
                             'vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint',
                             'contributes.codeActions.title',
                             "Label for the code action used in the UI."
@@ -50,7 +50,7 @@ const codeActionsExtensionPointSchema = ( Object.freeze({
                     },
                     [CodeActionExtensionPointFields.description]: {
                         type: 'string',
-                        description: ( nls.localizeWithPath(
+                        description: ( localizeWithPath(
                             'vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint',
                             'contributes.codeActions.description',
                             "Description of what the code action does."

package/vscode/src/vs/workbench/contrib/codeActions/common/documentationExtensionPoint.js

@@ -1,4 +1,4 @@
-import * as nls from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from '../../../../nls.js';
 import { languagesExtPoint } from '../../../services/language/common/languageService.js';
 var DocumentationExtensionPointFields;
 ( (function(DocumentationExtensionPointFields) {
@@ -10,7 +10,7 @@ var DocumentationExtensionPointFields;
 ));
 const documentationExtensionPointSchema = ( Object.freeze({
     type: 'object',
-    description: ( nls.localizeWithPath(
+    description: ( localizeWithPath(
         'vs/workbench/contrib/codeActions/common/documentationExtensionPoint',
         'contributes.documentation',
         "Contributed documentation."
@@ -18,14 +18,14 @@ const documentationExtensionPointSchema = ( Object.freeze({
     properties: {
         'refactoring': {
             type: 'array',
-            description: ( nls.localizeWithPath(
+            description: ( localizeWithPath(
                 'vs/workbench/contrib/codeActions/common/documentationExtensionPoint',
                 'contributes.documentation.refactorings',
                 "Contributed documentation for refactorings."
             )),
             items: {
                 type: 'object',
-                description: ( nls.localizeWithPath(
+                description: ( localizeWithPath(
                     'vs/workbench/contrib/codeActions/common/documentationExtensionPoint',
                     'contributes.documentation.refactoring',
                     "Contributed documentation for refactoring."
@@ -38,7 +38,7 @@ const documentationExtensionPointSchema = ( Object.freeze({
                 properties: {
                     [DocumentationExtensionPointFields.title]: {
                         type: 'string',
-                        description: ( nls.localizeWithPath(
+                        description: ( localizeWithPath(
                             'vs/workbench/contrib/codeActions/common/documentationExtensionPoint',
                             'contributes.documentation.refactoring.title',
                             "Label for the documentation used in the UI."
@@ -46,7 +46,7 @@ const documentationExtensionPointSchema = ( Object.freeze({
                     },
                     [DocumentationExtensionPointFields.when]: {
                         type: 'string',
-                        description: ( nls.localizeWithPath(
+                        description: ( localizeWithPath(
                             'vs/workbench/contrib/codeActions/common/documentationExtensionPoint',
                             'contributes.documentation.refactoring.when',
                             "When clause."
@@ -54,7 +54,7 @@ const documentationExtensionPointSchema = ( Object.freeze({
                     },
                     [DocumentationExtensionPointFields.command]: {
                         type: 'string',
-                        description: ( nls.localizeWithPath(
+                        description: ( localizeWithPath(
                             'vs/workbench/contrib/codeActions/common/documentationExtensionPoint',
                             'contributes.documentation.refactoring.command',
                             "Command executed."

package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js

@@ -1,24 +1,25 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { observableFromEvent, autorunWithStore } from 'monaco-editor/esm/vs/base/common/observable.js';
-import { registerDiffEditorContribution } from 'monaco-editor/esm/vs/editor/browser/editorExtensions.js';
-import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
-import { AccessibleDiffViewerNext, AccessibleDiffViewerPrev } from 'monaco-editor/esm/vs/editor/browser/widget/diffEditor/diffEditor.contribution.js';
-import { DiffEditorWidget } from 'monaco-editor/esm/vs/editor/browser/widget/diffEditor/diffEditorWidget.js';
-import { EmbeddedDiffEditorWidget } from 'monaco-editor/esm/vs/editor/browser/widget/embeddedCodeEditorWidget.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { IContextKeyService, ContextKeyEqualsExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { Severity, INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { registerDiffEditorContribution } from '../../../../editor/browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { AccessibleDiffViewerNext, AccessibleDiffViewerPrev } from '../../../../editor/browser/widget/diffEditor/diffEditor.contribution.js';
+import { DiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/diffEditorWidget.js';
+import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/embeddedCodeEditorWidget.js';
+import { localizeWithPath } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService, ContextKeyEqualsExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { Severity, INotificationService } from '../../../../platform/notification/common/notification.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
 import { FloatingEditorClickWidget } from '../../../browser/codeeditor.js';
 import { Extensions } from '../../../common/configuration.js';
 import { IAccessibleViewService } from '../../accessibility/browser/accessibleView.js';
 import { AccessibilityHelpAction } from '../../accessibility/browser/accessibleViewActions.js';
 import { getCommentCommandInfo } from '../../accessibility/browser/editorAccessibilityHelp.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 let DiffEditorHelperContribution = class DiffEditorHelperContribution extends Disposable {
     static { this.ID = 'editor.contrib.diffEditorHelper'; }
     constructor(_diffEditor, _instantiationService, _configurationService, _notificationService) {

package/vscode/src/vs/workbench/contrib/codeEditor/browser/editorFeatures.js

@@ -1,10 +1,10 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { onUnexpectedError } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
-import { getEditorFeatures } from 'monaco-editor/esm/vs/editor/common/editorFeatures.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { getEditorFeatures } from '../../../../editor/common/editorFeatures.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
 import { Extensions } from '../../../common/contributions.js';
 let EditorFeaturesInstantiator = class EditorFeaturesInstantiator extends Disposable {
     constructor(codeEditorService, _instantiationService) {

package/vscode/src/vs/workbench/contrib/codeEditor/browser/editorLineNumberMenu.js

@@ -1,13 +1,13 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Separator } from 'monaco-editor/esm/vs/base/common/actions.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { isMacintosh } from 'monaco-editor/esm/vs/base/common/platform.js';
-import { registerEditorContribution } from 'monaco-editor/esm/vs/editor/browser/editorExtensions.js';
-import { MenuId, IMenuService } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.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 { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { Separator } from '../../../../base/common/actions.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import { registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
+import { MenuId, IMenuService } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
 class GutterActionsRegistryImpl {
     constructor() {
         this._registeredGutterActionsGenerators = ( new Set());

package/vscode/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.js

@@ -1,40 +1,40 @@
 import './simpleFindWidget.css.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { Widget } from 'monaco-editor/esm/vs/base/browser/ui/widget.js';
-import { Delayer } from 'monaco-editor/esm/vs/base/common/async.js';
-import { FindReplaceState } from 'monaco-editor/esm/vs/editor/contrib/find/browser/findState.js';
-import { SimpleButton, findPreviousMatchIcon, findNextMatchIcon, NLS_MATCHES_LOCATION, NLS_NO_RESULTS } from 'monaco-editor/esm/vs/editor/contrib/find/browser/findWidget.js';
-import { ContextScopedFindInput } from 'monaco-editor/esm/vs/platform/history/browser/contextScopedHistoryWidget.js';
-import { widgetClose } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
-import { registerThemingParticipant } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
-import * as strings from 'monaco-editor/esm/vs/base/common/strings.js';
-import { showHistoryKeybindingHint } from 'monaco-editor/esm/vs/platform/history/browser/historyWidgetKeybindingHint.js';
-import { status } from 'monaco-editor/esm/vs/base/browser/ui/aria/aria.js';
-import { defaultInputBoxStyles, defaultToggleStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
-import { Sash } from 'monaco-editor/esm/vs/base/browser/ui/sash/sash.js';
-import { registerColor } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
-const NLS_FIND_INPUT_LABEL = ( nls.localizeWithPath(
+import { localizeWithPath } from '../../../../../nls.js';
+import { trackFocus, addDisposableListener, getComputedStyle } from '../../../../../base/browser/dom.js';
+import { Widget } from '../../../../../base/browser/ui/widget.js';
+import { Delayer } from '../../../../../base/common/async.js';
+import { FindReplaceState } from '../../../../../editor/contrib/find/browser/findState.js';
+import { SimpleButton, findPreviousMatchIcon, findNextMatchIcon, NLS_MATCHES_LOCATION, NLS_NO_RESULTS } from '../../../../../editor/contrib/find/browser/findWidget.js';
+import { ContextScopedFindInput } from '../../../../../platform/history/browser/contextScopedHistoryWidget.js';
+import { widgetClose } from '../../../../../platform/theme/common/iconRegistry.js';
+import { registerThemingParticipant } from '../../../../../platform/theme/common/themeService.js';
+import { format } from '../../../../../base/common/strings.js';
+import { showHistoryKeybindingHint } from '../../../../../platform/history/browser/historyWidgetKeybindingHint.js';
+import { status } from '../../../../../base/browser/ui/aria/aria.js';
+import { defaultInputBoxStyles, defaultToggleStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
+import { Sash } from '../../../../../base/browser/ui/sash/sash.js';
+import { registerColor } from '../../../../../platform/theme/common/colorRegistry.js';
+const NLS_FIND_INPUT_LABEL = ( localizeWithPath(
     'vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget',
     'label.find',
     "Find"
 ));
-const NLS_FIND_INPUT_PLACEHOLDER = ( nls.localizeWithPath(
+const NLS_FIND_INPUT_PLACEHOLDER = ( localizeWithPath(
     'vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget',
     'placeholder.find',
     "Find"
 ));
-const NLS_PREVIOUS_MATCH_BTN_LABEL = ( nls.localizeWithPath(
+const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localizeWithPath(
     'vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget',
     'label.previousMatchButton',
     "Previous Match"
 ));
-const NLS_NEXT_MATCH_BTN_LABEL = ( nls.localizeWithPath(
+const NLS_NEXT_MATCH_BTN_LABEL = ( localizeWithPath(
     'vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget',
     'label.nextMatchButton',
     "Next Match"
 ));
-const NLS_CLOSE_BTN_LABEL = ( nls.localizeWithPath(
+const NLS_CLOSE_BTN_LABEL = ( localizeWithPath(
     'vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget',
     'label.closeButton',
     "Close"
@@ -139,13 +139,13 @@ class SimpleFindWidget extends Widget {
                 return;
             }
         });
-        this._focusTracker = this._register(dom.trackFocus(this._innerDomNode));
+        this._focusTracker = this._register(trackFocus(this._innerDomNode));
         this._register(this._focusTracker.onDidFocus(this._onFocusTrackerFocus.bind(this)));
         this._register(this._focusTracker.onDidBlur(this._onFocusTrackerBlur.bind(this)));
-        this._findInputFocusTracker = this._register(dom.trackFocus(this._findInput.domNode));
+        this._findInputFocusTracker = this._register(trackFocus(this._findInput.domNode));
         this._register(this._findInputFocusTracker.onDidFocus(this._onFindInputFocusTrackerFocus.bind(this)));
         this._register(this._findInputFocusTracker.onDidBlur(this._onFindInputFocusTrackerBlur.bind(this)));
-        this._register(dom.addDisposableListener(this._innerDomNode, 'click', (event) => {
+        this._register(addDisposableListener(this._innerDomNode, 'click', (event) => {
             event.stopPropagation();
         }));
         if (options?.showResultCount) {
@@ -177,7 +177,7 @@ class SimpleFindWidget extends Widget {
                 { orientation: 0 , size: 1 }
             )));
             this._register(resizeSash.onDidStart(() => {
-                originalWidth = parseFloat(dom.getComputedStyle(this._domNode).width);
+                originalWidth = parseFloat(getComputedStyle(this._domNode).width);
             }));
             this._register(resizeSash.onDidChange((e) => {
                 const width = originalWidth + e.startX - e.currentX;
@@ -187,7 +187,7 @@ class SimpleFindWidget extends Widget {
                 this._domNode.style.width = `${width}px`;
             }));
             this._register(resizeSash.onDidReset(e => {
-                const currentWidth = parseFloat(dom.getComputedStyle(this._domNode).width);
+                const currentWidth = parseFloat(getComputedStyle(this._domNode).width);
                 if (currentWidth === _initialMinWidth) {
                     this._domNode.style.width = '100%';
                 }
@@ -330,7 +330,7 @@ class SimpleFindWidget extends Widget {
             if (matchesPosition === '0') {
                 matchesPosition = '?';
             }
-            label = strings.format(NLS_MATCHES_LOCATION, matchesPosition, matchesCount);
+            label = format(NLS_MATCHES_LOCATION, matchesPosition, matchesCount);
         }
         else {
             label = NLS_NO_RESULTS;
@@ -345,7 +345,7 @@ class SimpleFindWidget extends Widget {
     }
     _announceSearchResults(label, searchString) {
         if (!searchString) {
-            return ( nls.localizeWithPath(
+            return ( localizeWithPath(
                 'vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget',
                 'ariaSearchNoInput',
                 "Enter search input"
@@ -353,13 +353,13 @@ class SimpleFindWidget extends Widget {
         }
         if (label === NLS_NO_RESULTS) {
             return searchString === ''
-                ? ( nls.localizeWithPath(
+                ? ( localizeWithPath(
                 'vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget',
                 'ariaSearchNoResultEmpty',
                 "{0} found",
                 label
             ))
-                : ( nls.localizeWithPath(
+                : ( localizeWithPath(
                 'vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget',
                 'ariaSearchNoResult',
                 "{0} found for '{1}'",
@@ -367,7 +367,7 @@ class SimpleFindWidget extends Widget {
                 searchString
             ));
         }
-        return ( nls.localizeWithPath(
+        return ( localizeWithPath(
             'vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget',
             'ariaSearchNoResultWithLineNumNoCurrentMatch',
             "{0} found for '{1}'",
@@ -376,7 +376,7 @@ class SimpleFindWidget extends Widget {
         ));
     }
 }
-const simpleFindWidgetSashBorder = registerColor('simpleFindWidget.sashBorder', { dark: '#454545', light: '#C8C8C8', hcDark: '#6FC3DF', hcLight: '#0F4A85' }, ( nls.localizeWithPath(
+const simpleFindWidgetSashBorder = registerColor('simpleFindWidget.sashBorder', { dark: '#454545', light: '#C8C8C8', hcDark: '#6FC3DF', hcLight: '#0F4A85' }, ( localizeWithPath(
     'vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget',
     'simpleFindWidget.sashBorder',
     'Border color of the sash border.'