@codingame/monaco-vscode-extension-gallery-service-override 1.85.0 → 1.85.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extension-gallery-service-override",
-  "version": "1.85.0",
+  "version": "1.85.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.1",
     "monaco-editor": "0.45.0",
     "vscode-semver": "npm:semver@=5.5.0"
   }

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionEditor.js

@@ -50,7 +50,7 @@ import { Delegate } from './extensionsList.js';
 import { ExtensionsTree, ExtensionData, ExtensionsGridView, getExtensions } from './extensionsViewer.js';
 import { RemoteBadgeWidget, VerifiedPublisherWidget, InstallCountWidget, RatingsWidget, SponsorWidget, ExtensionStatusWidget, ExtensionWidget, ExtensionRecommendationWidget, onClick } from './extensionsWidgets.js';
 import { ExtensionContainers, VIEWLET_ID, IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
-import { renderMarkdownDocument, DEFAULT_MARKDOWN_STYLES } from '../../markdown/browser/markdownDocumentRenderer.js';
+import { renderMarkdownDocument, DEFAULT_MARKDOWN_STYLES } from 'vscode/vscode/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer';
 import { ShowCurrentReleaseNotesActionId } from '../../update/common/update.js';
 import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED, IWebviewService } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';

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

@@ -9,7 +9,7 @@ import { Extensions as Extensions$3 } from 'vscode/vscode/vs/workbench/common/co
 import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
 import { VIEWLET_ID, IExtensionsWorkbenchService, CONTEXT_HAS_GALLERY, AutoUpdateConfigurationKey, HasOutdatedExtensionsContext, OUTDATED_EXTENSIONS_VIEW_ID, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, extensionsSearchActionsMenu, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, THEME_ACTIONS_GROUP, INSTALL_ACTIONS_GROUP, UPDATE_ACTIONS_GROUP, TOGGLE_IGNORE_EXTENSION_ACTION_ID } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
 import { SearchExtensionsAction, PromptExtensionInstallFailureAction, ConfigureWorkspaceFolderRecommendedExtensionsAction, InstallSpecificVersionOfExtensionAction, ReinstallAction, SetColorThemeAction, SetFileIconThemeAction, SetProductIconThemeAction, ToggleAutoUpdateForExtensionAction, ToggleAutoUpdatesForPublisherAction, SwitchToPreReleaseVersionAction, SwitchToReleasedVersionAction, ClearLanguageAction, ConfigureWorkspaceRecommendedExtensionsAction } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
-import { ExtensionsInput } from '../common/extensionsInput.js';
+import { ExtensionsInput } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensionsInput';
 import { ExtensionEditor } from './extensionEditor.js';
 import { ExtensionsViewPaneContainer, StatusUpdater, MaliciousExtensionChecker, ExtensionsViewletViewsContribution, DefaultViewsContext, SearchHasTextContext } from './extensionsViewlet.js';
 import { Extensions as Extensions$2 } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
