about summary refs log tree commit diff
path: root/editors/code/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-05-13 11:26:43 +0000
committerbors <bors@rust-lang.org>2022-05-13 11:26:43 +0000
commitda969635a4a6e2eed930dc81f565390a70512192 (patch)
treeeda20d91b4ff61b0ea2224f36b409f898552225d /editors/code/src
parent0c881e882e11137a74e1b185609b9056df0282c1 (diff)
parente47f4597d4929a2a6a0748ca052c6ec81fd1c500 (diff)
downloadrust-da969635a4a6e2eed930dc81f565390a70512192.tar.gz
rust-da969635a4a6e2eed930dc81f565390a70512192.zip
Auto merge of #12238 - Veykril:publisher, r=Veykril
feat: Change VSCode extension publisher to `rust-lang`
Diffstat (limited to 'editors/code/src')
-rw-r--r--editors/code/src/config.ts2
-rw-r--r--editors/code/src/main.ts2
2 files changed, 2 insertions, 2 deletions
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index bf4572fcf61..d34e82a1a6e 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 7591865390b..39bd73c6634 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);