about summary refs log tree commit diff
path: root/editors/code/src
diff options
context:
space:
mode:
authorLukas Wirth <lukastw97@gmail.com>2022-05-13 13:21:52 +0200
committerLukas Wirth <lukastw97@gmail.com>2022-05-13 13:21:52 +0200
commite47f4597d4929a2a6a0748ca052c6ec81fd1c500 (patch)
tree92276b1fd9b6c0677ef147d3dc577d61af5fd7f2 /editors/code/src
parentd57beac7e6266a9b901c62a84a557aab04484698 (diff)
downloadrust-e47f4597d4929a2a6a0748ca052c6ec81fd1c500.tar.gz
rust-e47f4597d4929a2a6a0748ca052c6ec81fd1c500.zip
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);