diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/dev/syntax.md | 2 | ||||
| -rw-r--r-- | docs/user/manual.adoc | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/docs/dev/syntax.md b/docs/dev/syntax.md index c08062ef4..2eb08b7ca 100644 --- a/docs/dev/syntax.md +++ b/docs/dev/syntax.md | |||
| @@ -72,7 +72,7 @@ Points of note: | |||
| 72 | * Trivia and non-trivia tokens are not distinguished on the type level. | 72 | * Trivia and non-trivia tokens are not distinguished on the type level. |
| 73 | * Each token carries its full text. | 73 | * Each token carries its full text. |
| 74 | * The original text can be recovered by concatenating the texts of all tokens in order. | 74 | * The original text can be recovered by concatenating the texts of all tokens in order. |
| 75 | * Accessing a child of particular type (for example, parameter list of a function) generally involves linerary traversing the children, looking for a specific `kind`. | 75 | * Accessing a child of particular type (for example, parameter list of a function) generally involves linearly traversing the children, looking for a specific `kind`. |
| 76 | * Modifying the tree is roughly `O(depth)`. | 76 | * Modifying the tree is roughly `O(depth)`. |
| 77 | We don't make special efforts to guarantee that the depth is not linear, but, in practice, syntax trees are branchy and shallow. | 77 | We don't make special efforts to guarantee that the depth is not linear, but, in practice, syntax trees are branchy and shallow. |
| 78 | * If mandatory (grammar wise) node is missing from the input, it's just missing from the tree. | 78 | * If mandatory (grammar wise) node is missing from the input, it's just missing from the tree. |
diff --git a/docs/user/manual.adoc b/docs/user/manual.adoc index b15c9ee7f..7d85b36cb 100644 --- a/docs/user/manual.adoc +++ b/docs/user/manual.adoc | |||
| @@ -44,6 +44,11 @@ https://github.com/rust-analyzer/rust-analyzer/tree/master/editors/code[in tree] | |||
| 44 | 44 | ||
| 45 | You can install the latest release of the plugin from | 45 | You can install the latest release of the plugin from |
| 46 | https://marketplace.visualstudio.com/items?itemName=matklad.rust-analyzer[the marketplace]. | 46 | https://marketplace.visualstudio.com/items?itemName=matklad.rust-analyzer[the marketplace]. |
| 47 | |||
| 48 | Note that the plugin may cause conflicts with the | ||
| 49 | https://marketplace.visualstudio.com/items?itemName=rust-lang.rust[official Rust plugin]. It is | ||
| 50 | recommended to disable the Rust plugin when using the rust-analyzer extension. | ||
| 51 | |||
| 47 | By default, the plugin will prompt you to download the matching version of the server as well: | 52 | By default, the plugin will prompt you to download the matching version of the server as well: |
| 48 | 53 | ||
| 49 | image::https://user-images.githubusercontent.com/9021944/75067008-17502500-54ba-11ea-835a-f92aac50e866.png[] | 54 | image::https://user-images.githubusercontent.com/9021944/75067008-17502500-54ba-11ea-835a-f92aac50e866.png[] |
| @@ -61,6 +66,7 @@ To disable this notification put the following to `settings.json` | |||
| 61 | The server binary is stored in: | 66 | The server binary is stored in: |
| 62 | 67 | ||
| 63 | * Linux: `~/.config/Code/User/globalStorage/matklad.rust-analyzer` | 68 | * Linux: `~/.config/Code/User/globalStorage/matklad.rust-analyzer` |
| 69 | * Linux (Remote, such as WSL): `~/.vscode-server/data/User/globalStorage/matklad.rust-analyzer` | ||
| 64 | * macOS: `~/Library/Application\ Support/Code/User/globalStorage/matklad.rust-analyzer` | 70 | * macOS: `~/Library/Application\ Support/Code/User/globalStorage/matklad.rust-analyzer` |
| 65 | * Windows: `%APPDATA%\Code\User\globalStorage\matklad.rust-analyzer` | 71 | * Windows: `%APPDATA%\Code\User\globalStorage\matklad.rust-analyzer` |
| 66 | 72 | ||