test

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

Author: RomanNikitenko

code/src/vs/workbench/services/extensions/common/extensions.ts

@@ -324,7 +324,12 @@ export function isProposedApiEnabled(extension: IExtensionDescription, proposal:
 	if (!extension.enabledApiProposals) {
 		return false;
 	}
-	return extension.enabledApiProposals.includes(proposal);
+	console.log('+++++++++ isProposedApiEnabled ', extension.displayName, proposal);
+	return extension.enabledApiProposals.some(entry => {
+		console.log('+++ isProposedApiEnabled ', entry);
+		console.log('+++ ', entry === proposal || entry.startsWith(`${proposal}@`));
+		return entry === proposal || entry.startsWith(`${proposal}@`);
+	});
 }
 
 export function checkProposedApiEnabled(extension: IExtensionDescription, proposal: ApiProposalName): void {

code/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts

@@ -67,13 +67,19 @@ export class ExtensionsProposedApi {
 
 		// warn about invalid proposal and remove them from the list
 		if (isNonEmptyArray(extension.enabledApiProposals)) {
-			extension.enabledApiProposals = extension.enabledApiProposals.filter(name => {
-				const result = Boolean(allApiProposals[<ApiProposalName>name]);
+			const normalizedProposals: ApiProposalName[] = [];
+			for (const name of extension.enabledApiProposals) {
+				const normalizedName = normalizeProposedApiName(name);
+				const result = Boolean(allApiProposals[normalizedName]);
 				if (!result) {
 					this._logService.error(`Extension '${key}' wants API proposal '${name}' but that proposal DOES NOT EXIST. Likely, the proposal has been finalized (check 'vscode.d.ts') or was abandoned.`);
+					continue;
 				}
-				return result;
-			});
+				if (!normalizedProposals.includes(normalizedName)) {
+					normalizedProposals.push(normalizedName);
+				}
+			}
+			extension.enabledApiProposals = normalizedProposals;
 		}
 
 
@@ -115,6 +121,11 @@ export class ExtensionsProposedApi {
 	}
 }
 
+function normalizeProposedApiName(name: string): ApiProposalName {
+	const match = /^(.+?)@\d+$/.exec(name);
+	return (match ? match[1] : name) as ApiProposalName;
+}
+
 class ApiProposalsMarkdowneRenderer extends Disposable implements IExtensionFeatureMarkdownRenderer {
 
 	readonly type = 'markdown';