Unnamed repository; edit this file 'description' to name the repository.
| -rw-r--r-- | docs/user/manual.adoc | 6 | ||||
| -rw-r--r-- | editors/code/README.md | 2 | ||||
| -rw-r--r-- | editors/code/package.json | 2 | ||||
| -rw-r--r-- | editors/code/src/config.ts | 2 | ||||
| -rw-r--r-- | editors/code/src/main.ts | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/docs/user/manual.adoc b/docs/user/manual.adoc index 27f10da103..e8520c66f4 100644 --- a/docs/user/manual.adoc +++ b/docs/user/manual.adoc @@ -61,7 +61,7 @@ The rust-analyzer plugin for VS Code is maintained https://github.com/rust-analyzer/rust-analyzer/tree/master/editors/code[in tree]. You can install the latest release of the plugin from -https://marketplace.visualstudio.com/items?itemName=matklad.rust-analyzer[the marketplace]. +https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer[the marketplace]. Note that the plugin may cause conflicts with the https://marketplace.visualstudio.com/items?itemName=rust-lang.rust[official Rust plugin]. @@ -81,14 +81,14 @@ To disable this notification put the following to `settings.json` ---- ==== -The server binary is stored in the extension install directory, which starts with `matklad.rust-analyzer-` and is located under: +The server binary is stored in the extension install directory, which starts with `rust-lang.rust-analyzer-` and is located under: * Linux: `~/.vscode/extensions` * Linux (Remote, such as WSL): `~/.vscode-server/extensions` * macOS: `~/.vscode/extensions` * Windows: `%USERPROFILE%\.vscode\extensions` -As an exception, on NixOS, the extension makes a copy of the server and stores it under `~/.config/Code/User/globalStorage/matklad.rust-analyzer`. +As an exception, on NixOS, the extension makes a copy of the server and stores it under `~/.config/Code/User/globalStorage/rust-lang.rust-analyzer`. Note that we only support the two most recent versions of VS Code. diff --git a/editors/code/README.md b/editors/code/README.md index 0f0d292b5c..9113722632 100644 --- a/editors/code/README.md +++ b/editors/code/README.md @@ -34,7 +34,7 @@ This extension provides support for the [Rust programming language](https://www. 2. Install the [rust-analyzer extension] [rustup]: https://rustup.rs -[rust-analyzer extension]: https://marketplace.visualstudio.com/items?itemName=matklad.rust-analyzer +[rust-analyzer extension]: https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer ## Configuration diff --git a/editors/code/package.json b/editors/code/package.json index 7fa04fbb9a..a88f605f47 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -7,7 +7,7 @@ "icon": "icon.png", "version": "0.4.0-dev", "releaseTag": null, - "publisher": "matklad", + "publisher": "ryst-lang", "repository": { "url": "https://github.com/rust-analyzer/rust-analyzer.git", "type": "git" diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts index bf4572fcf6..d34e82a1a6 100644 --- a/editors/code/src/config.ts +++ b/editors/code/src/config.ts @@ -10,7 +10,7 @@ const NIGHTLY_TAG = "nightly"; export type RunnableEnvCfg = undefined | Record<string, string> | { mask?: string; env: Record<string, string> }[]; export class Config { - readonly extensionId = "matklad.rust-analyzer"; + readonly extensionId = "rust-lang.rust-analyzer"; readonly rootSection = "rust-analyzer"; private readonly requiresReloadOpts = [ diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts index 7591865390..39bd73c663 100644 --- a/editors/code/src/main.ts +++ b/editors/code/src/main.ts @@ -287,7 +287,7 @@ async function isNixOs(): Promise<boolean> { function warnAboutExtensionConflicts() { if (vscode.extensions.getExtension("rust-lang.rust")) { vscode.window.showWarningMessage( - `You have both the rust-analyzer (matklad.rust-analyzer) and Rust (rust-lang.rust) ` + + `You have both the rust-analyzer (rust-lang.rust-analyzer) and Rust (rust-lang.rust) ` + "plugins enabled. These are known to conflict and cause various functions of " + "both plugins to not work correctly. You should disable one of them.", "Got it") .then(() => { }, console.error); |