From 037caec62c881e11325f93627d9bfd44fb374d51 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 7 Jan 2021 14:37:38 +0300
Subject: Use american spelling for config

As per

https://github.com/rust-analyzer/rust-analyzer/blob/171c3c08fe245938fb25321394233de5fe2abc7c/docs/dev/style.md#variable-naming

Also implement config aliasing, for pain-free settings migrations in the future
---
 editors/code/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'editors/code')

diff --git a/editors/code/package.json b/editors/code/package.json
index ea7f0990c..3e6ebd7ed 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -349,7 +349,7 @@
                     "default": {},
                     "markdownDescription": "Optional settings passed to the debug engine. Example: `{ \"lldb\": { \"terminal\":\"external\"} }`"
                 },
-                "rust-analyzer.assist.importMergeBehaviour": {
+                "rust-analyzer.assist.importMergeBehavior": {
                     "markdownDescription": "The strategy to use when inserting new imports or merging imports.",
                     "default": "full",
                     "type": "string",
-- 
cgit v1.2.3