Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

vscode-postrefactor: minor config refactorings

Browse source
This commit is contained in:
Veetaha 2020-03-14 02:00:34 +02:00
parent 607d017229
commit 7f02d4657b
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
editors/code/src/config.ts
View file

@ -35,6 +35,7 @@ export class Config {
private readonly rootSection = "rust-analyzer"; private readonly rootSection = "rust-analyzer";
private readonly requiresReloadOpts = [ private readonly requiresReloadOpts = [
"serverPath",
"cargoFeatures", "cargoFeatures",
"cargo-watch", "cargo-watch",
"highlighting.semanticTokens", "highlighting.semanticTokens",
@ -50,7 +51,7 @@ export class Config {
.extensions .extensions
.getExtension(this.extensionId)! .getExtension(this.extensionId)!
.packageJSON .packageJSON
.version as string; .version as string; // n.n.YYYYMMDD[-nightly]
if (packageJsonVersion.endsWith(NIGHTLY_TAG)) return NIGHTLY_TAG; if (packageJsonVersion.endsWith(NIGHTLY_TAG)) return NIGHTLY_TAG;
@ -193,7 +194,7 @@ export class Config {
// We don't do runtime config validation here for simplicity. More on stackoverflow: // We don't do runtime config validation here for simplicity. More on stackoverflow:
// https://stackoverflow.com/questions/60135780/what-is-the-best-way-to-type-check-the-configuration-for-vscode-extension // https://stackoverflow.com/questions/60135780/what-is-the-best-way-to-type-check-the-configuration-for-vscode-extension
get serverPath() { return this.cfg.get("serverPath") as null | string; } private get serverPath() { return this.cfg.get("serverPath") as null | string; }
get updatesChannel() { return this.cfg.get("updates.channel") as UpdatesChannel; } get updatesChannel() { return this.cfg.get("updates.channel") as UpdatesChannel; }
get askBeforeDownload() { return this.cfg.get("updates.askBeforeDownload") as boolean; } get askBeforeDownload() { return this.cfg.get("updates.askBeforeDownload") as boolean; }
get highlightingSemanticTokens() { return this.cfg.get("highlighting.semanticTokens") as boolean; } get highlightingSemanticTokens() { return this.cfg.get("highlighting.semanticTokens") as boolean; }

4
editors/code/src/installation/extension.ts
View file

@ -4,7 +4,7 @@ import { promises as fs } from 'fs';
import { vscodeReinstallExtension, vscodeReloadWindow, log, vscodeInstallExtensionFromVsix, assert, notReentrant } from "../util"; import { vscodeReinstallExtension, vscodeReloadWindow, log, vscodeInstallExtensionFromVsix, assert, notReentrant } from "../util";
import { Config, UpdatesChannel } from "../config"; import { Config, UpdatesChannel } from "../config";
import { ArtifactReleaseInfo } from "./interfaces"; import { ArtifactReleaseInfo, ArtifactSource } from "./interfaces";
import { downloadArtifactWithProgressUi } from "./downloads"; import { downloadArtifactWithProgressUi } from "./downloads";
import { fetchArtifactReleaseInfo } from "./fetch_artifact_release_info"; import { fetchArtifactReleaseInfo } from "./fetch_artifact_release_info";
@ -16,7 +16,7 @@ const HEURISTIC_NIGHTLY_RELEASE_PERIOD_IN_HOURS = 25;
*/ */
export async function ensureProperExtensionVersion(config: Config): Promise<never | void> { export async function ensureProperExtensionVersion(config: Config): Promise<never | void> {
// User has built lsp server from sources, she should manage updates manually // User has built lsp server from sources, she should manage updates manually
if (config.serverPath !== null) return; if (config.serverSource?.type === ArtifactSource.Type.ExplicitPath) return;
const currentUpdChannel = config.installedExtensionUpdateChannel; const currentUpdChannel = config.installedExtensionUpdateChannel;
const desiredUpdChannel = config.updatesChannel; const desiredUpdChannel = config.updatesChannel;