aboutsummaryrefslogtreecommitdiff
path: root/editors/code/src
diff options
context:
space:
mode:
Diffstat (limited to 'editors/code/src')
-rw-r--r--editors/code/src/config.ts4
-rw-r--r--editors/code/src/main.ts2
2 files changed, 4 insertions, 2 deletions
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 54b905303..be5296fcf 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -44,11 +44,11 @@ export class Config {
44 .packageJSON 44 .packageJSON
45 .version; 45 .version;
46 46
47 readonly releaseTag: string = vscode 47 readonly releaseTag: string | undefined = vscode
48 .extensions 48 .extensions
49 .getExtension(this.extensionId)! 49 .getExtension(this.extensionId)!
50 .packageJSON 50 .packageJSON
51 .releaseTag; 51 .releaseTag ?? undefined;
52 52
53 private cfg!: vscode.WorkspaceConfiguration; 53 private cfg!: vscode.WorkspaceConfiguration;
54 54
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
index 5297614a9..5d2da9a76 100644
--- a/editors/code/src/main.ts
+++ b/editors/code/src/main.ts
@@ -110,6 +110,7 @@ async function bootstrap(config: Config, state: PersistentState): Promise<string
110} 110}
111 111
112async function bootstrapExtension(config: Config, state: PersistentState): Promise<void> { 112async function bootstrapExtension(config: Config, state: PersistentState): Promise<void> {
113 if (config.releaseTag === undefined) return;
113 if (config.channel === "stable") { 114 if (config.channel === "stable") {
114 if (config.releaseTag === NIGHTLY_TAG) { 115 if (config.releaseTag === NIGHTLY_TAG) {
115 vscode.window.showWarningMessage(`You are running a nightly version of rust-analyzer extension. 116 vscode.window.showWarningMessage(`You are running a nightly version of rust-analyzer extension.
@@ -184,6 +185,7 @@ async function getServer(config: Config, state: PersistentState): Promise<string
184 } 185 }
185 return explicitPath; 186 return explicitPath;
186 }; 187 };
188 if (config.releaseTag === undefined) return "rust-analyzer";
187 189
188 let binaryName: string | undefined = undefined; 190 let binaryName: string | undefined = undefined;
189 if (process.arch === "x64" || process.arch === "x32") { 191 if (process.arch === "x64" || process.arch === "x32") {