mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #12238 - Veykril:publisher, r=Veykril

Browse Source 
feat: Change VSCode extension publisher to `rust-lang`
This commit is contained in:
bors 2022-05-13 11:26:43 +00:00
commit da969635a4
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/user/manual.adoc
View File

@ -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.

2
editors/code/README.md
View File

@ -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

2
editors/code/package.json
View File

@ -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"

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

@ -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 = [

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

@ -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);