From c185e482e9bfee7fc1c0c3c9b5f58ca64d968349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Fri, 1 May 2020 11:20:58 +0300 Subject: Document Gnome Builder support --- docs/user/readme.adoc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/user/readme.adoc b/docs/user/readme.adoc index 4cb1e23e8..b1af72ce6 100644 --- a/docs/user/readme.adoc +++ b/docs/user/readme.adoc @@ -201,7 +201,7 @@ let g:LanguageClient_serverCommands = { 2. Configure by adding this to your vim/neovim config file (replacing the existing Rust-specific line if it exists): + -[source,vim] +[source,vim] ---- let g:ycm_language_server = \ [ @@ -252,6 +252,15 @@ If it worked, you should see "rust-analyzer, Line X, Column Y" on the left side If you get an error saying `No such file or directory: 'rust-analyzer'`, see the <> section on installing the language server binary. +=== Gnome Builder + +Prerequisites: You have installed the <>. + +Gnome Builder currently has support for RLS, and there's no way to configure the language server executable. A future version might support `rust-analyzer` out of the box. + +1. Rename, symlink or copy the `rust-analyzer` binary to `rls` and place it somewhere Builder can find (in `PATH`, or under `~/.cargo/bin`). +2. Enable the Rust Builder plugin. + == Usage See https://github.com/rust-analyzer/rust-analyzer/blob/master/docs/user/features.md[features.md]. -- cgit v1.2.3 From eafb2107dd176c60730f2c11a1c66d878064703c Mon Sep 17 00:00:00 2001 From: KENTARO OKUDA Date: Fri, 1 May 2020 09:43:08 -0400 Subject: Fix Typos --- docs/dev/architecture.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/dev/architecture.md b/docs/dev/architecture.md index 3a337c574..cee916c09 100644 --- a/docs/dev/architecture.md +++ b/docs/dev/architecture.md @@ -46,7 +46,7 @@ can be quickly updated for small modifications. Some of the components of this repository are generated through automatic processes. `cargo xtask codegen` runs all generation tasks. Generated code is -commited to the git repository. +committed to the git repository. In particular, `cargo xtask codegen` generates: @@ -114,7 +114,7 @@ is responsible for guessing a HIR for a particular source position. Underneath, HIR works on top of salsa, using a `HirDatabase` trait. `ra_hir_xxx` crates have a strong ECS flavor, in that they work with raw ids and -directly query the databse. +directly query the database. The top-level `ra_hir` façade crate wraps ids into a more OO-flavored API. -- cgit v1.2.3 From f5d20b6525bc87773dc3757cf58cb51cdd6a21a0 Mon Sep 17 00:00:00 2001 From: KENTARO OKUDA Date: Fri, 1 May 2020 14:00:06 -0400 Subject: Fix Typos on guide.md --- docs/dev/guide.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/dev/guide.md b/docs/dev/guide.md index abbe4c154..c3252f1f6 100644 --- a/docs/dev/guide.md +++ b/docs/dev/guide.md @@ -26,7 +26,7 @@ properties hold: ## IDE API -To see the bigger picture of how the IDE features works, let's take a look at the [`AnalysisHost`] and +To see the bigger picture of how the IDE features work, let's take a look at the [`AnalysisHost`] and [`Analysis`] pair of types. `AnalysisHost` has three methods: * `default()` for creating an empty analysis instance @@ -131,7 +131,7 @@ mapping between `SourceRoot` IDs (which are assigned by the client) and actual analyzer. Note that `mod`, `#[path]` and `include!()` can only reference files from the -same source root. It is of course is possible to explicitly add extra files to +same source root. It is of course possible to explicitly add extra files to the source root, even `/dev/random`. ## Language Server Protocol @@ -192,7 +192,7 @@ task will be canceled as soon as the main loop calls `apply_change` on the [`schedule`]: https://github.com/rust-analyzer/rust-analyzer/blob/guide-2019-01/crates/ra_lsp_server/src/main_loop.rs#L426-L455 [The task]: https://github.com/rust-analyzer/rust-analyzer/blob/guide-2019-01/crates/ra_lsp_server/src/main_loop/handlers.rs#L205-L223 -This concludes the overview of the analyzer's programing *interface*. Next, lets +This concludes the overview of the analyzer's programing *interface*. Next, let's dig into the implementation! ## Salsa @@ -480,7 +480,7 @@ throughout the analyzer: ## Source Map pattern Due to an obscure edge case in completion, IDE needs to know the syntax node of -an use statement which imported the given completion candidate. We can't just +a use statement which imported the given completion candidate. We can't just store the syntax node as a part of name resolution: this will break incrementality, due to the fact that syntax changes after every file modification. -- cgit v1.2.3 From b73dbbfbf2cad646eb3f8e3342a1c390a874dc53 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 2 May 2020 11:50:43 +0200 Subject: Add missing members generates indented blocks --- docs/user/assists.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/user/assists.md b/docs/user/assists.md index 6c6943622..5a83c4a98 100644 --- a/docs/user/assists.md +++ b/docs/user/assists.md @@ -175,7 +175,9 @@ trait Trait { } impl Trait for () { - fn foo(&self) -> u32 { todo!() } + fn foo(&self) -> u32 { + todo!() + } } ``` -- cgit v1.2.3