Do lookup magic to fix Pyright... *sigh*

Thankfully fixes open-vsx#624

extensions-schema.json

@@ -32,6 +32,10 @@
         "type": "number",
         "description": "Timeout to build the extension vsix from sources."
       },
+      "msMarketplaceIdOverride": {
+        "type": "string",
+        "description": "A property to set a different lookup ID when querying the Microsoft Marketplace. Please do not ever use if not absolutely necessary."
+      },
       "target": {
         "type": "array",
         "description": "A list of platforms to target. If unspecified, a universal extension will be published in case of building from source and if the vsix is resolved from GitHub Releases, all of the attached platform-specific assets will be published.",

extensions.json

@@ -761,7 +761,8 @@
   "ms-pyright.vscode-pyright": {
     "repository": "https://github.com/Microsoft/pyright",
     "location": "packages/vscode-pyright",
-    "prepublish": "npm i && cd packages/vscode-pyright && npm run prepackage"
+    "prepublish": "npm i && cd packages/vscode-pyright && npm run prepackage",
+    "msMarketplaceIdOverride": "ms-pyright.pyright"
   },
   "ms-python.black-formatter": {
     "repository": "https://github.com/microsoft/vscode-black-formatter",

lib/resolveExtension.js

@@ -121,14 +121,18 @@ exports.resolveExtension = async function ({ id, repository, location }, ms) {
     }
   }
 
-  // check tags
-  if (ms) {
-    const tags = (await exec(`git log -3 --no-walk --tags --oneline --format="%H"`, { cwd: repoPath, quiet: true })).stdout.split('\n').map(t => t.trim()).filter(t => !!t);
-    for (const tag of tags) {
-      const version = await resolveVersion(tag)
-      if (version && ms.version.includes(version)) {
+  const releaseTags = (await exec(`git log -3 --no-walk --tags --oneline --format="%H"`, { cwd: repoPath, quiet: true })).stdout.split('\n').map(t => t.trim()).filter(t => !!t);
+  for (const tag of releaseTags) {
+    const versionAtTag = await resolveVersion(tag);
+    if (!versionAtTag) {
+      continue;
+    }
+    if (ms) {
+      if (ms.version.includes(versionAtTag)) {
         return { version: ms.version, path: repoPath, resolution: { tag } };
       }
+    } else {
+      return { version: versionAtTag, path: repoPath, resolution: { tag } };
     }
   }
 

publish-extensions.js

@@ -123,8 +123,9 @@ const ensureBuildPrerequisites = async () => {
       timeoutDelay = 5;
     }
     try {
+      const extensionId = extension.msMarketplaceIdOverride ?? extension.id;
       /** @type {[PromiseSettledResult<PublishedExtension | undefined>]} */
-      let [msExtension] = await Promise.allSettled([msGalleryApi.getExtension(extension.id, flags)]);
+      let [msExtension] = await Promise.allSettled([msGalleryApi.getExtension(extensionId, flags)]);
       if (msExtension.status === 'fulfilled') {
         const lastNonPrereleaseVersion = msExtension.value?.versions.find(version => !isPreReleaseVersion(version.properties));
         context.msVersion = lastNonPrereleaseVersion?.version;

types.d.ts

@@ -89,6 +89,7 @@ export interface Extension {
     custom?: string[]
     timeout?: number
     target?: string[]
+    msMarketplaceIdOverride?: string
 }
 
 export interface ExtensionResolution {