Merge pull request #3635 from matklad/tags

Simplify extension tag sniffing

3 files changed, 11 insertions, 17 deletions

diff --git a/editors/code/package.json b/editors/code/package.json
index 150c36845..9f2fe06f3 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -5,8 +5,8 @@
     "preview": true,
     "private": true,
     "icon": "icon.png",
-    "//": "The real version is in release.yaml, this one just needs to be bigger",
-    "version": "0.2.20200309-nightly",
+    "version": "0.4.0-dev",
+    "releaseTag": "nightly",
     "publisher": "matklad",
     "repository": {
         "url": "https://github.com/rust-analyzer/rust-analyzer.git",
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 28698ab8e..54b905303 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -38,23 +38,17 @@ export class Config {
     ]
         .map(opt => `${this.rootSection}.${opt}`);
 
-    readonly packageJsonVersion = vscode
+    readonly packageJsonVersion: string = vscode
         .extensions
         .getExtension(this.extensionId)!
         .packageJSON
-        .version as string; // n.n.YYYYMMDD[-nightly]
+        .version;
 
-    /**
-     * Either `nightly` or `YYYY-MM-DD` (i.e. `stable` release)
-     */
-    readonly extensionReleaseTag: string = (() => {
-        if (this.packageJsonVersion.endsWith(NIGHTLY_TAG)) return NIGHTLY_TAG;
-
-        const realVersionRegexp = /^\d+\.\d+\.(\d{4})(\d{2})(\d{2})/;
-        const [, yyyy, mm, dd] = this.packageJsonVersion.match(realVersionRegexp)!;
-
-        return `${yyyy}-${mm}-${dd}`;
-    })();
+    readonly releaseTag: string = vscode
+        .extensions
+        .getExtension(this.extensionId)!
+        .packageJSON
+        .releaseTag;
 
     private cfg!: vscode.WorkspaceConfiguration;
 
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
index d907f3e6f..5297614a9 100644
--- a/editors/code/src/main.ts
+++ b/editors/code/src/main.ts
@@ -111,7 +111,7 @@ async function bootstrap(config: Config, state: PersistentState): Promise<string
 
 async function bootstrapExtension(config: Config, state: PersistentState): Promise<void> {
     if (config.channel === "stable") {
-        if (config.extensionReleaseTag === NIGHTLY_TAG) {
+        if (config.releaseTag === NIGHTLY_TAG) {
             vscode.window.showWarningMessage(`You are running a nightly version of rust-analyzer extension.
 To switch to stable, uninstall the extension and re-install it from the marketplace`);
         }
@@ -219,7 +219,7 @@ async function getServer(config: Config, state: PersistentState): Promise<string
         if (userResponse !== "Download now") return dest;
     }
 
-    const release = await fetchRelease(config.extensionReleaseTag);
+    const release = await fetchRelease(config.releaseTag);
     const artifact = release.assets.find(artifact => artifact.name === binaryName);
     assert(!!artifact, `Bad release: ${JSON.stringify(release)}`);