Skip to content

Commit da96963

Browse files
committed
Auto merge of rust-lang#12238 - Veykril:publisher, r=Veykril
feat: Change VSCode extension publisher to `rust-lang`
2 parents 0c881e8 + e47f459 commit da96963

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

docs/user/manual.adoc

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ The rust-analyzer plugin for VS Code is maintained
6161
https://github.com/rust-analyzer/rust-analyzer/tree/master/editors/code[in tree].
6262

6363
You can install the latest release of the plugin from
64-
https://marketplace.visualstudio.com/items?itemName=matklad.rust-analyzer[the marketplace].
64+
https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer[the marketplace].
6565

6666
Note that the plugin may cause conflicts with the
6767
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`
8181
----
8282
====
8383

84-
The server binary is stored in the extension install directory, which starts with `matklad.rust-analyzer-` and is located under:
84+
The server binary is stored in the extension install directory, which starts with `rust-lang.rust-analyzer-` and is located under:
8585

8686
* Linux: `~/.vscode/extensions`
8787
* Linux (Remote, such as WSL): `~/.vscode-server/extensions`
8888
* macOS: `~/.vscode/extensions`
8989
* Windows: `%USERPROFILE%\.vscode\extensions`
9090

91-
As an exception, on NixOS, the extension makes a copy of the server and stores it under `~/.config/Code/User/globalStorage/matklad.rust-analyzer`.
91+
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`.
9292

9393
Note that we only support the two most recent versions of VS Code.
9494

editors/code/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This extension provides support for the [Rust programming language](https://www.
3434
2. Install the [rust-analyzer extension]
3535

3636
[rustup]: https://rustup.rs
37-
[rust-analyzer extension]: https://marketplace.visualstudio.com/items?itemName=matklad.rust-analyzer
37+
[rust-analyzer extension]: https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer
3838

3939
## Configuration
4040

editors/code/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"icon": "icon.png",
88
"version": "0.4.0-dev",
99
"releaseTag": null,
10-
"publisher": "matklad",
10+
"publisher": "ryst-lang",
1111
"repository": {
1212
"url": "https://github.com/rust-analyzer/rust-analyzer.git",
1313
"type": "git"

editors/code/src/config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const NIGHTLY_TAG = "nightly";
1010
export type RunnableEnvCfg = undefined | Record<string, string> | { mask?: string; env: Record<string, string> }[];
1111

1212
export class Config {
13-
readonly extensionId = "matklad.rust-analyzer";
13+
readonly extensionId = "rust-lang.rust-analyzer";
1414

1515
readonly rootSection = "rust-analyzer";
1616
private readonly requiresReloadOpts = [

editors/code/src/main.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ async function isNixOs(): Promise<boolean> {
287287
function warnAboutExtensionConflicts() {
288288
if (vscode.extensions.getExtension("rust-lang.rust")) {
289289
vscode.window.showWarningMessage(
290-
`You have both the rust-analyzer (matklad.rust-analyzer) and Rust (rust-lang.rust) ` +
290+
`You have both the rust-analyzer (rust-lang.rust-analyzer) and Rust (rust-lang.rust) ` +
291291
"plugins enabled. These are known to conflict and cause various functions of " +
292292
"both plugins to not work correctly. You should disable one of them.", "Got it")
293293
.then(() => { }, console.error);

0 commit comments

Comments
 (0)