From b58c1c9eb2b19479018add616592b73e3b933b77 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Sun, 13 Jun 2021 22:00:39 +0200
Subject: Give ImportPrefix variants better config names

---
 crates/rust-analyzer/src/config.rs | 10 ++++++----
 editors/code/package.json          |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 3b20d741a..91a9b55a8 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -801,7 +801,9 @@ enum ImportGranularityDef {
 #[serde(rename_all = "snake_case")]
 enum ImportPrefixDef {
     Plain,
+    #[serde(alias = "self")]
     BySelf,
+    #[serde(alias = "crate")]
     ByCrate,
 }
 
@@ -986,13 +988,13 @@ fn field_props(field: &str, ty: &str, doc: &[&str], default: &str) -> serde_json
             "type": "string",
             "enum": [
                 "plain",
-                "by_self",
-                "by_crate"
+                "self",
+                "crate"
             ],
             "enumDescriptions": [
                 "Insert import paths relative to the current module, using up to one `super` prefix if the parent module contains the requested item.",
-                "Prefix all import paths with `self` if they don't begin with `self`, `super`, `crate` or a crate name.",
-                "Force import paths to be absolute by always starting them with `crate` or the crate name they refer to."
+                "Insert import paths relative to the current module, using up to one `super` prefix if the parent module contains the requested item. Prefixes `self` in front of the path if it starts with a module.",
+                "Force import paths to be absolute by always starting them with `crate` or the extern crate name they come from."
             ],
         },
         "Vec<ManifestOrProjectJson>" => set! {
diff --git a/editors/code/package.json b/editors/code/package.json
index 0f3ed48a0..9565c6edb 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -418,13 +418,13 @@
                     "type": "string",
                     "enum": [
                         "plain",
-                        "by_self",
-                        "by_crate"
+                        "self",
+                        "crate"
                     ],
                     "enumDescriptions": [
                         "Insert import paths relative to the current module, using up to one `super` prefix if the parent module contains the requested item.",
-                        "Prefix all import paths with `self` if they don't begin with `self`, `super`, `crate` or a crate name.",
-                        "Force import paths to be absolute by always starting them with `crate` or the crate name they refer to."
+                        "Insert import paths relative to the current module, using up to one `super` prefix if the parent module contains the requested item. Prefixes `self` in front of the path if it starts with a module.",
+                        "Force import paths to be absolute by always starting them with `crate` or the extern crate name they come from."
                     ]
                 },
                 "rust-analyzer.assist.importGroup": {
-- 
cgit v1.2.3