@codingame/monaco-vscode-api 6.0.3 → 7.0.1

package/vscode/src/vs/platform/extensions/common/extensionValidator.js

@@ -2,6 +2,8 @@ import { joinPath, isEqualOrParent } from '../../../base/common/resources.js';
 import Severity$1 from '../../../base/common/severity.js';
 import { localizeWithPath } from '../../../nls.js';
 import { semverExports } from '../../../../../../external/vscode-semver/semver.js';
+import { parseApiProposals } from './extensions.js';
+import { allApiProposals } from './extensionsApiProposals.js';
 const _moduleId = "vs/platform/extensions/common/extensionValidator";
 const VERSION_REGEXP = /^(\^|>=)?((\d+)|x)\.((\d+)|x)\.((\d+)|x)(\-.*)?$/;
 const NOT_BEFORE_REGEXP = /^-(\d{4})(\d{2})(\d{2})$/;
@@ -165,7 +167,7 @@ function isValidVersion(_inputVersion, _inputDate, _desiredVersion) {
     }
     return true;
 }
-function validateExtensionManifest(productVersion, productDate, extensionLocation, extensionManifest, extensionIsBuiltin) {
+function validateExtensionManifest(productVersion, productDate, extensionLocation, extensionManifest, extensionIsBuiltin, validateApiVersion) {
     const validations = [];
     if (typeof extensionManifest.publisher !== 'undefined' && typeof extensionManifest.publisher !== 'string') {
         validations.push([Severity$1.Error, ( localizeWithPath(_moduleId, 0, "property publisher must be of type `string`."))]);
@@ -301,12 +303,20 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
         return validations;
     }
     const notices = [];
-    const isValid = isValidExtensionVersion(productVersion, productDate, extensionManifest, extensionIsBuiltin, notices);
-    if (!isValid) {
+    const validExtensionVersion = isValidExtensionVersion(productVersion, productDate, extensionManifest, extensionIsBuiltin, notices);
+    if (!validExtensionVersion) {
         for (const notice of notices) {
             validations.push([Severity$1.Error, notice]);
         }
     }
+    if (validateApiVersion && extensionManifest.enabledApiProposals?.length) {
+        const incompatibleNotices = [];
+        if (!areApiProposalsCompatible([...extensionManifest.enabledApiProposals], incompatibleNotices)) {
+            for (const notice of incompatibleNotices) {
+                validations.push([Severity$1.Error, notice]);
+            }
+        }
+    }
     return validations;
 }
 function isValidExtensionVersion(productVersion, productDate, extensionManifest, extensionIsBuiltin, notices) {
@@ -318,12 +328,40 @@ function isValidExtensionVersion(productVersion, productDate, extensionManifest,
 function isEngineValid(engine, version, date) {
     return engine === '*' || isVersionValid(version, date, engine);
 }
+function areApiProposalsCompatible(apiProposals, arg1) {
+    if (apiProposals.length === 0) {
+        return true;
+    }
+    const notices = Array.isArray(arg1) ? arg1 : undefined;
+    const productApiProposals = (notices ? undefined : arg1) ?? allApiProposals;
+    const incompatibleNotices = [];
+    const parsedProposals = parseApiProposals(apiProposals);
+    for (const { proposalName, version } of parsedProposals) {
+        const existingProposal = productApiProposals[proposalName];
+        if (!existingProposal) {
+            continue;
+        }
+        if (!version) {
+            continue;
+        }
+        if (existingProposal.version !== version) {
+            incompatibleNotices.push(( localizeWithPath(
+                _moduleId,
+                14,
+                "Extension is using an API proposal '{0}' that is not compatible with the current version of VS Code.",
+                proposalName
+            )));
+        }
+    }
+    notices?.push(...incompatibleNotices);
+    return incompatibleNotices.length === 0;
+}
 function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     const desiredVersion = normalizeVersion(parseVersion(requestedVersion));
     if (!desiredVersion) {
         notices.push(( localizeWithPath(
             _moduleId,
-            14,
+            15,
             "Could not parse `engines.vscode` value {0}. Please use, for example: ^1.22.0, ^1.22.x, etc.",
             requestedVersion
         )));
@@ -333,7 +371,7 @@ function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
         if (!desiredVersion.majorMustEqual || !desiredVersion.minorMustEqual) {
             notices.push(( localizeWithPath(
                 _moduleId,
-                15,
+                16,
                 "Version specified in `engines.vscode` ({0}) is not specific enough. For vscode versions before 1.0.0, please define at a minimum the major and minor desired version. E.g. ^0.10.0, 0.10.x, 0.11.0, etc.",
                 requestedVersion
             )));
@@ -344,7 +382,7 @@ function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
         if (!desiredVersion.majorMustEqual) {
             notices.push(( localizeWithPath(
                 _moduleId,
-                16,
+                17,
                 "Version specified in `engines.vscode` ({0}) is not specific enough. For vscode versions after 1.0.0, please define at a minimum the major desired version. E.g. ^1.10.0, 1.10.x, 1.x.x, 2.x.x, etc.",
                 requestedVersion
             )));
@@ -354,7 +392,7 @@ function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     if (!isValidVersion(currentVersion, date, desiredVersion)) {
         notices.push(( localizeWithPath(
             _moduleId,
-            17,
+            18,
             "Extension is not compatible with Code {0}. Extension requires: {1}.",
             currentVersion,
             requestedVersion
@@ -374,4 +412,4 @@ function isStringArray(arr) {
     }
     return true;
 }
-export { isEngineValid, isValidExtensionVersion, isValidVersion, isValidVersionStr, normalizeVersion, parseVersion, validateExtensionManifest };
+export { areApiProposalsCompatible, isEngineValid, isValidExtensionVersion, isValidVersion, isValidVersionStr, normalizeVersion, parseVersion, validateExtensionManifest };

package/vscode/src/vs/platform/extensions/common/extensions.d.ts

@@ -150,7 +150,7 @@ interface IGrammar {
     /**
      * Language identifier for which this syntax is contributed to.
      */
-    readonly language: string;
+    readonly language?: string;
     /**
      * Textmate scope name used by the tmLanguage file.
      */

package/vscode/src/vs/platform/extensions/common/extensions.js

@@ -13,7 +13,9 @@ function getWorkspaceSupportTypeMessage(supportType) {
     return undefined;
 }
 const EXTENSION_CATEGORIES = [
+    'AI',
     'Azure',
+    'Chat',
     'Data Science',
     'Debuggers',
     'Extension Packs',
@@ -30,8 +32,6 @@ const EXTENSION_CATEGORIES = [
     'Testing',
     'Themes',
     'Visualization',
-    'AI',
-    'Chat',
     'Other',
 ];
 var ExtensionType;
@@ -148,4 +148,13 @@ function isResolverExtension(manifest, remoteAuthority) {
     }
     return false;
 }
-export { ALL_EXTENSION_KINDS, BUILTIN_MANIFEST_CACHE_FILE, EXTENSION_CATEGORIES, ExtensionIdentifier, ExtensionIdentifierMap, ExtensionIdentifierSet, ExtensionType, TargetPlatform, UNDEFINED_PUBLISHER, USER_MANIFEST_CACHE_FILE, getWorkspaceSupportTypeMessage, isApplicationScopedExtension, isAuthenticationProviderExtension, isLanguagePackExtension, isResolverExtension };
+function parseApiProposals(enabledApiProposals) {
+    return ( enabledApiProposals.map(proposal => {
+        const [proposalName, version] = proposal.split('@');
+        return { proposalName, version: version ? parseInt(version) : undefined };
+    }));
+}
+function parseEnabledApiProposalNames(enabledApiProposals) {
+    return ( enabledApiProposals.map(proposal => proposal.split('@')[0]));
+}
+export { ALL_EXTENSION_KINDS, BUILTIN_MANIFEST_CACHE_FILE, EXTENSION_CATEGORIES, ExtensionIdentifier, ExtensionIdentifierMap, ExtensionIdentifierSet, ExtensionType, TargetPlatform, UNDEFINED_PUBLISHER, USER_MANIFEST_CACHE_FILE, getWorkspaceSupportTypeMessage, isApplicationScopedExtension, isAuthenticationProviderExtension, isLanguagePackExtension, isResolverExtension, parseApiProposals, parseEnabledApiProposalNames };

package/vscode/src/vs/platform/extensions/common/extensionsApiProposals.js

@@ -0,0 +1,368 @@
+const _allApiProposals = {
+    activeComment: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.activeComment.d.ts',
+    },
+    aiRelatedInformation: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.aiRelatedInformation.d.ts',
+    },
+    aiTextSearchProvider: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.aiTextSearchProvider.d.ts',
+    },
+    attributableCoverage: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.attributableCoverage.d.ts',
+    },
+    authGetSessions: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authGetSessions.d.ts',
+    },
+    authLearnMore: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authLearnMore.d.ts',
+    },
+    authSession: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authSession.d.ts',
+    },
+    canonicalUriProvider: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.canonicalUriProvider.d.ts',
+    },
+    chatParticipantAdditions: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts',
+    },
+    chatParticipantPrivate: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts',
+    },
+    chatProvider: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatProvider.d.ts',
+    },
+    chatTab: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatTab.d.ts',
+    },
+    chatVariableResolver: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatVariableResolver.d.ts',
+    },
+    codeActionAI: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.codeActionAI.d.ts',
+    },
+    codeActionRanges: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.codeActionRanges.d.ts',
+    },
+    codiconDecoration: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.codiconDecoration.d.ts',
+    },
+    commentReactor: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentReactor.d.ts',
+    },
+    commentReveal: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentReveal.d.ts',
+    },
+    commentThreadApplicability: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentThreadApplicability.d.ts',
+    },
+    commentingRangeHint: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentingRangeHint.d.ts',
+    },
+    commentsDraftState: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentsDraftState.d.ts',
+    },
+    contribAccessibilityHelpContent: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribAccessibilityHelpContent.d.ts',
+    },
+    contribCommentEditorActionsMenu: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentEditorActionsMenu.d.ts',
+    },
+    contribCommentPeekContext: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentPeekContext.d.ts',
+    },
+    contribCommentThreadAdditionalMenu: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentThreadAdditionalMenu.d.ts',
+    },
+    contribCommentsViewThreadMenus: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentsViewThreadMenus.d.ts',
+    },
+    contribDiffEditorGutterToolBarMenus: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribDiffEditorGutterToolBarMenus.d.ts',
+    },
+    contribEditSessions: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribEditSessions.d.ts',
+    },
+    contribEditorContentMenu: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribEditorContentMenu.d.ts',
+    },
+    contribIssueReporter: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribIssueReporter.d.ts',
+    },
+    contribLabelFormatterWorkspaceTooltip: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribLabelFormatterWorkspaceTooltip.d.ts',
+    },
+    contribMenuBarHome: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribMenuBarHome.d.ts',
+    },
+    contribMergeEditorMenus: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribMergeEditorMenus.d.ts',
+    },
+    contribMultiDiffEditorMenus: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribMultiDiffEditorMenus.d.ts',
+    },
+    contribNotebookStaticPreloads: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribNotebookStaticPreloads.d.ts',
+    },
+    contribRemoteHelp: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribRemoteHelp.d.ts',
+    },
+    contribShareMenu: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribShareMenu.d.ts',
+    },
+    contribSourceControlHistoryItemGroupMenu: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemGroupMenu.d.ts',
+    },
+    contribSourceControlHistoryItemMenu: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemMenu.d.ts',
+    },
+    contribSourceControlInputBoxMenu: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlInputBoxMenu.d.ts',
+    },
+    contribSourceControlTitleMenu: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlTitleMenu.d.ts',
+    },
+    contribStatusBarItems: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribStatusBarItems.d.ts',
+    },
+    contribViewsRemote: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribViewsRemote.d.ts',
+    },
+    contribViewsWelcome: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribViewsWelcome.d.ts',
+    },
+    createFileSystemWatcher: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.createFileSystemWatcher.d.ts',
+    },
+    customEditorMove: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.customEditorMove.d.ts',
+    },
+    debugVisualization: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.debugVisualization.d.ts',
+    },
+    defaultChatParticipant: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts',
+    },
+    diffCommand: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.diffCommand.d.ts',
+    },
+    diffContentOptions: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.diffContentOptions.d.ts',
+    },
+    documentFiltersExclusive: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.documentFiltersExclusive.d.ts',
+    },
+    documentPaste: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.documentPaste.d.ts',
+    },
+    editSessionIdentityProvider: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.editSessionIdentityProvider.d.ts',
+    },
+    editorHoverVerbosityLevel: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.editorHoverVerbosityLevel.d.ts',
+    },
+    editorInsets: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.editorInsets.d.ts',
+    },
+    embeddings: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.embeddings.d.ts',
+    },
+    extensionRuntime: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.extensionRuntime.d.ts',
+    },
+    extensionsAny: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.extensionsAny.d.ts',
+    },
+    externalUriOpener: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.externalUriOpener.d.ts',
+    },
+    fileComments: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.fileComments.d.ts',
+    },
+    fileSearchProvider: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.fileSearchProvider.d.ts',
+    },
+    findFiles2: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.findFiles2.d.ts',
+    },
+    findTextInFiles: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.findTextInFiles.d.ts',
+    },
+    fsChunks: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.fsChunks.d.ts',
+    },
+    idToken: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.idToken.d.ts',
+    },
+    inlineCompletionsAdditions: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts',
+    },
+    inlineEdit: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.inlineEdit.d.ts',
+    },
+    interactive: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.interactive.d.ts',
+    },
+    interactiveWindow: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.interactiveWindow.d.ts',
+    },
+    ipc: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.ipc.d.ts',
+    },
+    languageModelSystem: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageModelSystem.d.ts',
+    },
+    languageStatusText: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageStatusText.d.ts',
+    },
+    lmTools: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.lmTools.d.ts',
+        version: 2
+    },
+    mappedEditsProvider: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mappedEditsProvider.d.ts',
+    },
+    multiDocumentHighlightProvider: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.multiDocumentHighlightProvider.d.ts',
+    },
+    newSymbolNamesProvider: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.newSymbolNamesProvider.d.ts',
+    },
+    notebookCellExecution: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookCellExecution.d.ts',
+    },
+    notebookCellExecutionState: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookCellExecutionState.d.ts',
+    },
+    notebookControllerAffinityHidden: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookControllerAffinityHidden.d.ts',
+    },
+    notebookDeprecated: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookDeprecated.d.ts',
+    },
+    notebookExecution: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookExecution.d.ts',
+    },
+    notebookKernelSource: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookKernelSource.d.ts',
+    },
+    notebookLiveShare: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookLiveShare.d.ts',
+    },
+    notebookMessaging: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookMessaging.d.ts',
+    },
+    notebookMime: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookMime.d.ts',
+    },
+    notebookVariableProvider: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookVariableProvider.d.ts',
+    },
+    portsAttributes: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.portsAttributes.d.ts',
+    },
+    profileContentHandlers: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.profileContentHandlers.d.ts',
+    },
+    quickDiffProvider: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickDiffProvider.d.ts',
+    },
+    quickPickItemTooltip: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickPickItemTooltip.d.ts',
+    },
+    quickPickSortByLabel: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickPickSortByLabel.d.ts',
+    },
+    resolvers: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.resolvers.d.ts',
+    },
+    scmActionButton: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmActionButton.d.ts',
+    },
+    scmHistoryProvider: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts',
+    },
+    scmMultiDiffEditor: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmMultiDiffEditor.d.ts',
+    },
+    scmSelectedProvider: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmSelectedProvider.d.ts',
+    },
+    scmTextDocument: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmTextDocument.d.ts',
+    },
+    scmValidation: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmValidation.d.ts',
+    },
+    shareProvider: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.shareProvider.d.ts',
+    },
+    showLocal: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.showLocal.d.ts',
+    },
+    speech: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.speech.d.ts',
+    },
+    tabInputMultiDiff: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tabInputMultiDiff.d.ts',
+    },
+    tabInputTextMerge: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tabInputTextMerge.d.ts',
+    },
+    taskPresentationGroup: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.taskPresentationGroup.d.ts',
+    },
+    telemetry: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.telemetry.d.ts',
+    },
+    terminalDataWriteEvent: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalDataWriteEvent.d.ts',
+    },
+    terminalDimensions: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalDimensions.d.ts',
+    },
+    terminalExecuteCommandEvent: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalExecuteCommandEvent.d.ts',
+    },
+    terminalQuickFixProvider: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalQuickFixProvider.d.ts',
+    },
+    terminalSelection: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalSelection.d.ts',
+    },
+    terminalShellIntegration: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellIntegration.d.ts',
+    },
+    testObserver: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testObserver.d.ts',
+    },
+    textSearchProvider: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.textSearchProvider.d.ts',
+    },
+    timeline: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.timeline.d.ts',
+    },
+    tokenInformation: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tokenInformation.d.ts',
+    },
+    treeViewActiveItem: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.treeViewActiveItem.d.ts',
+    },
+    treeViewMarkdownMessage: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.treeViewMarkdownMessage.d.ts',
+    },
+    treeViewReveal: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.treeViewReveal.d.ts',
+    },
+    tunnelFactory: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tunnelFactory.d.ts',
+    },
+    tunnels: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tunnels.d.ts',
+    },
+    workspaceTrust: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.workspaceTrust.d.ts',
+    }
+};
+const allApiProposals = ( Object.freeze(_allApiProposals));
+export { allApiProposals };

