aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-09-14 11:12:08 +0100
committerGitHub <[email protected]>2020-09-14 11:12:08 +0100
commita61178d2186b8d9ca324231ab03368819be0ff6e (patch)
treec9169fd4a7a1dd40cd7cee9e41456a0e17fdbb09 /editors
parent0d03fe6ef57d3956e92382e0e1f1a916015191cb (diff)
parentadc4c6b9d7fd91827c4cf383a1e95dc7e27138e0 (diff)
Merge #5985
5985: Make MergeBehaviour configurable r=jonas-schievink a=Veykril This should make the newly implemented `MergeBehaviour` for import insertion configurable as roughly outlined in https://github.com/rust-analyzer/rust-analyzer/pull/5935#issuecomment-685834257. For the config name and the like I just picked what came to mind so that might be up for bikeshedding. Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'editors')
-rw-r--r--editors/code/package.json15
1 files changed, 15 insertions, 0 deletions
diff --git a/editors/code/package.json b/editors/code/package.json
index d3185205d..86a70a89a 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -626,6 +626,21 @@
626 }, 626 },
627 "description": "List of warnings that should be displayed with hint severity.\nThe warnings will be indicated by faded text or three dots in code and will not show up in the problems panel.", 627 "description": "List of warnings that should be displayed with hint severity.\nThe warnings will be indicated by faded text or three dots in code and will not show up in the problems panel.",
628 "default": [] 628 "default": []
629 },
630 "rust-analyzer.assist.importMergeBehaviour": {
631 "type": "string",
632 "enum": [
633 "none",
634 "full",
635 "last"
636 ],
637 "enumDescriptions": [
638 "No merging",
639 "Merge all layers of the import trees",
640 "Only merge the last layer of the import trees"
641 ],
642 "default": "full",
643 "description": "The strategy to use when inserting new imports or merging imports."
629 } 644 }
630 } 645 }
631 }, 646 },