@codingame/monaco-vscode-api 3.1.1 → 3.2.0

package/missing-services.js

@@ -7,7 +7,7 @@ import { IUriIdentityService } from './vscode/src/vs/platform/uriIdentity/common
 import { ITextFileService } from './vscode/src/vs/workbench/services/textfile/common/textfiles.js';
 import { IFileService } from './vscode/src/vs/platform/files/common/files.js';
 import { IEditorGroupsService } from './vscode/src/vs/workbench/services/editor/common/editorGroupsService.js';
-import { WorkingCopyFileService, IWorkingCopyFileService } from './vscode/src/vs/workbench/services/workingCopy/common/workingCopyFileService.js';
+import { IWorkingCopyFileService } from './vscode/src/vs/workbench/services/workingCopy/common/workingCopyFileService.js';
 import { IPathService } from './vscode/src/vs/workbench/services/path/common/pathService.js';
 import { registerSingleton } from './vscode/src/vs/platform/instantiation/common/extensions.js';
 import { IProductService } from './vscode/src/vs/platform/product/common/productService.js';
@@ -42,7 +42,6 @@ import { IViewDescriptorService } from './vscode/src/vs/workbench/common/views.j
 import { IHistoryService } from './vscode/src/vs/workbench/services/history/common/history.js';
 import { ITaskService } from './vscode/src/vs/workbench/contrib/tasks/common/taskService.js';
 import { IConfigurationResolverService } from './vscode/src/vs/workbench/services/configurationResolver/common/configurationResolver.js';
-import { BrowserPathService } from './vscode/src/vs/workbench/services/path/browser/pathService.js';
 import { IRemoteAgentService } from './vscode/src/vs/workbench/services/remote/common/remoteAgentService.js';
 import { ICustomEndpointTelemetryService } from './vscode/src/vs/platform/telemetry/common/telemetry.js';
 import { NullEndpointTelemetryService } from './vscode/src/vs/platform/telemetry/common/telemetryUtils.js';
@@ -194,8 +193,8 @@ import { IExtensionFeaturesManagementService } from './vscode/src/vs/workbench/s
 import { IEditorPaneService } from './vscode/src/vs/workbench/services/editor/common/editorPaneService.js';
 import { IWorkspaceIdentityService } from './vscode/src/vs/workbench/services/workspaces/common/workspaceIdentityService.js';
 import { IDefaultLogLevelsService } from './vscode/src/vs/workbench/contrib/logs/common/defaultLogLevels.js';
-import { getBuiltInExtensionTranslationsUris } from './l10n.js';
 import { unsupported } from './tools.js';
