aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/dev/style.md9
-rw-r--r--docs/user/generated_config.adoc18
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.
791We use mangled names instead of `r#ident` syntax: 791We use mangled names instead of `r#ident` syntax:
792 792
793``` 793```
794struct -> strukt
795crate -> krate 794crate -> krate
796impl -> imp
797trait -> trait_
798fn -> func
799enum -> enum_ 795enum -> enum_
796fn -> func
797impl -> imp
800mod -> module 798mod -> module
799struct -> strukt
800trait -> trait_
801type -> 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--
180These directories will be ignored by rust-analyzer. 180These directories will be ignored by rust-analyzer.
181-- 181--
182[[rust-analyzer.highlighting.strings]]rust-analyzer.highlighting.strings (default: `true`)::
183+
184--
185Use semantic tokens for strings.
186
187In some editors (e.g. vscode) semantic tokens override other highlighting grammars.
188By disabling semantic tokens for strings, other grammars can be used to highlight
189their 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`.
332Advanced option, fully override the command rust-analyzer uses for 341Advanced option, fully override the command rust-analyzer uses for
333formatting. 342formatting.
334-- 343--
335[[rust-analyzer.semanticStringTokens]]rust-analyzer.semanticStringTokens (default: `true`)::
336+
337--
338Use semantic tokens for strings.
339
340In some editors (e.g. vscode) semantic tokens override other highlighting grammars.
341By disabling semantic tokens for strings, other grammars can be used to highlight
342their contents.
343--