package/vscode/src/vs/platform/files/common/watcher.js

@@ -5,8 +5,7 @@ import '../../../base/common/platform.js';
 import { URI } from '../../../base/common/uri.js';
 import './files.js';
 class AbstractWatcherClient extends Disposable {
-    static { this.MAX_RESTARTS_PER_REQUEST_ERROR = 3; }
-    static { this.MAX_RESTARTS_PER_UNKNOWN_ERROR = 10; }
+    static { this.MAX_RESTARTS = 5; }
     constructor(onFileChanges, onLogMessage, verboseLogging, options) {
         super();
         this.onFileChanges = onFileChanges;
@@ -15,8 +14,7 @@ class AbstractWatcherClient extends Disposable {
         this.options = options;
         this.watcherDisposables = this._register(( new MutableDisposable()));
         this.requests = undefined;
-        this.restartsPerRequestError = ( new Map());
-        this.restartsPerUnknownError = 0;
+        this.restartCounter = 0;
     }
     init() {
         const disposables = ( new DisposableStore());
@@ -28,35 +26,34 @@ class AbstractWatcherClient extends Disposable {
         disposables.add(this.watcher.onDidError(e => this.onError(e.error, e.request)));
     }
     onError(error, failedRequest) {
-        if (this.options.restartOnError && this.requests?.length) {
-            if (failedRequest) {
-                const restartsPerRequestError = this.restartsPerRequestError.get(failedRequest.path) ?? 0;
-                if (restartsPerRequestError < AbstractWatcherClient.MAX_RESTARTS_PER_REQUEST_ERROR) {
-                    this.error(`restarting watcher from error in watch request (retrying request): ${error} (${JSON.stringify(failedRequest)})`);
-                    this.restartsPerRequestError.set(failedRequest.path, restartsPerRequestError + 1);
-                    this.restart(this.requests);
-                }
-                else {
-                    this.error(`restarting watcher from error in watch request (skipping request): ${error} (${JSON.stringify(failedRequest)})`);
-                    this.restart(this.requests.filter(request => request.path !== failedRequest.path));
-                }
+        if (this.canRestart(error, failedRequest)) {
+            if (this.restartCounter < AbstractWatcherClient.MAX_RESTARTS && this.requests) {
+                this.error(`restarting watcher after unexpected error: ${error}`);
+                this.restart(this.requests);
             }
             else {
-                if (this.restartsPerUnknownError < AbstractWatcherClient.MAX_RESTARTS_PER_UNKNOWN_ERROR) {
-                    this.error(`restarting watcher after unknown global error: ${error}`);
-                    this.restartsPerUnknownError++;
-                    this.restart(this.requests);
-                }
-                else {
-                    this.error(`giving up attempting to restart watcher after error: ${error}`);
-                }
+                this.error(`gave up attempting to restart watcher after unexpected error: ${error}`);
             }
         }
         else {
             this.error(error);
         }
     }
+    canRestart(error, failedRequest) {
+        if (!this.options.restartOnError) {
+            return false;
+        }
+        if (failedRequest) {
+            return false;
+        }
+        if (error.indexOf('No space left on device') !== -1 ||
+            error.indexOf('EMFILE') !== -1) {
+            return false;
+        }
+        return true;
+    }
     restart(requests) {
+        this.restartCounter++;
         this.init();
         this.watch(requests);
     }

package/vscode/src/vs/platform/list/browser/listService.js

@@ -1131,7 +1131,8 @@ configurationRegistry.registerConfiguration({
             markdownDescription: ( localizeWithPath(
                 _moduleId,
                 25,
-                "Controls the number of sticky elements displayed in the tree when `#workbench.tree.enableStickyScroll#` is enabled."
+                "Controls the number of sticky elements displayed in the tree when {0} is enabled.",
+                '`#workbench.tree.enableStickyScroll#`'
             )),
         },
         [typeNavigationModeSettingKey]: {

package/vscode/src/vs/platform/observable/common/platformObservableUtils.js

@@ -1,10 +1,10 @@
 import '../../../base/common/arrays.js';
 import '../../../base/common/observableInternal/derived.js';
 import { autorunOpts } from '../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent } from '../../../base/common/observableInternal/utils.js';
+import { observableFromEventOpts } from '../../../base/common/observableInternal/utils.js';
 import '../../../base/common/cancellation.js';
 function observableConfigValue(key, defaultValue, configurationService) {
-    return observableFromEvent((handleChange) => configurationService.onDidChangeConfiguration(e => {
+    return observableFromEventOpts({ debugName: () => `Configuration Key "${key}"`, }, (handleChange) => configurationService.onDidChangeConfiguration(e => {
         if (e.affectsConfiguration(key)) {
             handleChange(e);
         }

package/vscode/src/vs/platform/opener/browser/link.js

@@ -86,7 +86,7 @@ let Link = class Link extends Disposable {
             this.el.title = title ?? '';
         }
         else if (!this.hover && title) {
-            this.hover = this._register(this._hoverService.setupUpdatableHover(this.hoverDelegate, this.el, title));
+            this.hover = this._register(this._hoverService.setupManagedHover(this.hoverDelegate, this.el, title));
         }
         else if (this.hover) {
             this.hover.update(title);

package/vscode/src/vs/platform/product/common/product.js

@@ -31,7 +31,7 @@ else {
     product = { };
     if (( Object.keys(product)).length === 0) {
         Object.assign(product, {
-            version: '1.90.0-dev',
+            version: '1.91.0-dev',
             nameShort: 'Code - OSS Dev',
             nameLong: 'Code - OSS Dev',
             applicationName: 'code-oss',