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

package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js

@@ -1,25 +1,25 @@
-import { coalesce, asArray, isNonEmptyArray } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { encodeBase64, VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
-import { UriList } from 'monaco-editor/esm/vs/base/common/dataTransfer.js';
-import { createSingleCallFunction } from 'monaco-editor/esm/vs/base/common/functional.js';
-import * as htmlContent from 'monaco-editor/esm/vs/base/common/htmlContent.js';
-import { ResourceSet, ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
-import { marked } from 'monaco-editor/esm/vs/base/common/marked/marked.js';
-import { revive, parse } from 'monaco-editor/esm/vs/base/common/marshalling.js';
-import { Mimes } from 'monaco-editor/esm/vs/base/common/mime.js';
-import { cloneAndChange } from 'monaco-editor/esm/vs/base/common/objects.js';
-import { isString, isNumber, isEmptyObject, isUndefinedOrNull } from 'monaco-editor/esm/vs/base/common/types.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import * as editorRange from 'monaco-editor/esm/vs/editor/common/core/range.js';
-import * as languages from 'monaco-editor/esm/vs/editor/common/languages.js';
-import { MarkerSeverity } from 'monaco-editor/esm/vs/platform/markers/common/markers.js';
+import { coalesce, asArray, isNonEmptyArray } from '../../../base/common/arrays.js';
+import { encodeBase64, VSBuffer } from '../../../base/common/buffer.js';
+import { UriList } from '../../../base/common/dataTransfer.js';
+import { createSingleCallFunction } from '../../../base/common/functional.js';
+import { parseHrefAndDimensions, isMarkdownString } from '../../../base/common/htmlContent.js';
+import { ResourceSet, ResourceMap } from '../../../base/common/map.js';
+import marked from 'vscode-marked';
+import { revive, parse } from '../../../base/common/marshalling.js';
+import { Mimes } from '../../../base/common/mime.js';
+import { cloneAndChange } from '../../../base/common/objects.js';
+import { isString, isEmptyObject, isUndefinedOrNull, isNumber } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { Range as Range$2 } from '../../../editor/common/core/range.js';
+import { Command, FoldingRangeKind as FoldingRangeKind$2 } from '../../../editor/common/languages.js';
+import { MarkerSeverity } from '../../../platform/markers/common/markers.js';
 import { getPrivateApiFor } from './extHostTestingPrivateApi.js';
 import { DEFAULT_EDITOR_ASSOCIATION } from '../../common/editor.js';
 import { CellKind, NotebookCellExecutionState as NotebookCellExecutionState$1 } from '../../contrib/notebook/common/notebookCommon.js';
 import { TestId } from '../../contrib/testing/common/testId.js';
 import { namespaceTestTag, denamespaceTestTag } from '../../contrib/testing/common/testTypes.js';
 import { SIDE_GROUP, ACTIVE_GROUP } from '../../services/editor/common/editorService.js';
-import { Position as Position$1, Selection as Selection$1, Range as Range$1, Diagnostic as Diagnostic$1, ViewColumn as ViewColumn$1, MarkdownString as MarkdownString$1, TextEdit as TextEdit$1, WorkspaceEdit as WorkspaceEdit$1, SnippetTextEdit, SnippetString, SymbolKind as SymbolKind$1, SymbolInformation, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, Location, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$1, CompletionItem as CompletionItem$1, InlayHint as InlayHint$1, DocumentLink as DocumentLink$1, ColorPresentation as ColorPresentation$1, Color as Color$1, NotebookRange as NotebookRange$1, NotebookCellData as NotebookCellData$1, NotebookCellOutputItem as NotebookCellOutputItem$1, NotebookCellOutput as NotebookCellOutput$1, TestTag as TestTag$1, CodeActionTriggerKind as CodeActionTriggerKind$1, TypeHierarchyItem as TypeHierarchyItem$1, ChatMessage as ChatMessage$1, InteractiveEditorResponseFeedbackKind as InteractiveEditorResponseFeedbackKind$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, SymbolTag as SymbolTag$1, DocumentSymbol as DocumentSymbol$1, Hover as Hover$1, EvaluatableExpression as EvaluatableExpression$1, DocumentHighlight as DocumentHighlight$1, MultiDocumentHighlight as MultiDocumentHighlight$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$1, InlayHintLabelPart as InlayHintLabelPart$1, SelectionRange as SelectionRange$1, EndOfLine as EndOfLine$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookData as NotebookData$1, NotebookCellStatusBarAlignment, DataTransfer as DataTransfer$1, ChatMessageRole as ChatMessageRole$1, ChatVariableLevel as ChatVariableLevel$1, DiagnosticTag as DiagnosticTag$1, DecorationRangeBehavior as DecorationRangeBehavior$1, NotebookCellKind as NotebookCellKind$1, StandardTokenType, CompletionTriggerKind as CompletionTriggerKind$1, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, ProgressLocation as ProgressLocation$1, NotebookCellExecutionState as NotebookCellExecutionState$2, TestMessage as TestMessage$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, NotebookRendererScript as NotebookRendererScript$1 } from './extHostTypes.js';
+import { Position as Position$1, Selection as Selection$1, Range as Range$1, Diagnostic as Diagnostic$1, ViewColumn as ViewColumn$1, MarkdownString as MarkdownString$1, TextEdit as TextEdit$1, WorkspaceEdit as WorkspaceEdit$1, SnippetTextEdit, SnippetString, SymbolKind as SymbolKind$1, SymbolInformation, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, Location, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$1, CompletionItem as CompletionItem$1, InlayHint as InlayHint$1, DocumentLink as DocumentLink$1, ColorPresentation as ColorPresentation$1, Color as Color$1, NotebookRange as NotebookRange$1, NotebookCellData as NotebookCellData$1, NotebookCellOutputItem as NotebookCellOutputItem$1, NotebookCellOutput as NotebookCellOutput$1, TestTag as TestTag$1, CodeActionTriggerKind as CodeActionTriggerKind$1, TypeHierarchyItem as TypeHierarchyItem$1, ChatMessage as ChatMessage$1, InteractiveEditorResponseFeedbackKind as InteractiveEditorResponseFeedbackKind$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, SymbolTag as SymbolTag$1, DocumentSymbol as DocumentSymbol$1, Hover as Hover$1, EvaluatableExpression as EvaluatableExpression$1, DocumentHighlight as DocumentHighlight$1, MultiDocumentHighlight as MultiDocumentHighlight$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$1, InlayHintLabelPart as InlayHintLabelPart$1, SelectionRange as SelectionRange$1, EndOfLine as EndOfLine$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookData as NotebookData$1, NotebookCellStatusBarAlignment, DataTransfer as DataTransfer$1, ChatMessageRole as ChatMessageRole$1, ChatVariableLevel as ChatVariableLevel$1, DiagnosticTag as DiagnosticTag$1, DecorationRangeBehavior as DecorationRangeBehavior$1, NotebookCellKind as NotebookCellKind$1, CompletionTriggerKind as CompletionTriggerKind$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, StandardTokenType, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, ProgressLocation as ProgressLocation$1, NotebookCellExecutionState as NotebookCellExecutionState$2, TestMessage as TestMessage$1, NotebookRendererScript as NotebookRendererScript$1 } from './extHostTypes.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 var Selection;
 ( (function(Selection) {
@@ -298,7 +298,7 @@ var MarkdownString;
         };
         const renderer = new marked.Renderer();
         renderer.link = collectUri;
-        renderer.image = href => typeof href === 'string' ? collectUri(htmlContent.parseHrefAndDimensions(href).href) : '';
+        renderer.image = href => typeof href === 'string' ? collectUri(parseHrefAndDimensions(href).href) : '';
         marked(res.value, { renderer });
         return res;
     }
@@ -1058,12 +1058,12 @@ var CompletionItem;
         result.kind = CompletionItemKind.to(suggestion.kind);
         result.tags = suggestion.tags?.map(CompletionItemTag.to);
         result.detail = suggestion.detail;
-        result.documentation = htmlContent.isMarkdownString(suggestion.documentation) ? MarkdownString.to(suggestion.documentation) : suggestion.documentation;
+        result.documentation = isMarkdownString(suggestion.documentation) ? MarkdownString.to(suggestion.documentation) : suggestion.documentation;
         result.sortText = suggestion.sortText;
         result.filterText = suggestion.filterText;
         result.preselect = suggestion.preselect;
         result.commitCharacters = suggestion.commitCharacters;
-        if (editorRange.Range.isIRange(suggestion.range)) {
+        if (Range$2.isIRange(suggestion.range)) {
             result.range = Range.to(suggestion.range);
         }
         else if (typeof suggestion.range === 'object') {
@@ -1100,7 +1100,7 @@ var ParameterInformation;
     function to(info) {
         return {
             label: info.label,
-            documentation: htmlContent.isMarkdownString(info.documentation) ? MarkdownString.to(info.documentation) : info.documentation
+            documentation: isMarkdownString(info.documentation) ? MarkdownString.to(info.documentation) : info.documentation
         };
     }
     ParameterInformation.to = to;
@@ -1119,7 +1119,7 @@ var SignatureInformation;
     function to(info) {
         return {
             label: info.label,
-            documentation: htmlContent.isMarkdownString(info.documentation) ? MarkdownString.to(info.documentation) : info.documentation,
+            documentation: isMarkdownString(info.documentation) ? MarkdownString.to(info.documentation) : info.documentation,
             parameters: Array.isArray(info.parameters) ? ( info.parameters.map(ParameterInformation.to)) : [],
             activeParameter: info.activeParameter,
         };
@@ -1150,7 +1150,7 @@ var InlayHint;
     function to(converter, hint) {
         const res = new InlayHint$1(Position.to(hint.position), typeof hint.label === 'string' ? hint.label : ( hint.label.map(InlayHintLabelPart.to.bind(undefined, converter))), hint.kind && InlayHintKind.to(hint.kind));
         res.textEdits = hint.textEdits && ( hint.textEdits.map(TextEdit.to));
-        res.tooltip = htmlContent.isMarkdownString(hint.tooltip) ? MarkdownString.to(hint.tooltip) : hint.tooltip;
+        res.tooltip = isMarkdownString(hint.tooltip) ? MarkdownString.to(hint.tooltip) : hint.tooltip;
         res.paddingLeft = hint.paddingLeft;
         res.paddingRight = hint.paddingRight;
         return res;
@@ -1161,10 +1161,10 @@ var InlayHintLabelPart;
 ( (function(InlayHintLabelPart) {
     function to(converter, part) {
         const result = new InlayHintLabelPart$1(part.label);
-        result.tooltip = htmlContent.isMarkdownString(part.tooltip)
+        result.tooltip = isMarkdownString(part.tooltip)
             ? MarkdownString.to(part.tooltip)
             : part.tooltip;
-        if (languages.Command.is(part.command)) {
+        if (Command.is(part.command)) {
             result.command = converter.fromInternal(part.command);
         }
         if (part.location) {
@@ -1357,11 +1357,11 @@ var FoldingRangeKind;
         if (kind) {
             switch (kind) {
                 case FoldingRangeKind$1.Comment:
-                    return languages.FoldingRangeKind.Comment;
+                    return FoldingRangeKind$2.Comment;
                 case FoldingRangeKind$1.Imports:
-                    return languages.FoldingRangeKind.Imports;
+                    return FoldingRangeKind$2.Imports;
                 case FoldingRangeKind$1.Region:
-                    return languages.FoldingRangeKind.Region;
+                    return FoldingRangeKind$2.Region;
             }
         }
         return undefined;
@@ -1370,11 +1370,11 @@ var FoldingRangeKind;
     function to(kind) {
         if (kind) {
             switch (kind.value) {
-                case languages.FoldingRangeKind.Comment.value:
+                case FoldingRangeKind$2.Comment.value:
                     return FoldingRangeKind$1.Comment;
-                case languages.FoldingRangeKind.Imports.value:
+                case FoldingRangeKind$2.Imports.value:
                     return FoldingRangeKind$1.Imports;
-                case languages.FoldingRangeKind.Region.value:
+                case FoldingRangeKind$2.Region.value:
                     return FoldingRangeKind$1.Region;
             }
         }
@@ -1753,7 +1753,7 @@ var TestItem;
             uri: URI.revive(item.uri),
             busy: item.busy,
             tags: ( item.tags.map(t => TestTag.namespace(ctrlId, t.id))),
-            range: editorRange.Range.lift(Range.from(item.range)),
+            range: Range$2.lift(Range.from(item.range)),
             description: item.description || null,
             sortText: item.sortText || null,
             error: item.error ? (MarkdownString.fromStrict(item.error) || null) : null,

package/vscode/src/vs/workbench/api/common/extHostTypes.js

@@ -1,15 +1,15 @@
 import { __decorate } from '../../../../../../external/tslib/tslib.es6.js';
-import { coalesceInPlace, equals, asArray } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { illegalArgument } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { MarkdownString as MarkdownString$1 } from 'monaco-editor/esm/vs/base/common/htmlContent.js';
-import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
-import { Mimes, normalizeMimeType } from 'monaco-editor/esm/vs/base/common/mime.js';
-import { nextCharLength } from 'monaco-editor/esm/vs/base/common/strings.js';
-import { isNumber, isObject, isString, isStringArray } from 'monaco-editor/esm/vs/base/common/types.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { generateUuid } from 'monaco-editor/esm/vs/base/common/uuid.js';
-import { ExtensionIdentifier } from 'monaco-editor/esm/vs/platform/extensions/common/extensions.js';
-import { FileSystemProviderErrorCode, markAsFileSystemProviderError } from 'monaco-editor/esm/vs/platform/files/common/files.js';
+import { coalesceInPlace, equals, asArray } from '../../../base/common/arrays.js';
+import { illegalArgument } from '../../../base/common/errors.js';
+import { MarkdownString as MarkdownString$1 } from '../../../base/common/htmlContent.js';
+import { ResourceMap } from '../../../base/common/map.js';
+import { Mimes, normalizeMimeType } from '../../../base/common/mime.js';
+import { nextCharLength } from '../../../base/common/strings.js';
+import { isString, isNumber, isObject, isStringArray } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
+import { FileSystemProviderErrorCode, markAsFileSystemProviderError } from '../../../platform/files/common/files.js';
 import { RemoteAuthorityResolverErrorCode } from '../../../platform/remote/common/remoteAuthorityResolver.js';
 import { isTextStreamMime } from '../../contrib/notebook/common/notebookCommon.js';
 var Disposable_1, Position_1, Range_1, Selection_1, TextEdit_1, NotebookEdit_1, SnippetString_1, Location_1, SymbolInformation_1, DocumentSymbol_1, CodeActionKind_1, MarkdownString_1, TaskGroup_1, Task_1, TreeItem_1, FileSystemError_1, TestMessage_1;

package/vscode/src/vs/workbench/api/common/extHostUriOpener.js

@@ -1,6 +1,6 @@
-import { toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
+import { toDisposable } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { URI } from '../../../base/common/uri.js';
 import { MainContext } from './extHost.protocol.js';
 class ExtHostUriOpeners {
     static { this.supportedSchemes = ( new Set([Schemas.http, Schemas.https])); }

package/vscode/src/vs/workbench/api/common/extHostUriTransformerService.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 IURITransformerService = ( createDecorator('IURITransformerService'));
 class URITransformerService {
     constructor(delegate) {

package/vscode/src/vs/workbench/api/common/extHostUrls.js

@@ -1,8 +1,8 @@
 import { MainContext } from './extHost.protocol.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { onUnexpectedError } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { ExtensionIdentifierSet } from 'monaco-editor/esm/vs/platform/extensions/common/extensions.js';
+import { URI } from '../../../base/common/uri.js';
+import { toDisposable } from '../../../base/common/lifecycle.js';
+import { onUnexpectedError } from '../../../base/common/errors.js';
+import { ExtensionIdentifierSet } from '../../../platform/extensions/common/extensions.js';
 class ExtHostUrls {
     static { this.HandlePool = 0; }
     constructor(mainContext) {

package/vscode/src/vs/workbench/api/common/extHostVariableResolverService.js

@@ -1,9 +1,9 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { Lazy } from 'monaco-editor/esm/vs/base/common/lazy.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import * as path from 'monaco-editor/esm/vs/base/common/path.js';
-import * as process from 'monaco-editor/esm/vs/base/common/process.js';
-import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { Lazy } from '../../../base/common/lazy.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { normalize } from '../../../base/common/path.js';
+import { cwd, env } from '../../../base/common/process.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 import { IExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors.js';
 import { IExtHostEditorTabs } from './extHostEditorTabs.js';
 import { IExtHostExtensionService } from './extHostExtensionService.js';
@@ -47,15 +47,15 @@ class ExtHostVariableResolverService extends AbstractVariableResolverService {
                 return configProvider.getConfiguration(undefined, folderUri).get(section);
             },
             getAppRoot: () => {
-                return process.cwd();
+                return cwd();
             },
             getExecPath: () => {
-                return process.env['VSCODE_EXEC_PATH'];
+                return env['VSCODE_EXEC_PATH'];
             },
             getFilePath: () => {
                 const activeUri = getActiveUri();
                 if (activeUri) {
-                    return path.normalize(activeUri.fsPath);
+                    return normalize(activeUri.fsPath);
                 }
                 return undefined;
             },
@@ -65,7 +65,7 @@ class ExtHostVariableResolverService extends AbstractVariableResolverService {
                     if (activeUri) {
                         const ws = workspaceService.getWorkspaceFolder(activeUri);
                         if (ws) {
-                            return path.normalize(ws.uri.fsPath);
+                            return normalize(ws.uri.fsPath);
                         }
                     }
                 }
@@ -92,7 +92,7 @@ class ExtHostVariableResolverService extends AbstractVariableResolverService {
             getExtension: (id) => {
                 return extensionService.getExtension(id);
             },
-        }, undefined, homeDir ? Promise.resolve(homeDir) : undefined, Promise.resolve(process.env));
+        }, undefined, homeDir ? Promise.resolve(homeDir) : undefined, Promise.resolve(env));
     }
 }
 let ExtHostVariableResolverProviderService = class ExtHostVariableResolverProviderService extends Disposable {

package/vscode/src/vs/workbench/api/common/extHostWebview.js

@@ -1,8 +1,8 @@
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import * as Objects from 'monaco-editor/esm/vs/base/common/objects.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { equals } from '../../../base/common/objects.js';
+import { URI } from '../../../base/common/uri.js';
 import { normalizeVersion, parseVersion } from '../../../platform/extensions/common/extensionValidator.js';
 import { deserializeWebviewMessage, serializeWebviewMessage } from './extHostWebviewMessaging.js';
 import { asWebviewUri, webviewGenericCspSource } from '../../contrib/webview/common/webview.js';
@@ -81,7 +81,7 @@ class ExtHostWebview {
     }
     set options(newOptions) {
         this.assertNotDisposed();
-        if (!Objects.equals(this.#options, newOptions)) {
+        if (!equals(this.#options, newOptions)) {
             this.#proxy.$setOptions(this.#handle, serializeWebviewOptions(this.#extension, this.#workspace, newOptions));
         }
         this.#options = newOptions;

package/vscode/src/vs/workbench/api/common/extHostWebviewMessaging.js

@@ -1,4 +1,4 @@
-import { VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
 class ArrayBufferSet {
     constructor() {
         this.buffers = [];

package/vscode/src/vs/workbench/api/common/extHostWebviewPanels.js

@@ -1,7 +1,7 @@
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } 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 { Emitter } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
 import { ViewColumn } from './extHostTypeConverters.js';
 import { shouldSerializeBuffersForPostMessage, toExtensionData, serializeWebviewOptions } from './extHostWebview.js';
 import { MainContext } from './extHost.protocol.js';

package/vscode/src/vs/workbench/api/common/extHostWebviewView.js

@@ -1,5 +1,5 @@
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable as Disposable$1 } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable as Disposable$1 } from '../../../base/common/lifecycle.js';
 import { toExtensionData, shouldSerializeBuffersForPostMessage } from './extHostWebview.js';
 import { ViewBadge } from './extHostTypeConverters.js';
 import { MainContext } from './extHost.protocol.js';

package/vscode/src/vs/workbench/api/common/extHostWindow.js

@@ -1,10 +1,10 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
+import { Emitter } from '../../../base/common/event.js';
 import { MainContext } from './extHost.protocol.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { isFalsyOrWhitespace } from 'monaco-editor/esm/vs/base/common/strings.js';
-import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { URI } from '../../../base/common/uri.js';
+import { Schemas } from '../../../base/common/network.js';
+import { isFalsyOrWhitespace } from '../../../base/common/strings.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 var ExtHostWindow_1;

package/vscode/src/vs/workbench/api/common/extHostWorkspace.js

@@ -1,20 +1,20 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { mapArrayOrNot, delta as delta$1 } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { Barrier } from 'monaco-editor/esm/vs/base/common/async.js';
-import { CancellationToken } from 'monaco-editor/esm/vs/base/common/cancellation.js';
-import { Emitter, AsyncEmitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { TernarySearchTree } from 'monaco-editor/esm/vs/base/common/ternarySearchTree.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { Counter } from 'monaco-editor/esm/vs/base/common/numbers.js';
-import { basename, dirname, basenameOrAuthority, relativePath, ExtUri } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { compare } 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 { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { Severity } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
-import { Workspace as Workspace$1, WorkspaceFolder } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
+import { mapArrayOrNot, delta as delta$1 } from '../../../base/common/arrays.js';
+import { Barrier } from '../../../base/common/async.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Emitter, AsyncEmitter } from '../../../base/common/event.js';
+import { toDisposable } from '../../../base/common/lifecycle.js';
+import { TernarySearchTree } from '../../../base/common/ternarySearchTree.js';
+import { Schemas } from '../../../base/common/network.js';
+import { Counter } from '../../../base/common/numbers.js';
+import { basename, dirname, basenameOrAuthority, relativePath, ExtUri } from '../../../base/common/resources.js';
+import { compare } from '../../../base/common/strings.js';
+import { URI } from '../../../base/common/uri.js';
+import { localizeWithPath } from '../../../nls.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { Severity } from '../../../platform/notification/common/notification.js';
+import { Workspace as Workspace$1, WorkspaceFolder } from '../../../platform/workspace/common/workspace.js';
 import { IExtHostFileSystemInfo } from './extHostFileSystemInfo.js';
 import { IExtHostInitDataService } from './extHostInitDataService.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
@@ -23,7 +23,7 @@ import { Range } from './extHostTypes.js';
 import { IURITransformerService } from './extHostUriTransformerService.js';
 import { resultIsMatch } from '../../services/search/common/search.js';
 import { MainContext } from './extHost.protocol.js';
-import { revive } from 'monaco-editor/esm/vs/base/common/marshalling.js';
+import { revive } from '../../../base/common/marshalling.js';
 function isFolderEqual(folderA, folderB, extHostFileSystemInfo) {
     return ( new ExtUri(uri => ignorePathCasing(uri, extHostFileSystemInfo))).isEqual(folderA, folderB);
 }

package/vscode/src/vs/workbench/api/common/extensionHostMain.js

@@ -1,20 +1,20 @@
-import * as errors from 'monaco-editor/esm/vs/base/common/errors.js';
-import * as performance from 'monaco-editor/esm/vs/base/common/performance.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
+import { setUnexpectedErrorHandler, transformErrorForSerialization } from '../../../base/common/errors.js';
+import { mark } from '../../../base/common/performance.js';
+import { URI } from '../../../base/common/uri.js';
 import { MainContext } from './extHost.protocol.js';
 import { RPCProtocol } from '../../services/extensions/common/rpcProtocol.js';
-import { ILogService, ILoggerService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { getSingletonServiceDescriptors } from 'monaco-editor/esm/vs/platform/instantiation/common/extensions.js';
-import { ServiceCollection } from 'monaco-editor/esm/vs/platform/instantiation/common/serviceCollection.js';
+import { ILogService, ILoggerService } from '../../../platform/log/common/log.js';
+import { getSingletonServiceDescriptors } from '../../../platform/instantiation/common/extensions.js';
+import { ServiceCollection } from '../../../platform/instantiation/common/serviceCollection.js';
 import { IExtHostInitDataService } from './extHostInitDataService.js';
-import { InstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiationService.js';
+import { InstantiationService } from '../../../platform/instantiation/common/instantiationService.js';
 import { IExtHostRpcService, ExtHostRpcService } from './extHostRpcService.js';
 import { IURITransformerService, URITransformerService } from './extHostUriTransformerService.js';
 import { IHostUtils, IExtHostExtensionService } from './extHostExtensionService.js';
 import { IExtHostTelemetry } from './extHostTelemetry.js';
-import { isWebWorker } from 'monaco-editor/esm/vs/base/common/platform.js';
+import { isWebWorker } from '../../../base/common/platform.js';
 import { ExtHostLogService } from './extHostLogService.js';
-import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
+import { SyncDescriptor } from '../../../platform/instantiation/common/descriptors.js';
 import { ExtHostLoggerService } from './extHostLoggerService.js';
 class ErrorHandler {
     static async installEarlyHandler(accessor) {
@@ -22,9 +22,9 @@ class ErrorHandler {
         const logService = accessor.get(ILogService);
         const rpcService = accessor.get(IExtHostRpcService);
         const mainThreadErrors = ( rpcService.getProxy(MainContext.MainThreadErrors));
-        errors.setUnexpectedErrorHandler(err => {
+        setUnexpectedErrorHandler(err => {
             logService.error(err);
-            const data = errors.transformErrorForSerialization(err);
+            const data = transformErrorForSerialization(err);
             mainThreadErrors.$onUnexpectedError(data);
         });
     }
@@ -74,9 +74,9 @@ class ErrorHandler {
                 Object.assign(_prepareStackTrace, { [_wasWrapped]: true });
             },
         });
-        errors.setUnexpectedErrorHandler(err => {
+        setUnexpectedErrorHandler(err => {
             logService.error(err);
-            const errorData = errors.transformErrorForSerialization(err);
+            const errorData = transformErrorForSerialization(err);
             const stackData = extensionErrors.get(err);
             if (!stackData?.extensionIdentifier) {
                 mainThreadErrors.$onUnexpectedError(errorData);
@@ -105,7 +105,7 @@ class ExtensionHostMain {
             instaService.invokeFunction(ErrorHandler.installEarlyHandler);
         }
         this._logService = instaService.invokeFunction(accessor => accessor.get(ILogService));
-        performance.mark(`code/extHost/didCreateServices`);
+        mark(`code/extHost/didCreateServices`);
         if (this._hostUtils.pid) {
             this._logService.info(`Extension host with pid ${this._hostUtils.pid} started`);
         }

package/vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js

@@ -1,12 +1,12 @@
-import * as nls from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from '../../../nls.js';
 import { ExtensionsRegistry } from '../../services/extensions/common/extensionsRegistry.js';
-import * as resources from 'monaco-editor/esm/vs/base/common/resources.js';
-import { isString } from 'monaco-editor/esm/vs/base/common/types.js';
+import { joinPath, isEqualOrParent } from '../../../base/common/resources.js';
+import { isString } from '../../../base/common/types.js';
 const configurationExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'jsonValidation',
     defaultExtensionKind: ['workspace', 'web'],
     jsonSchema: {
-        description: ( nls.localizeWithPath(
+        description: ( localizeWithPath(
             'vs/workbench/api/common/jsonValidationExtensionPoint',
             'contributes.jsonValidation',
             'Contributes json schema configuration.'
@@ -19,7 +19,7 @@ const configurationExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
             properties: {
                 fileMatch: {
                     type: ['string', 'array'],
-                    description: ( nls.localizeWithPath(
+                    description: ( localizeWithPath(
                         'vs/workbench/api/common/jsonValidationExtensionPoint',
                         'contributes.jsonValidation.fileMatch',
                         'The file pattern (or an array of patterns) to match, for example "package.json" or "*.launch". Exclusion patterns start with \'!\''
@@ -29,7 +29,7 @@ const configurationExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
                     }
                 },
                 url: {
-                    description: ( nls.localizeWithPath(
+                    description: ( localizeWithPath(
                         'vs/workbench/api/common/jsonValidationExtensionPoint',
                         'contributes.jsonValidation.url',
                         'A schema URL (\'http:\', \'https:\') or relative path to the extension folder (\'./\').'
@@ -48,7 +48,7 @@ class JSONValidationExtensionPoint {
                 const collector = extension.collector;
                 const extensionLocation = extension.description.extensionLocation;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( nls.localizeWithPath(
+                    collector.error(( localizeWithPath(
                         'vs/workbench/api/common/jsonValidationExtensionPoint',
                         'invalid.jsonValidation',
                         "'configuration.jsonValidation' must be a array"
@@ -57,7 +57,7 @@ class JSONValidationExtensionPoint {
                 }
                 extensionValue.forEach(extension => {
                     if (!isString(extension.fileMatch) && !(Array.isArray(extension.fileMatch) && extension.fileMatch.every(isString))) {
-                        collector.error(( nls.localizeWithPath(
+                        collector.error(( localizeWithPath(
                             'vs/workbench/api/common/jsonValidationExtensionPoint',
                             'invalid.fileMatch',
                             "'configuration.jsonValidation.fileMatch' must be defined as a string or an array of strings."
@@ -66,7 +66,7 @@ class JSONValidationExtensionPoint {
                     }
                     const uri = extension.url;
                     if (!isString(uri)) {
-                        collector.error(( nls.localizeWithPath(
+                        collector.error(( localizeWithPath(
                             'vs/workbench/api/common/jsonValidationExtensionPoint',
                             'invalid.url',
                             "'configuration.jsonValidation.url' must be a URL or relative path"
@@ -75,9 +75,9 @@ class JSONValidationExtensionPoint {
                     }
                     if (uri.startsWith('./')) {
                         try {
-                            const colorThemeLocation = resources.joinPath(extensionLocation, uri);
-                            if (!resources.isEqualOrParent(colorThemeLocation, extensionLocation)) {
-                                collector.warn(( nls.localizeWithPath(
+                            const colorThemeLocation = joinPath(extensionLocation, uri);
+                            if (!isEqualOrParent(colorThemeLocation, extensionLocation)) {
+                                collector.warn(( localizeWithPath(
                                     'vs/workbench/api/common/jsonValidationExtensionPoint',
                                     'invalid.path.1',
                                     "Expected `contributes.{0}.url` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.",
@@ -88,7 +88,7 @@ class JSONValidationExtensionPoint {
                             }
                         }
                         catch (e) {
-                            collector.error(( nls.localizeWithPath(
+                            collector.error(( localizeWithPath(
                                 'vs/workbench/api/common/jsonValidationExtensionPoint',
                                 'invalid.url.fileschema',
                                 "'configuration.jsonValidation.url' is an invalid relative URL: {0}",
@@ -97,7 +97,7 @@ class JSONValidationExtensionPoint {
                         }
                     }
                     else if (!/^[^:/?#]+:\/\//.test(uri)) {
-                        collector.error(( nls.localizeWithPath(
+                        collector.error(( localizeWithPath(
                             'vs/workbench/api/common/jsonValidationExtensionPoint',
                             'invalid.url.schema',
                             "'configuration.jsonValidation.url' must be an absolute URL or start with './'  to reference schemas located in the extension."

package/vscode/src/vs/workbench/api/worker/extHost.worker.services.js

@@ -1,6 +1,6 @@
-import { registerSingleton } from 'monaco-editor/esm/vs/platform/instantiation/common/extensions.js';
+import { registerSingleton } from '../../../platform/instantiation/common/extensions.js';
 import { IExtHostExtensionService } from '../common/extHostExtensionService.js';
-import { IExtensionStoragePaths, ExtensionStoragePaths } from '../common/extHostStoragePaths.js';
+import { ExtensionStoragePaths, IExtensionStoragePaths } from '../common/extHostStoragePaths.js';
 import { ExtHostExtensionService } from './extHostExtensionService.js';
 registerSingleton(IExtHostExtensionService, ExtHostExtensionService, 0 );
 registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths, 0 );

package/vscode/src/vs/workbench/api/worker/extHostExtensionService.js

@@ -1,11 +1,11 @@
 import { createApiFactoryAndRegisterActors } from '../common/extHost.api.impl.js';
 import { AbstractExtHostExtensionService } from '../common/extHostExtensionService.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
+import { URI } from '../../../base/common/uri.js';
 import { RequireInterceptor } from '../common/extHostRequireInterceptor.js';
 import { ExtensionRuntime } from '../common/extHostTypes.js';
-import { timeout } from 'monaco-editor/esm/vs/base/common/async.js';
+import { timeout } from '../../../base/common/async.js';
 import { ExtHostConsoleForwarder } from './extHostConsoleForwarder.js';
-import { isWebWorker } from 'monaco-editor/esm/vs/base/common/platform.js';
+import { isWebWorker } from '../../../base/common/platform.js';
 class WorkerRequireInterceptor extends RequireInterceptor {
     _installInterceptor() { }
     getModule(request, parent) {