@codingame/monaco-vscode-extensions-service-override 1.85.6 → 2.0.0-v2.1

package/vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js

@@ -1,18 +1,18 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { MainContext, ExtHostContext, CandidatePortSource } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { TunnelDtoConverter } from 'vscode/vscode/vs/workbench/api/common/extHostTunnelService';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { IRemoteExplorerService, PORT_AUTO_FORWARD_SETTING, PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_OUTPUT } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService';
 import { ITunnelService, TunnelProtocol } from 'vscode/vscode/vs/platform/tunnel/common/tunnel';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { INotificationService, Severity } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { INotificationService, Severity } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
-import { Extensions } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { TunnelSource, TunnelCloseReason, forwardedPortsViewEnabled, makeAddress } from 'vscode/vscode/vs/workbench/services/remote/common/tunnelModel';
 
 let MainThreadTunnelService = class MainThreadTunnelService extends Disposable {
@@ -104,7 +104,7 @@ let MainThreadTunnelService = class MainThreadTunnelService extends Disposable {
         return TunnelDtoConverter.fromServiceTunnel(tunnel);
     }
     async elevationPrompt(tunnelOptions, tunnel, source) {
-        return this.notificationService.prompt(Severity.Info, ( nls.localizeWithPath(
+        return this.notificationService.prompt(Severity.Info, ( localizeWithPath(
             'vs/workbench/api/browser/mainThreadTunnelService',
             'remote.tunnel.openTunnel',
             "The extension {0} has forwarded port {1}. You'll need to run as superuser to use port {2} locally.",
@@ -112,7 +112,7 @@ let MainThreadTunnelService = class MainThreadTunnelService extends Disposable {
             tunnelOptions.remoteAddress.port,
             tunnelOptions.localAddressPort
         )), [{
-                label: ( nls.localizeWithPath(
+                label: ( localizeWithPath(
                     'vs/workbench/api/browser/mainThreadTunnelService',
                     'remote.tunnelsView.elevationButton',
                     "Use Port {0} as Sudo...",

package/vscode/src/vs/workbench/api/browser/mainThreadUriOpeners.js

@@ -1,12 +1,12 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { Action } from 'monaco-editor/esm/vs/base/common/actions.js';
-import { isCancellationError } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { INotificationService, Severity } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
-import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
+import { Action } from 'vscode/vscode/vs/base/common/actions';
+import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { INotificationService, Severity } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { defaultExternalUriOpenerId } from 'vscode/vscode/vs/workbench/contrib/externalUriOpener/common/configuration';
 import { ContributedExternalUriOpenersStore } from '../../contrib/externalUriOpener/common/contributedOpeners.js';

package/vscode/src/vs/workbench/api/browser/mainThreadUrls.js

@@ -3,7 +3,7 @@ import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/comm
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { IURLService } from 'vscode/vscode/vs/platform/url/common/url';
 import { IExtensionUrlHandler } from 'vscode/vscode/vs/workbench/services/extensions/browser/extensionUrlHandler';
-import { ExtensionIdentifier } from 'monaco-editor/esm/vs/platform/extensions/common/extensions.js';
+import { ExtensionIdentifier } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 
 class ExtensionUrlHandler {
     constructor(proxy, handle, extensionId, extensionDisplayName) {

package/vscode/src/vs/workbench/api/browser/mainThreadWebviewManager.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.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 { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { MainThreadCustomEditors } from './mainThreadCustomEditors.js';
 import { MainThreadWebviewPanels } from './mainThreadWebviewPanels.js';
 import { MainThreadWebviews } from './mainThreadWebviews.js';

package/vscode/src/vs/workbench/api/browser/mainThreadWebviewPanels.js

@@ -1,12 +1,12 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { onUnexpectedError } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable, DisposableMap } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { generateUuid } from 'monaco-editor/esm/vs/base/common/uuid.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
+import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
+import { Event } from 'vscode/vscode/vs/base/common/event';
+import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { reviveWebviewExtension, reviveWebviewContentOptions } from './mainThreadWebviews.js';
 import { ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { DiffEditorInput } from 'vscode/vscode/vs/workbench/common/editor/diffEditorInput';

package/vscode/src/vs/workbench/api/browser/mainThreadWebviewViews.js

@@ -1,11 +1,11 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { onUnexpectedError } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { Disposable, DisposableMap } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { generateUuid } from 'monaco-editor/esm/vs/base/common/uuid.js';
+import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
+import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
+import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
 import { reviveWebviewExtension } from './mainThreadWebviews.js';
 import { ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { IWebviewViewService } from 'vscode/vscode/vs/workbench/contrib/webviewView/browser/webviewViewService';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 
 let MainThreadWebviewsViews = class MainThreadWebviewsViews extends Disposable {
     constructor(context, mainThreadWebviews, _telemetryService, _webviewViewService) {

package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.js

@@ -1,12 +1,12 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { Disposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { isWeb } from 'monaco-editor/esm/vs/base/common/platform.js';
-import { escape } from 'monaco-editor/esm/vs/base/common/strings.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
+import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { isWeb } from 'vscode/vscode/vs/base/common/platform';
+import { escape } from 'vscode/vscode/vs/base/common/strings';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
 import { ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { deserializeWebviewMessage, serializeWebviewMessage } from 'vscode/vscode/vs/workbench/api/common/extHostWebviewMessaging';
 import { SerializableObjectWithBuffers } from 'vscode/vscode/vs/workbench/services/extensions/common/proxyIdentifier';

package/vscode/src/vs/workbench/api/browser/mainThreadWindow.js

@@ -1,8 +1,8 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
+import { Event } from 'vscode/vscode/vs/base/common/event';
+import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';

package/vscode/src/vs/workbench/api/browser/mainThreadWorkspace.js

@@ -1,17 +1,17 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { isCancellationError } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { isNative } from 'monaco-editor/esm/vs/base/common/platform.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { IEnvironmentService } from 'monaco-editor/esm/vs/platform/environment/common/environment.js';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
-import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
+import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
+import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { isNative } from 'vscode/vscode/vs/base/common/platform';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { IRequestService } from 'vscode/vscode/vs/platform/request/common/request';
-import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from 'monaco-editor/esm/vs/platform/workspace/common/workspaceTrust.js';
-import { IWorkspaceContextService, isUntitledWorkspace } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
+import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
+import { IWorkspaceContextService, isUntitledWorkspace } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { checkGlobFileExists } from 'vscode/vscode/vs/workbench/services/extensions/common/workspaceContains';
 import { QueryBuilder } from 'vscode/vscode/vs/workbench/services/search/common/queryBuilder';
@@ -21,7 +21,7 @@ import { IWorkspaceEditingService } from 'vscode/vscode/vs/workbench/services/wo
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { IEditSessionIdentityService } from 'vscode/vscode/vs/platform/workspace/common/editSessions';
 import { SideBySideEditor, EditorResourceAccessor } from 'vscode/vscode/vs/workbench/common/editor';
-import { firstOrDefault, coalesce } from 'monaco-editor/esm/vs/base/common/arrays.js';
+import { firstOrDefault, coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { ICanonicalUriService } from 'vscode/vscode/vs/platform/workspace/common/canonicalUri';
 
 let MainThreadWorkspace = class MainThreadWorkspace {

package/vscode/src/vs/workbench/api/common/shared/dataTransferCache.js

@@ -1,5 +1,5 @@
-import { coalesce } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
+import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
+import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 
 class DataTransferFileCache {
     constructor() {

package/vscode/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.js

@@ -1,32 +1,32 @@
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { Color } from 'monaco-editor/esm/vs/base/common/color.js';
-import { OverviewRulerLane } from 'monaco-editor/esm/vs/editor/common/model.js';
-import { ModelDecorationOptions } from 'monaco-editor/esm/vs/editor/common/model/textModel.js';
-import { registerColor, opaque, listInactiveSelectionBackground, editorBackground, darken, editorForeground } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
-import { themeColorFromId } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
-import { CommentThreadState } from 'monaco-editor/esm/vs/editor/common/languages.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { Color } from 'vscode/vscode/vs/base/common/color';
+import { OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
+import { ModelDecorationOptions } from 'vscode/vscode/vs/editor/common/model/textModel';
+import { registerColor, opaque, listInactiveSelectionBackground, editorBackground, darken, editorForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { themeColorFromId } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { CommentThreadState } from 'vscode/vscode/vs/editor/common/languages';
 
-const overviewRulerCommentingRangeForeground = registerColor('editorGutter.commentRangeForeground', { dark: opaque(listInactiveSelectionBackground, editorBackground), light: ( darken(opaque(listInactiveSelectionBackground, editorBackground), .05)), hcDark: Color.white, hcLight: Color.black }, ( nls.localizeWithPath(
+const overviewRulerCommentingRangeForeground = registerColor('editorGutter.commentRangeForeground', { dark: opaque(listInactiveSelectionBackground, editorBackground), light: ( darken(opaque(listInactiveSelectionBackground, editorBackground), .05)), hcDark: Color.white, hcLight: Color.black }, ( localizeWithPath(
     'vs/workbench/contrib/comments/browser/commentGlyphWidget',
     'editorGutterCommentRangeForeground',
     'Editor gutter decoration color for commenting ranges. This color should be opaque.'
 )));
-const overviewRulerCommentForeground = registerColor('editorOverviewRuler.commentForeground', { dark: overviewRulerCommentingRangeForeground, light: overviewRulerCommentingRangeForeground, hcDark: overviewRulerCommentingRangeForeground, hcLight: overviewRulerCommentingRangeForeground }, ( nls.localizeWithPath(
+const overviewRulerCommentForeground = registerColor('editorOverviewRuler.commentForeground', { dark: overviewRulerCommentingRangeForeground, light: overviewRulerCommentingRangeForeground, hcDark: overviewRulerCommentingRangeForeground, hcLight: overviewRulerCommentingRangeForeground }, ( localizeWithPath(
     'vs/workbench/contrib/comments/browser/commentGlyphWidget',
     'editorOverviewRuler.commentForeground',
     'Editor overview ruler decoration color for resolved comments. This color should be opaque.'
 )));
-const overviewRulerCommentUnresolvedForeground = registerColor('editorOverviewRuler.commentUnresolvedForeground', { dark: overviewRulerCommentForeground, light: overviewRulerCommentForeground, hcDark: overviewRulerCommentForeground, hcLight: overviewRulerCommentForeground }, ( nls.localizeWithPath(
+const overviewRulerCommentUnresolvedForeground = registerColor('editorOverviewRuler.commentUnresolvedForeground', { dark: overviewRulerCommentForeground, light: overviewRulerCommentForeground, hcDark: overviewRulerCommentForeground, hcLight: overviewRulerCommentForeground }, ( localizeWithPath(
     'vs/workbench/contrib/comments/browser/commentGlyphWidget',
     'editorOverviewRuler.commentUnresolvedForeground',
     'Editor overview ruler decoration color for unresolved comments. This color should be opaque.'
 )));
-const editorGutterCommentGlyphForeground = registerColor('editorGutter.commentGlyphForeground', { dark: editorForeground, light: editorForeground, hcDark: Color.black, hcLight: Color.white }, ( nls.localizeWithPath(
+const editorGutterCommentGlyphForeground = registerColor('editorGutter.commentGlyphForeground', { dark: editorForeground, light: editorForeground, hcDark: Color.black, hcLight: Color.white }, ( localizeWithPath(
     'vs/workbench/contrib/comments/browser/commentGlyphWidget',
     'editorGutterCommentGlyphForeground',
     'Editor gutter decoration color for commenting glyphs.'
 )));
-registerColor('editorGutter.commentUnresolvedGlyphForeground', { dark: editorGutterCommentGlyphForeground, light: editorGutterCommentGlyphForeground, hcDark: editorGutterCommentGlyphForeground, hcLight: editorGutterCommentGlyphForeground }, ( nls.localizeWithPath(
+registerColor('editorGutter.commentUnresolvedGlyphForeground', { dark: editorGutterCommentGlyphForeground, light: editorGutterCommentGlyphForeground, hcDark: editorGutterCommentGlyphForeground, hcLight: editorGutterCommentGlyphForeground }, ( localizeWithPath(
     'vs/workbench/contrib/comments/browser/commentGlyphWidget',
     'editorGutterCommentUnresolvedGlyphForeground',
     'Editor gutter decoration color for commenting glyphs for unresolved comment threads.'

package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadRangeDecorator.js

@@ -1,6 +1,6 @@
-import { Disposable, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { CommentThreadCollapsibleState } from 'monaco-editor/esm/vs/editor/common/languages.js';
-import { ModelDecorationOptions } from 'monaco-editor/esm/vs/editor/common/model/textModel.js';
+import { Disposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { CommentThreadCollapsibleState } from 'vscode/vscode/vs/editor/common/languages';
+import { ModelDecorationOptions } from 'vscode/vscode/vs/editor/common/model/textModel';
 
 class CommentThreadRangeDecoration {
     get id() {

package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.js

@@ -1,21 +1,21 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Color } from 'monaco-editor/esm/vs/base/common/color.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
-import * as languages from 'monaco-editor/esm/vs/editor/common/languages.js';
-import { ZoneWidget } from 'monaco-editor/esm/vs/editor/contrib/zoneWidget/browser/zoneWidget.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
+import { Color } from 'vscode/vscode/vs/base/common/color';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { CommentThreadCollapsibleState } from 'vscode/vscode/vs/editor/common/languages';
+import { ZoneWidget } from 'vscode/vscode/vs/editor/contrib/zoneWidget/browser/zoneWidget';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { CommentGlyphWidget } from './commentGlyphWidget.js';
 import { ICommentService } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentService';
-import { EDITOR_FONT_DEFAULTS } from 'monaco-editor/esm/vs/editor/common/config/editorOptions.js';
-import { ServiceCollection } from 'monaco-editor/esm/vs/platform/instantiation/common/serviceCollection.js';
+import { EDITOR_FONT_DEFAULTS } from 'vscode/vscode/vs/editor/common/config/editorOptions';
+import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
 import { CommentThreadWidget } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentThreadWidget';
 import { commentThreadStateColorVar, commentThreadStateBackgroundColorVar, getCommentThreadStateBorderColor } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentColors';
-import { peekViewBorder } from 'monaco-editor/esm/vs/editor/contrib/peekView/browser/peekView.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+import { peekViewBorder } from 'vscode/vscode/vs/editor/contrib/peekView/browser/peekView';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 
 function getCommentThreadWidgetStateColor(thread, theme) {
     return getCommentThreadStateBorderColor(thread, theme) ?? theme.getColor(peekViewBorder);
@@ -78,9 +78,9 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
         if (controller) {
             this._commentOptions = controller.options;
         }
-        this._initialCollapsibleState = _pendingComment ? languages.CommentThreadCollapsibleState.Expanded : _commentThread.initialCollapsibleState;
+        this._initialCollapsibleState = _pendingComment ? CommentThreadCollapsibleState.Expanded : _commentThread.initialCollapsibleState;
         _commentThread.initialCollapsibleState = this._initialCollapsibleState;
-        this._isExpanded = this._initialCollapsibleState === languages.CommentThreadCollapsibleState.Expanded;
+        this._isExpanded = this._initialCollapsibleState === CommentThreadCollapsibleState.Expanded;
         this._commentThreadDisposables = [];
         this.create();
         this._globalToDispose.add(this.themeService.onDidColorThemeChange(this._applyTheme, this));
@@ -195,10 +195,10 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
         this.commentService.disposeCommentThread(this.owner, this._commentThread.threadId);
     }
     collapse() {
-        this._commentThread.collapsibleState = languages.CommentThreadCollapsibleState.Collapsed;
+        this._commentThread.collapsibleState = CommentThreadCollapsibleState.Collapsed;
     }
     expand() {
-        this._commentThread.collapsibleState = languages.CommentThreadCollapsibleState.Expanded;
+        this._commentThread.collapsibleState = CommentThreadCollapsibleState.Expanded;
     }
     getGlyphPosition() {
         if (this._commentGlyph) {
@@ -208,10 +208,10 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
     }
     toggleExpand() {
         if (this._isExpanded) {
-            this._commentThread.collapsibleState = languages.CommentThreadCollapsibleState.Collapsed;
+            this._commentThread.collapsibleState = CommentThreadCollapsibleState.Collapsed;
         }
         else {
-            this._commentThread.collapsibleState = languages.CommentThreadCollapsibleState.Expanded;
+            this._commentThread.collapsibleState = CommentThreadCollapsibleState.Expanded;
         }
     }
     async update(commentThread) {
@@ -231,10 +231,10 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
                 this._commentGlyph.setLineNumber(lineNumber);
             }
         }
-        if ((shouldMoveWidget && this._isExpanded) || (this._commentThread.collapsibleState === languages.CommentThreadCollapsibleState.Expanded && !this._isExpanded)) {
+        if ((shouldMoveWidget && this._isExpanded) || (this._commentThread.collapsibleState === CommentThreadCollapsibleState.Expanded && !this._isExpanded)) {
             this.show(this.arrowPosition(this._commentThread.range), 2);
         }
-        else if (this._commentThread.collapsibleState !== languages.CommentThreadCollapsibleState.Expanded) {
+        else if (this._commentThread.collapsibleState !== CommentThreadCollapsibleState.Expanded) {
             this.hide();
         }
     }
@@ -253,7 +253,7 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
         this._disposables.add(this._commentThreadWidget.onDidResize(dimension => {
             this._refresh(dimension);
         }));
-        if ((this._commentThread.collapsibleState === languages.CommentThreadCollapsibleState.Expanded) || (range === undefined)) {
+        if ((this._commentThread.collapsibleState === CommentThreadCollapsibleState.Expanded) || (range === undefined)) {
             this.show(this.arrowPosition(range), 2);
         }
         if (this._commentThread.canReply && this._commentThread.isTemplate && (!this._commentThread.comments || (this._commentThread.comments.length === 0))) {
@@ -279,18 +279,18 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
             }
         }));
         this._commentThreadDisposables.push(this._commentThread.onDidChangeCollapsibleState(state => {
-            if (state === languages.CommentThreadCollapsibleState.Expanded && !this._isExpanded) {
+            if (state === CommentThreadCollapsibleState.Expanded && !this._isExpanded) {
                 this.show(this.arrowPosition(this._commentThread.range), 2);
                 return;
             }
-            if (state === languages.CommentThreadCollapsibleState.Collapsed && this._isExpanded) {
+            if (state === CommentThreadCollapsibleState.Collapsed && this._isExpanded) {
                 this.hide();
                 return;
             }
         }));
         if (this._initialCollapsibleState === undefined) {
             const onDidChangeInitialCollapsibleState = this._commentThread.onDidChangeInitialCollapsibleState(state => {
-                this._initialCollapsibleState = this._commentThread.range ? state : languages.CommentThreadCollapsibleState.Expanded;
+                this._initialCollapsibleState = this._commentThread.range ? state : CommentThreadCollapsibleState.Expanded;
                 this._commentThread.collapsibleState = this._initialCollapsibleState;
                 onDidChangeInitialCollapsibleState.dispose();
             });
@@ -311,7 +311,7 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
     }
     _refresh(dimensions) {
         if (dimensions.height === 0 && dimensions.width === 0) {
-            this.commentThread.collapsibleState = languages.CommentThreadCollapsibleState.Collapsed;
+            this.commentThread.collapsibleState = CommentThreadCollapsibleState.Collapsed;
             return;
         }
         if (this._isExpanded) {
@@ -357,7 +357,7 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
         }
         this._isExpanded = true;
         super.show(range ?? ( new Range(0, 0, 0, 0)), heightInLines);
-        this._commentThread.collapsibleState = languages.CommentThreadCollapsibleState.Expanded;
+        this._commentThread.collapsibleState = CommentThreadCollapsibleState.Expanded;
         this._refresh(this._commentThreadWidget.getDimensions());
     }
     hide() {

package/vscode/src/vs/workbench/contrib/comments/browser/comments.js

@@ -1,4 +1,4 @@
-import { RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 
 const CommentsViewFilterFocusContextKey = ( new RawContextKey('commentsFilterFocus', false));
 

package/vscode/src/vs/workbench/contrib/comments/browser/commentsController.js

@@ -1,37 +1,37 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Action } from 'monaco-editor/esm/vs/base/common/actions.js';
-import { coalesce } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { findFirstIdxMonotonousOrArrLen } from 'monaco-editor/esm/vs/base/common/arraysFind.js';
-import { createCancelablePromise, Delayer } from 'monaco-editor/esm/vs/base/common/async.js';
-import { onUnexpectedError } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { DisposableStore, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Action } from 'vscode/vscode/vs/base/common/actions';
+import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
+import { findFirstIdxMonotonousOrArrLen } from 'vscode/vscode/vs/base/common/arraysFind';
+import { createCancelablePromise, Delayer } from 'vscode/vscode/vs/base/common/async';
+import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
+import { DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import 'vscode/vscode/vs/workbench/contrib/comments/browser/media/review.css';
-import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
-import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
-import { EditorType } from 'monaco-editor/esm/vs/editor/common/editorCommon.js';
-import { ModelDecorationOptions } from 'monaco-editor/esm/vs/editor/common/model/textModel.js';
-import * as languages from 'monaco-editor/esm/vs/editor/common/languages.js';
-import * as nls from 'monaco-editor/esm/vs/nls.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 { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
+import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
+import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { EditorType } from 'vscode/vscode/vs/editor/common/editorCommon';
+import { ModelDecorationOptions } from 'vscode/vscode/vs/editor/common/model/textModel';
+import { CommentThreadState } from 'vscode/vscode/vs/editor/common/languages';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 import { CommentGlyphWidget } from './commentGlyphWidget.js';
 import { ICommentService } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentService';
 import { ReviewZoneWidget, parseMouseDownInfoFromEvent, isMouseUpEventDragFromMouseDown } from './commentThreadZoneWidget.js';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { EmbeddedCodeEditorWidget } from 'monaco-editor/esm/vs/editor/browser/widget/embeddedCodeEditorWidget.js';
+import { EmbeddedCodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/embeddedCodeEditorWidget';
 import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
 import { COMMENTS_VIEW_ID } from './commentsTreeViewer.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { COMMENTS_SECTION } from 'vscode/vscode/vs/workbench/contrib/comments/common/commentsConfiguration';
 import { COMMENTEDITOR_DECORATION_KEY } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentReply';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { CommentThreadRangeDecorator } from './commentThreadRangeDecorator.js';
-import { status } from 'monaco-editor/esm/vs/base/browser/ui/aria/aria.js';
+import { status } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
 import { CommentContextKeys } from 'vscode/vscode/vs/workbench/contrib/comments/common/commentContextKeys';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { IAccessibilityService } from 'monaco-editor/esm/vs/platform/accessibility/common/accessibility.js';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
 
 const ID = 'editor.contrib.review';
 class CommentingRangeDecoration {
@@ -630,7 +630,7 @@ let CommentController = class CommentController {
     }
     expandUnresolved() {
         for (const widget of this._commentWidgets) {
-            if (widget.commentThread.state === languages.CommentThreadState.Unresolved) {
+            if (widget.commentThread.state === CommentThreadState.Unresolved) {
                 widget.expand();
             }
         }
@@ -714,12 +714,12 @@ let CommentController = class CommentController {
             const commentRangeEnd = range?.getEndPosition().lineNumber;
             if (commentRangeStart && commentRangeEnd) {
                 const oneLine = commentRangeStart === commentRangeEnd;
-                oneLine ? status(( nls.localizeWithPath(
+                oneLine ? status(( localizeWithPath(
                     'vs/workbench/contrib/comments/browser/commentsController',
                     'commentRange',
                     "Line {0}",
                     commentRangeStart
-                ))) : status(( nls.localizeWithPath(
+                ))) : status(( localizeWithPath(
                     'vs/workbench/contrib/comments/browser/commentsController',
                     'commentRangeStart',
                     "Lines {0} to {1}",
@@ -885,7 +885,7 @@ let CommentController = class CommentController {
                     if (verbose) {
                         const keybinding = this.keybindingService.lookupKeybinding("editor.action.accessibilityHelp" )?.getAriaLabel();
                         if (keybinding) {
-                            status(( nls.localizeWithPath(
+                            status(( localizeWithPath(
                                 'vs/workbench/contrib/comments/browser/commentsController',
                                 'hasCommentRangesKb',
                                 "Editor has commenting ranges, run the command Open Accessibility Help ({0}), for more information.",
@@ -893,7 +893,7 @@ let CommentController = class CommentController {
                             )));
                         }
                         else {
-                            status(( nls.localizeWithPath(
+                            status(( localizeWithPath(
                                 'vs/workbench/contrib/comments/browser/commentsController',
                                 'hasCommentRangesNoKb',
                                 "Editor has commenting ranges, run the command Open Accessibility Help, which is currently not triggerable via keybinding, for more information."
@@ -901,7 +901,7 @@ let CommentController = class CommentController {
                         }
                     }
                     else {
-                        status(( nls.localizeWithPath(
+                        status(( localizeWithPath(
                             'vs/workbench/contrib/comments/browser/commentsController',
                             'hasCommentRanges',
                             "Editor has commenting ranges."
@@ -917,7 +917,7 @@ let CommentController = class CommentController {
             if (openViewState === 'file') {
                 return this.viewsService.openView(COMMENTS_VIEW_ID);
             }
-            else if (openViewState === 'firstFile' || (openViewState === 'firstFileUnresolved' && thread.state === languages.CommentThreadState.Unresolved)) {
+            else if (openViewState === 'firstFile' || (openViewState === 'firstFileUnresolved' && thread.state === CommentThreadState.Unresolved)) {
                 const hasShownView = this.viewsService.getViewWithId(COMMENTS_VIEW_ID)?.hasRendered;
                 if (!hasShownView) {
                     return this.viewsService.openView(COMMENTS_VIEW_ID);
@@ -1053,7 +1053,7 @@ let CommentController = class CommentController {
             }
             else {
                 const picks = this.getCommentProvidersQuickPicks(newCommentInfos);
-                return this.quickInputService.pick(picks, { placeHolder: ( nls.localizeWithPath(
+                return this.quickInputService.pick(picks, { placeHolder: ( localizeWithPath(
                     'vs/workbench/contrib/comments/browser/commentsController',
                     'pickCommentService',
                     "Select Comment Provider"

package/vscode/src/vs/workbench/contrib/comments/browser/commentsFilterOptions.js

@@ -1,5 +1,5 @@
-import { matchesFuzzy2, matchesFuzzy } from 'monaco-editor/esm/vs/base/common/filters.js';
-import * as strings from 'monaco-editor/esm/vs/base/common/strings.js';
+import { matchesFuzzy2, matchesFuzzy } from 'vscode/vscode/vs/base/common/filters';
+import { ltrim } from 'vscode/vscode/vs/base/common/strings';
 
 class FilterOptions {
     static { this._filter = matchesFuzzy2; }
@@ -12,7 +12,7 @@ class FilterOptions {
         this.showResolved = showResolved;
         this.showUnresolved = showUnresolved;
         const negate = filter.startsWith('!');
-        this.textFilter = { text: (negate ? strings.ltrim(filter, '!') : filter).trim(), negate };
+        this.textFilter = { text: (negate ? ltrim(filter, '!') : filter).trim(), negate };
     }
 }