nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

More style fixes

Browse Source
This commit is contained in:
Kirill Bulatov 2021-05-23 13:57:04 +03:00
parent 223dbd2187
commit daedcc2b77
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editors/code/src/config.ts
View File

@ -4,7 +4,7 @@ import { log } from "./util";
export type UpdatesChannel = "stable" | "nightly"; export type UpdatesChannel = "stable" | "nightly";
export const NIGHTLY_TAG = "nightly"; const NIGHTLY_TAG = "nightly";
export type RunnableEnvCfg = undefined | Record<string, string> | { mask?: string; env: Record<string, string> }[]; export type RunnableEnvCfg = undefined | Record<string, string> | { mask?: string; env: Record<string, string> }[];
@ -170,4 +170,8 @@ export class Config {
gotoTypeDef: this.get<boolean>("hoverActions.gotoTypeDef"), gotoTypeDef: this.get<boolean>("hoverActions.gotoTypeDef"),
}; };
} }
get currentExtensionIsNightly() {
return this.package.releaseTag === NIGHTLY_TAG;
}
} }

29
editors/code/src/main.ts
View File

@ -6,7 +6,7 @@ import { promises as fs, PathLike } from "fs";
import * as commands from './commands'; import * as commands from './commands';
import { activateInlayHints } from './inlay_hints'; import { activateInlayHints } from './inlay_hints';
import { Ctx } from './ctx'; import { Ctx } from './ctx';
import { Config, NIGHTLY_TAG } from './config'; import { Config } from './config';
import { log, assert, isValidExecutable } from './util'; import { log, assert, isValidExecutable } from './util';
import { PersistentState } from './persistent_state'; import { PersistentState } from './persistent_state';
import { fetchRelease, download } from './net'; import { fetchRelease, download } from './net';
@ -156,7 +156,7 @@ export async function deactivate() {
async function bootstrap(config: Config, state: PersistentState): Promise<string> { async function bootstrap(config: Config, state: PersistentState): Promise<string> {
await fs.mkdir(config.globalStoragePath, { recursive: true }); await fs.mkdir(config.globalStoragePath, { recursive: true });
if (config.package.releaseTag !== NIGHTLY_TAG) { if (!config.currentExtensionIsNightly) {
await state.updateNightlyReleaseId(undefined); await state.updateNightlyReleaseId(undefined);
} }
await bootstrapExtension(config, state); await bootstrapExtension(config, state);
@ -166,9 +166,8 @@ async function bootstrap(config: Config, state: PersistentState): Promise<string
async function bootstrapExtension(config: Config, state: PersistentState): Promise<void> { async function bootstrapExtension(config: Config, state: PersistentState): Promise<void> {
if (config.package.releaseTag === null) return; if (config.package.releaseTag === null) return;
const currentExtensionIsNightly = config.package.releaseTag === NIGHTLY_TAG;
if (config.channel === "stable") { if (config.channel === "stable") {
if (currentExtensionIsNightly) { if (config.currentExtensionIsNightly) {
void vscode.window.showWarningMessage( void vscode.window.showWarningMessage(
`You are running a nightly version of rust-analyzer extension. ` + `You are running a nightly version of rust-analyzer extension. ` +
`To switch to stable, uninstall the extension and re-install it from the marketplace` `To switch to stable, uninstall the extension and re-install it from the marketplace`
@ -179,34 +178,34 @@ async function bootstrapExtension(config: Config, state: PersistentState): Promi
if (serverPath(config)) return; if (serverPath(config)) return;
const now = Date.now(); const now = Date.now();
const isInitialDownload = state.nightlyReleaseId === undefined; const isInitialNightlyDownload = state.nightlyReleaseId === undefined;
if (currentExtensionIsNightly) { if (config.currentExtensionIsNightly) {
// Check if we should poll github api for the new nightly version // Check if we should poll github api for the new nightly version
// if we haven't done it during the past hour // if we haven't done it during the past hour
const lastCheck = state.lastCheck; const lastCheck = state.lastCheck;
const anHour = 60 * 60 * 1000; const anHour = 60 * 60 * 1000;
const shouldCheckForNewNightly = isInitialDownload || (now - (lastCheck ?? 0)) > anHour; const shouldCheckForNewNightly = isInitialNightlyDownload || (now - (lastCheck ?? 0)) > anHour;
if (!shouldCheckForNewNightly) return; if (!shouldCheckForNewNightly) return;
} }
const release = await downloadWithRetryDialog(state, async () => { const latestNightlyRelease = await downloadWithRetryDialog(state, async () => {
return await fetchRelease("nightly", state.githubToken, config.httpProxy); return await fetchRelease("nightly", state.githubToken, config.httpProxy);
}).catch(async (e) => { }).catch(async (e) => {
log.error(e); log.error(e);
if (isInitialDownload) { if (isInitialNightlyDownload) {
await vscode.window.showErrorMessage(`Failed to download rust-analyzer nightly: ${e}`); await vscode.window.showErrorMessage(`Failed to download rust-analyzer nightly: ${e}`);
} }
return; return;
}); });
if (release === undefined) { if (latestNightlyRelease === undefined) {
if (isInitialDownload) { if (isInitialNightlyDownload) {
await vscode.window.showErrorMessage("Failed to download rust-analyzer nightly: empty release contents returned"); await vscode.window.showErrorMessage("Failed to download rust-analyzer nightly: empty release contents returned");
} }
return; return;
} }
if (currentExtensionIsNightly && release.id === state.nightlyReleaseId) return; if (config.currentExtensionIsNightly && latestNightlyRelease.id === state.nightlyReleaseId) return;
const userResponse = await vscode.window.showInformationMessage( const userResponse = await vscode.window.showInformationMessage(
"New version of rust-analyzer (nightly) is available (requires reload).", "New version of rust-analyzer (nightly) is available (requires reload).",
@ -214,8 +213,8 @@ async function bootstrapExtension(config: Config, state: PersistentState): Promi
); );
if (userResponse !== "Update") return; if (userResponse !== "Update") return;
const artifact = release.assets.find(artifact => artifact.name === "rust-analyzer.vsix"); const artifact = latestNightlyRelease.assets.find(artifact => artifact.name === "rust-analyzer.vsix");
assert(!!artifact, `Bad release: ${JSON.stringify(release)}`); assert(!!artifact, `Bad release: ${JSON.stringify(latestNightlyRelease)}`);
const dest = path.join(config.globalStoragePath, "rust-analyzer.vsix"); const dest = path.join(config.globalStoragePath, "rust-analyzer.vsix");
@ -231,7 +230,7 @@ async function bootstrapExtension(config: Config, state: PersistentState): Promi
await vscode.commands.executeCommand("workbench.extensions.installExtension", vscode.Uri.file(dest)); await vscode.commands.executeCommand("workbench.extensions.installExtension", vscode.Uri.file(dest));
await fs.unlink(dest); await fs.unlink(dest);
await state.updateNightlyReleaseId(release.id); await state.updateNightlyReleaseId(latestNightlyRelease.id);
await state.updateLastCheck(now); await state.updateLastCheck(now);
await vscode.commands.executeCommand("workbench.action.reloadWindow"); await vscode.commands.executeCommand("workbench.action.reloadWindow");
} }