diff options
author | Aleksey Kladov <[email protected]> | 2021-05-17 16:37:06 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2021-05-17 16:37:06 +0100 |
commit | 41510f437e87e013f2015bed1a964163c6d3f1ff (patch) | |
tree | ead7add1ada64dfad8e819a32a5ea4ffa8c0cd60 /docs | |
parent | f9d4a9eaee6f86d9bd60cf6d18ec744b56696135 (diff) |
minor: adjust config name
Diffstat (limited to 'docs')
-rw-r--r-- | docs/dev/style.md | 9 | ||||
-rw-r--r-- | docs/user/generated_config.adoc | 18 |
2 files changed, 14 insertions, 13 deletions
diff --git a/docs/dev/style.md b/docs/dev/style.md index f22b69768..96dd684b3 100644 --- a/docs/dev/style.md +++ b/docs/dev/style.md | |||
@@ -791,13 +791,14 @@ Many names in rust-analyzer conflict with keywords. | |||
791 | We use mangled names instead of `r#ident` syntax: | 791 | We use mangled names instead of `r#ident` syntax: |
792 | 792 | ||
793 | ``` | 793 | ``` |
794 | struct -> strukt | ||
795 | crate -> krate | 794 | crate -> krate |
796 | impl -> imp | ||
797 | trait -> trait_ | ||
798 | fn -> func | ||
799 | enum -> enum_ | 795 | enum -> enum_ |
796 | fn -> func | ||
797 | impl -> imp | ||
800 | mod -> module | 798 | mod -> module |
799 | struct -> strukt | ||
800 | trait -> trait_ | ||
801 | type -> ty | ||
801 | ``` | 802 | ``` |
802 | 803 | ||
803 | **Rationale:** consistency. | 804 | **Rationale:** consistency. |
diff --git a/docs/user/generated_config.adoc b/docs/user/generated_config.adoc index e2d74e164..feba43ff1 100644 --- a/docs/user/generated_config.adoc +++ b/docs/user/generated_config.adoc | |||
@@ -179,6 +179,15 @@ Controls file watching implementation. | |||
179 | -- | 179 | -- |
180 | These directories will be ignored by rust-analyzer. | 180 | These directories will be ignored by rust-analyzer. |
181 | -- | 181 | -- |
182 | [[rust-analyzer.highlighting.strings]]rust-analyzer.highlighting.strings (default: `true`):: | ||
183 | + | ||
184 | -- | ||
185 | Use semantic tokens for strings. | ||
186 | |||
187 | In some editors (e.g. vscode) semantic tokens override other highlighting grammars. | ||
188 | By disabling semantic tokens for strings, other grammars can be used to highlight | ||
189 | their contents. | ||
190 | -- | ||
182 | [[rust-analyzer.hoverActions.debug]]rust-analyzer.hoverActions.debug (default: `true`):: | 191 | [[rust-analyzer.hoverActions.debug]]rust-analyzer.hoverActions.debug (default: `true`):: |
183 | + | 192 | + |
184 | -- | 193 | -- |
@@ -332,12 +341,3 @@ Additional arguments to `rustfmt`. | |||
332 | Advanced option, fully override the command rust-analyzer uses for | 341 | Advanced option, fully override the command rust-analyzer uses for |
333 | formatting. | 342 | formatting. |
334 | -- | 343 | -- |
335 | [[rust-analyzer.semanticStringTokens]]rust-analyzer.semanticStringTokens (default: `true`):: | ||
336 | + | ||
337 | -- | ||
338 | Use semantic tokens for strings. | ||
339 | |||
340 | In some editors (e.g. vscode) semantic tokens override other highlighting grammars. | ||
341 | By disabling semantic tokens for strings, other grammars can be used to highlight | ||
342 | their contents. | ||
343 | -- | ||