@@ -17,7 +17,7 @@ import * as JSONContributionRegistry from 'monaco-editor/esm/vs/platform/jsonsch
 import { ExtensionsConfigurationSchemaId, ExtensionsConfigurationSchema } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensionsFileTemplate';
 import { CommandsRegistry, ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { KeymapExtensions } from '../common/extensionsUtils.js';
+import { KeymapExtensions } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensionsUtils';
 import { areSameExtensions, getIdAndVersion } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.js

@@ -15,7 +15,7 @@ import { VIEWLET_ID, CONTEXT_HAS_GALLERY, OUTDATED_EXTENSIONS_VIEW_ID, WORKSPACE
 import { InstallLocalExtensionsInRemoteAction, InstallRemoteExtensionsInLocalAction } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
 import { IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { IExtensionManagementServerService, IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
-import { ExtensionsInput } from '../common/extensionsInput.js';
+import { ExtensionsInput } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensionsInput';
 import { ServerInstalledExtensionsView, DefaultPopularExtensionsView, DefaultRecommendedExtensionsView, EnabledExtensionsView, DisabledExtensionsView, SearchMarketplaceExtensionsView, ExtensionsListView, RecentlyUpdatedExtensionsView, OutdatedExtensionsView, WorkspaceRecommendedExtensionsView, RecommendedExtensionsView, BuiltInFeatureExtensionsView, BuiltInThemesExtensionsView, BuiltInProgrammingLanguageExtensionsView, UntrustedWorkspaceUnsupportedExtensionsView, UntrustedWorkspacePartiallySupportedExtensionsView, VirtualWorkspaceUnsupportedExtensionsView, VirtualWorkspacePartiallySupportedExtensionsView, DeprecatedExtensionsView } from './extensionsViews.js';
 import { IProgressService } from 'monaco-editor/esm/vs/platform/progress/common/progress.js';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.js

@@ -18,7 +18,7 @@ import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import { HasOutdatedExtensionsContext, AutoUpdateConfigurationKey, AutoCheckUpdatesConfigurationKey } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
 import { SIDE_GROUP, ACTIVE_GROUP, IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IURLService } from 'vscode/vscode/vs/platform/url/common/url';
-import { ExtensionsInput } from '../common/extensionsInput.js';
+import { ExtensionsInput } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensionsInput';
 import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
 import { IProgressService } from 'monaco-editor/esm/vs/platform/progress/common/progress.js';
 import { Severity, INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';

package/vscode/src/vs/workbench/contrib/extensions/common/extensionsInput.js

@@ -1,43 +0,0 @@
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
-import { areSameExtensions } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
-import { join } from 'monaco-editor/esm/vs/base/common/path.js';
-
-class ExtensionsInput extends EditorInput {
-    static { this.ID = 'workbench.extensions.input2'; }
-    get typeId() {
-        return ExtensionsInput.ID;
-    }
-    get capabilities() {
-        return 2  | 8  | 1024 ;
-    }
-    get resource() {
-        return ( URI.from({
-            scheme: Schemas.extension,
-            path: join(this._extension.identifier.id, 'extension')
-        }));
-    }
-    constructor(_extension) {
-        super();
-        this._extension = _extension;
-    }
-    get extension() { return this._extension; }
-    getName() {
-        return ( localizeWithPath(
-            'vs/workbench/contrib/extensions/common/extensionsInput',
-            'extensionsInputName',
-            "Extension: {0}",
-            this._extension.displayName
-        ));
-    }
-    matches(other) {
-        if (super.matches(other)) {
-            return true;
-        }
-        return other instanceof ExtensionsInput && areSameExtensions(this._extension.identifier, other._extension.identifier);
-    }
-}
-
-export { ExtensionsInput };

package/vscode/src/vs/workbench/contrib/extensions/common/extensionsUtils.js

@@ -1,104 +0,0 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import { onUnexpectedError } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
-import { IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionRecommendationsService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { areSameExtensions } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
-import { Severity, INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
-
-let KeymapExtensions = class KeymapExtensions extends Disposable {
-    constructor(instantiationService, extensionEnablementService, tipsService, lifecycleService, notificationService) {
-        super();
-        this.instantiationService = instantiationService;
-        this.extensionEnablementService = extensionEnablementService;
-        this.tipsService = tipsService;
-        this.notificationService = notificationService;
-        this._register(lifecycleService.onDidShutdown(() => this.dispose()));
-        this._register(instantiationService.invokeFunction(onExtensionChanged)((identifiers => {
-            Promise.all(( identifiers.map(identifier => this.checkForOtherKeymaps(identifier))))
-                .then(undefined, onUnexpectedError);
-        })));
-    }
-    checkForOtherKeymaps(extensionIdentifier) {
-        return this.instantiationService.invokeFunction(getInstalledExtensions).then(extensions => {
-            const keymaps = extensions.filter(extension => isKeymapExtension(this.tipsService, extension));
-            const extension = keymaps.find(extension => areSameExtensions(extension.identifier, extensionIdentifier));
-            if (extension && extension.globallyEnabled) {
-                const otherKeymaps = keymaps.filter(extension => !areSameExtensions(extension.identifier, extensionIdentifier) && extension.globallyEnabled);
-                if (otherKeymaps.length) {
-                    return this.promptForDisablingOtherKeymaps(extension, otherKeymaps);
-                }
-            }
-            return undefined;
-        });
-    }
-    promptForDisablingOtherKeymaps(newKeymap, oldKeymaps) {
-        const onPrompt = (confirmed) => {
-            if (confirmed) {
-                this.extensionEnablementService.setEnablement(( oldKeymaps.map(keymap => keymap.local)), 6 );
-            }
-        };
-        this.notificationService.prompt(Severity.Info, ( localizeWithPath(
-            'vs/workbench/contrib/extensions/common/extensionsUtils',
-            'disableOtherKeymapsConfirmation',
-            "Disable other keymaps ({0}) to avoid conflicts between keybindings?",
-            ( oldKeymaps.map(k => `'${k.local.manifest.displayName}'`)).join(', ')
-        )), [{
-                label: ( localizeWithPath('vs/workbench/contrib/extensions/common/extensionsUtils', 'yes', "Yes")),
-                run: () => onPrompt(true)
-            }, {
-                label: ( localizeWithPath('vs/workbench/contrib/extensions/common/extensionsUtils', 'no', "No")),
-                run: () => onPrompt(false)
-            }]);
-    }
-};
-KeymapExtensions = ( __decorate([
-    ( __param(0, IInstantiationService)),
-    ( __param(1, IWorkbenchExtensionEnablementService)),
-    ( __param(2, IExtensionRecommendationsService)),
-    ( __param(3, ILifecycleService)),
-    ( __param(4, INotificationService))
-], KeymapExtensions));
-function onExtensionChanged(accessor) {
-    const extensionService = accessor.get(IExtensionManagementService);
-    const extensionEnablementService = accessor.get(IWorkbenchExtensionEnablementService);
-    const onDidInstallExtensions = Event.chain(extensionService.onDidInstallExtensions, $ => ( $.filter(e => ( e.some(({ operation }) => operation === 2 )))
-        .map(e => ( e.map(({ identifier }) => identifier)))));
-    return Event.debounce(Event.any(Event.any(onDidInstallExtensions, ( Event.map(extensionService.onDidUninstallExtension, e => [e.identifier]))), ( Event.map(
-        extensionEnablementService.onEnablementChanged,
-        extensions => ( extensions.map(e => e.identifier))
-    ))), (result, identifiers) => {
-        result = result || [];
-        for (const identifier of identifiers) {
-            if (( result.some(l => !areSameExtensions(l, identifier)))) {
-                result.push(identifier);
-            }
-        }
-        return result;
-    });
-}
-async function getInstalledExtensions(accessor) {
-    const extensionService = accessor.get(IExtensionManagementService);
-    const extensionEnablementService = accessor.get(IWorkbenchExtensionEnablementService);
-    const extensions = await extensionService.getInstalled();
-    return ( extensions.map(extension => {
-        return {
-            identifier: extension.identifier,
-            local: extension,
-            globallyEnabled: extensionEnablementService.isEnabled(extension)
-        };
-    }));
-}
-function isKeymapExtension(tipsService, extension) {
-    const cats = extension.local.manifest.categories;
-    return cats && cats.indexOf('Keymaps') !== -1 || ( tipsService.getKeymapRecommendations().some(
-        extensionId => areSameExtensions({ id: extensionId }, extension.local.identifier)
-    ));
-}
-
-export { KeymapExtensions, getInstalledExtensions };

package/vscode/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.js

@@ -1,207 +0,0 @@
-import { hookDomPurifyHrefAndSrcSanitizer, basicMarkupHtmlTags } from 'monaco-editor/esm/vs/base/browser/dom.js';
-import * as dompurify from 'monaco-editor/esm/vs/base/browser/dompurify/dompurify.js';
-import { allowedMarkdownAttr } from 'monaco-editor/esm/vs/base/browser/markdownRenderer.js';
-import { marked } from 'monaco-editor/esm/vs/base/common/marked/marked.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { tokenizeToString } from 'monaco-editor/esm/vs/editor/common/languages/textToHtmlTokenizer.js';
-import { escape } from 'monaco-editor/esm/vs/base/common/strings.js';
-
-const DEFAULT_MARKDOWN_STYLES = `
-body {
-	padding: 10px 20px;
-	line-height: 22px;
-	max-width: 882px;
-	margin: 0 auto;
-}
-
-body *:last-child {
-	margin-bottom: 0;
-}
-
-img {
-	max-width: 100%;
-	max-height: 100%;
-}
-
-a {
-	text-decoration: none;
-}
-
-a:hover {
-	text-decoration: underline;
-}
-
-a:focus,
-input:focus,
-select:focus,
-textarea:focus {
-	outline: 1px solid -webkit-focus-ring-color;
-	outline-offset: -1px;
-}
-
-hr {
-	border: 0;
-	height: 2px;
-	border-bottom: 2px solid;
-}
-
-h1 {
-	padding-bottom: 0.3em;
-	line-height: 1.2;
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-}
-
-h1, h2, h3 {
-	font-weight: normal;
-}
-
-table {
-	border-collapse: collapse;
-}
-
-th {
-	text-align: left;
-	border-bottom: 1px solid;
-}
-
-th,
-td {
-	padding: 5px 10px;
-}
-
-table > tbody > tr + tr > td {
-	border-top-width: 1px;
-	border-top-style: solid;
-}
-
-blockquote {
-	margin: 0 7px 0 5px;
-	padding: 0 16px 0 10px;
-	border-left-width: 5px;
-	border-left-style: solid;
-}
-
-code {
-	font-family: "SF Mono", Monaco, Menlo, Consolas, "Ubuntu Mono", "Liberation Mono", "DejaVu Sans Mono", "Courier New", monospace;
-}
-
-pre {
-	padding: 16px;
-	border-radius: 3px;
-	overflow: auto;
-}
-
-pre code {
-	font-family: var(--vscode-editor-font-family);
-	font-weight: var(--vscode-editor-font-weight);
-	font-size: var(--vscode-editor-font-size);
-	line-height: 1.5;
-	color: var(--vscode-editor-foreground);
-	tab-size: 4;
-}
-
-.monaco-tokenized-source {
-	white-space: pre;
-}
-
-/** Theming */
-
-.pre {
-	background-color: var(--vscode-textCodeBlock-background);
-}
-
-.vscode-high-contrast h1 {
-	border-color: rgb(0, 0, 0);
-}
-
-.vscode-light th {
-	border-color: rgba(0, 0, 0, 0.69);
-}
-
-.vscode-dark th {
-	border-color: rgba(255, 255, 255, 0.69);
-}
-
-.vscode-light h1,
-.vscode-light hr,
-.vscode-light td {
-	border-color: rgba(0, 0, 0, 0.18);
-}
-
-.vscode-dark h1,
-.vscode-dark hr,
-.vscode-dark td {
-	border-color: rgba(255, 255, 255, 0.18);
-}
-
-@media (forced-colors: active) and (prefers-color-scheme: light){
-	body {
-		forced-color-adjust: none;
-	}
-}
-
-@media (forced-colors: active) and (prefers-color-scheme: dark){
-	body {
-		forced-color-adjust: none;
-	}
-}
-`;
-const allowedProtocols = [Schemas.http, Schemas.https, Schemas.command];
-function sanitize(documentContent, allowUnknownProtocols) {
-    const hook = hookDomPurifyHrefAndSrcSanitizer(allowedProtocols, true);
-    try {
-        return dompurify.sanitize(documentContent, {
-            ...{
-                ALLOWED_TAGS: [
-                    ...basicMarkupHtmlTags,
-                    'checkbox',
-                    'checklist',
-                ],
-                ALLOWED_ATTR: [
-                    ...allowedMarkdownAttr,
-                    'data-command', 'name', 'id', 'role', 'tabindex',
-                    'x-dispatch',
-                    'required', 'checked', 'placeholder', 'when-checked', 'checked-on',
-                ],
-            },
-            ...(allowUnknownProtocols ? { ALLOW_UNKNOWN_PROTOCOLS: true } : {}),
-        });
-    }
-    finally {
-        hook.dispose();
-    }
-}
-async function renderMarkdownDocument(text, extensionService, languageService, shouldSanitize = true, allowUnknownProtocols = false, token) {
-    const highlight = (code, lang, callback) => {
-        if (!callback) {
-            return code;
-        }
-        if (typeof lang !== 'string') {
-            callback(null, `<code>${escape(code)}</code>`);
-            return '';
-        }
-        extensionService.whenInstalledExtensionsRegistered().then(async () => {
-            if (token?.isCancellationRequested) {
-                callback(null, '');
-                return;
-            }
-            const languageId = languageService.getLanguageIdByLanguageName(lang);
-            const html = await tokenizeToString(languageService, code, languageId);
-            callback(null, `<code>${html}</code>`);
-        });
-        return '';
-    };
-    return ( new Promise((resolve, reject) => {
-        marked(text, { highlight }, (err, value) => err ? reject(err) : resolve(value));
-    })).then(raw => {
-        if (shouldSanitize) {
-            return sanitize(raw, allowUnknownProtocols);
-        }
-        else {
-            return raw;
-        }
-    });
-}
-
-export { DEFAULT_MARKDOWN_STYLES, renderMarkdownDocument };