+import { getBuiltInExtensionTranslationsUris } from './l10n.js';
 import { IFileDialogService } from './vscode/src/vs/platform/dialogs/common/dialogs.js';
 var _a;
 registerSingleton(ILoggerService, class NullLoggerService extends AbstractLoggerService {
@@ -525,13 +524,41 @@ registerSingleton(ITitleService, class TitleService {
     }
     updateProperties() { }
 }, 0 );
-registerSingleton(IWorkingCopyFileService, WorkingCopyFileService, 0 );
-registerSingleton(IPathService, BrowserPathService, 1 );
+registerSingleton(IWorkingCopyFileService, class WorkingCopyFileService {
+    constructor() {
+        this.onWillRunWorkingCopyFileOperation = Event.None;
+        this.onDidFailWorkingCopyFileOperation = Event.None;
+        this.onDidRunWorkingCopyFileOperation = Event.None;
+        this.addFileOperationParticipant = unsupported;
+        this.hasSaveParticipants = false;
+        this.addSaveParticipant = unsupported;
+        this.runSaveParticipants = unsupported;
+        this.create = unsupported;
+        this.createFolder = unsupported;
+        this.move = unsupported;
+        this.copy = unsupported;
+        this.delete = unsupported;
+        this.registerWorkingCopyProvider = unsupported;
+        this.getDirty = () => [];
+    }
+}, 0 );
+registerSingleton(IPathService, class PathService {
+    constructor() {
+        this.defaultUriScheme = 'file';
+        this.fileURI = unsupported;
+        this.userHome = unsupported;
+        this.hasValidBasename = unsupported;
+        this.resolvedUserHome = undefined;
+    }
+    get path() {
+        return unsupported();
+    }
+}, 1 );
 registerSingleton(IProductService, class ProductService {
     constructor() {
         this._serviceBrand = undefined;
-        this.version = "1.87.1";
-        this.commit = "1.87.1";
+        this.version = "1.87.2";
+        this.commit = "1.87.2";
         this.quality = 'oss';
         this.nameShort = 'Code - OSS Dev';
         this.nameLong = 'Code - OSS Dev';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
   "author": {
@@ -94,14 +94,12 @@
     }
   },
   "dependencies": {
-    "vscode-marked": "npm:marked@=3.0.2",
-    "vscode-semver": "npm:semver@=5.5.0",
-    "@codingame/monaco-vscode-files-service-override": "3.1.1",
-    "@codingame/monaco-vscode-quickaccess-service-override": "3.1.1",
-    "@codingame/monaco-vscode-extensions-service-override": "3.1.1",
-    "@codingame/monaco-vscode-environment-service-override": "3.1.1",
-    "@codingame/monaco-vscode-layout-service-override": "3.1.1",
-    "@codingame/monaco-vscode-host-service-override": "3.1.1",
-    "@codingame/monaco-vscode-base-service-override": "3.1.1"
+    "@codingame/monaco-vscode-files-service-override": "3.2.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "3.2.0",
+    "@codingame/monaco-vscode-extensions-service-override": "3.2.0",
+    "@codingame/monaco-vscode-environment-service-override": "3.2.0",
+    "@codingame/monaco-vscode-layout-service-override": "3.2.0",
+    "@codingame/monaco-vscode-host-service-override": "3.2.0",
+    "@codingame/monaco-vscode-base-service-override": "3.2.0"
   }
 }

package/services.d.ts

@@ -14,7 +14,7 @@ export { IColorTheme, IThemeService } from './vscode/src/vs/platform/theme/commo
 export { ICodeEditorService } from './vscode/src/vs/editor/browser/services/codeEditorService.js';
 export { IConfigurationChangeEvent, IConfigurationService } from './vscode/src/vs/platform/configuration/common/configuration.js';
 export { INeverShowAgainOptions, INotification, INotificationActions, INotificationHandle, INotificationProgress, INotificationProgressProperties, INotificationProperties, INotificationService, IPromptChoice, IPromptChoiceWithMenu, IPromptOptions, IStatusMessageOptions, NeverShowAgainScope, NoOpNotification, NoOpProgress, NotificationMessage, NotificationPriority, NotificationsFilter } from './vscode/src/vs/platform/notification/common/notification.js';
-export { IStorageService, StorageScope, StorageTarget } from './vscode/src/vs/platform/storage/common/storage.js';
+export { IStorageService } from './vscode/src/vs/platform/storage/common/storage.js';
 export { ITextModelContentProvider, ITextModelService } from './vscode/src/vs/editor/common/services/resolverService.js';
 import { WorkbenchContributionInstantiation } from './vscode/src/vs/workbench/common/contributions.js';
 export { ILazyWorkbenchContributionInstantiation, IOnEditorWorkbenchContributionInstantiation, WorkbenchPhase } from './vscode/src/vs/workbench/common/contributions.js';
@@ -33,11 +33,12 @@ export { IModelService } from './vscode/src/vs/editor/common/services/model.js';
 export { ITelemetryService } from './vscode/src/vs/platform/telemetry/common/telemetry.js';
 export { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService, IWorkspaceTrustUriInfo } from './vscode/src/vs/platform/workspace/common/workspaceTrust.js';
 export { DialogType, IBaseDialogOptions, ICheckbox, ICheckboxResult, IConfirmDialogArgs, IConfirmation, IConfirmationResult, ICustomDialogMarkdown, ICustomDialogOptions, IDialogArgs, IDialogHandler, IDialogResult, IDialogService, IFileDialogService, IInput, IInputDialogArgs, IInputElement, IInputResult, IPrompt, IPromptBaseButton, IPromptButton, IPromptCancelButton, IPromptDialogArgs, IPromptResult, IPromptResultWithCancel, IPromptWithCustomCancel, IPromptWithDefaultCancel } from './vscode/src/vs/platform/dialogs/common/dialogs.js';
+export { StorageScope, StorageTarget } from 'vscode/src/vs/platform/storage/common/storage';
 import { IEditorOverrideServices } from './vscode/src/vs/editor/standalone/browser/standaloneServices.js';
 export { StandaloneServices } from './vscode/src/vs/editor/standalone/browser/standaloneServices.js';
 export { IProductService } from './vscode/src/vs/platform/product/common/productService.js';
 import { IWorkbenchConstructionOptions } from './vscode/src/vs/workbench/browser/web.api.js';
-import { IProductConfiguration } from './vscode/src/vs/base/common/product.js';
+import { EnvironmentOverride } from './workbench.js';
 export { SyncDescriptor } from './vscode/src/vs/platform/instantiation/common/descriptors.js';
 export { IBulkEditService } from './vscode/src/vs/editor/browser/services/bulkEditService.js';
 export { IFileService } from './vscode/src/vs/platform/files/common/files.js';
@@ -81,7 +82,7 @@ export { IStatusbarService } from './vscode/src/vs/workbench/services/statusbar/
 export { ITitleService } from './vscode/src/vs/workbench/services/title/browser/titleService.js';
 export { IBannerService } from './vscode/src/vs/workbench/services/banner/browser/bannerService.js';
 
-declare function initialize(overrides: IEditorOverrideServices, container?: HTMLElement, configuration?: IWorkbenchConstructionOptions, productConfiguration?: Partial<IProductConfiguration>): Promise<void>;
+declare function initialize(overrides: IEditorOverrideServices, container?: HTMLElement, configuration?: IWorkbenchConstructionOptions, env?: EnvironmentOverride): Promise<void>;
 declare function getService<T>(identifier: ServiceIdentifier<T>): Promise<T>;
 declare function createInstance<Ctor extends new (...args: any[]) => any, R extends InstanceType<Ctor>>(ctor: Ctor, ...args: GetLeadingNonServiceArgs<ConstructorParameters<Ctor>>): Promise<R>;
 declare function createInstanceSync<Ctor extends new (...args: any[]) => any, R extends InstanceType<Ctor>>(ctor: Ctor, ...args: GetLeadingNonServiceArgs<ConstructorParameters<Ctor>>): R;

package/services.js

@@ -145,14 +145,14 @@ export { IBannerService } from './vscode/src/vs/workbench/services/banner/browse
 export { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from './vscode/src/vs/platform/workspace/common/workspaceTrust.js';
 export { IKeybindingService } from './vscode/src/vs/platform/keybinding/common/keybinding.js';
 export { IDialogService, IFileDialogService } from './vscode/src/vs/platform/dialogs/common/dialogs.js';
-async function initialize(overrides, container = document.body, configuration = {}, productConfiguration = {}) {
+async function initialize(overrides, container = document.body, configuration = {}, env) {
     checkServicesNotInitialized();
-    initialize$1(container, configuration);
+    initialize$1(container, configuration, env);
     const instantiationService = StandaloneServices.initialize({
         [( IProductService.toString())]: mixin({
-            version: "1.87.1",
+            version: "1.87.2",
             quality: 'oss',
-            commit: "1.87.1",
+            commit: "1.87.2",
             nameShort: 'Code - OSS Dev',
             nameLong: 'Code - OSS Dev',
             applicationName: 'code-oss',
@@ -161,8 +161,7 @@ async function initialize(overrides, container = document.body, configuration =
             reportIssueUrl: 'https://github.com/microsoft/vscode/issues/new',
             licenseName: 'MIT',
             licenseUrl: 'https://github.com/microsoft/vscode/blob/main/LICENSE.txt',
-            serverApplicationName: 'code-server-oss',
-            ...productConfiguration
+            serverApplicationName: 'code-server-oss'
         }, configuration.productConfiguration ?? {}),
         ...getServiceOverride(),
         ...getServiceOverride$1(),

package/vscode/src/vs/base/browser/markdownRenderer.js

@@ -12,7 +12,7 @@ import { markdownEscapeEscapedIcons } from '../common/iconLabels.js';
 import { defaultGenerator } from '../common/idGenerator.js';
 import { Lazy } from '../common/lazy.js';
 import { DisposableStore } from '../common/lifecycle.js';
-import marked from 'vscode-marked';
+import marked_1 from '../../../../../external/vscode-marked/lib/marked.esm.js';
 import { parse } from '../common/marshalling.js';
 import { Schemas, FileAccess } from '../common/network.js';
 import { cloneAndChange } from '../common/objects.js';
@@ -105,7 +105,7 @@ function renderMarkdown(markdown, options = {}, markedOptions = {}) {
         }
         return ( uri.toString());
     };
-    const renderer = new marked.Renderer();
+    const renderer = new marked_1.Renderer();
     renderer.image = defaultMarkedRenderers.image;
     renderer.link = defaultMarkedRenderers.link;
     renderer.paragraph = defaultMarkedRenderers.paragraph;
@@ -188,15 +188,15 @@ function renderMarkdown(markdown, options = {}, markedOptions = {}) {
     let renderedMarkdown;
     if (options.fillInIncompleteTokens) {
         const opts = {
-            ...marked.defaults,
+            ...marked_1.defaults,
             ...markedOptions
         };
-        const tokens = marked.lexer(value, opts);
+        const tokens = marked_1.lexer(value, opts);
         const newTokens = fillInIncompleteTokens(tokens);
-        renderedMarkdown = marked.parser(newTokens, opts);
+        renderedMarkdown = marked_1.parser(newTokens, opts);
     }
     else {
-        renderedMarkdown = marked.parse(value, markedOptions);
+        renderedMarkdown = marked_1.parse(value, markedOptions);
     }
     if (markdown.supportThemeIcons) {
         const elements = renderLabelWithIcons(renderedMarkdown);
@@ -401,7 +401,7 @@ function renderMarkdownAsPlaintext(markdown) {
     if (value.length > 100000) {
         value = `${value.substr(0, 100000)}…`;
     }
-    const html = marked.parse(value, { renderer: plainTextRenderer.value }).replace(/&(#\d+|[a-zA-Z]+);/g, m => unescapeInfo.get(m) ?? m);
+    const html = marked_1.parse(value, { renderer: plainTextRenderer.value }).replace(/&(#\d+|[a-zA-Z]+);/g, m => unescapeInfo.get(m) ?? m);
     return ( sanitizeRenderedMarkdown({ isTrusted: false }, html).toString());
 }
 const unescapeInfo = ( new Map([
@@ -413,7 +413,7 @@ const unescapeInfo = ( new Map([
     ['>', '>'],
 ]));
 const plainTextRenderer = ( new Lazy(() => {
-    const renderer = new marked.Renderer();
+    const renderer = new marked_1.Renderer();
     renderer.code = (code) => {
         return code;
     };
@@ -556,7 +556,7 @@ function fillInIncompleteTokens(tokens) {
 }
 function completeCodeBlock(tokens, leader) {
     const mergedRawText = mergeRawTokenText(tokens);
-    return marked.lexer(mergedRawText + `\n${leader}`);
+    return marked_1.lexer(mergedRawText + `\n${leader}`);
 }
 function completeCodespan(token) {
     return completeWithString(token, '`');
@@ -584,7 +584,7 @@ function completeDoubleUnderscore(tokens) {
 }
 function completeWithString(tokens, closingString) {
     const mergedRawText = mergeRawTokenText(Array.isArray(tokens) ? tokens : [tokens]);
-    return marked.lexer(mergedRawText + closingString)[0];
+    return marked_1.lexer(mergedRawText + closingString)[0];
 }
 function completeTable(tokens) {
     const mergedRawText = mergeRawTokenText(tokens);
@@ -615,7 +615,7 @@ function completeTable(tokens) {
         const prefixText = hasSeparatorRow ? lines.slice(0, -1).join('\n') : mergedRawText;
         const line1EndsInPipe = !!prefixText.match(/\|\s*$/);
         const newRawText = prefixText + (line1EndsInPipe ? '' : '|') + `\n|${' --- |'.repeat(numCols)}`;
-        return marked.lexer(newRawText);
+        return marked_1.lexer(newRawText);
     }
     return undefined;
 }