Merge #5910 #5912

5910: Fix some typos r=matklad a=SomeoneToIgnore



5912: Remove fixme from inlay_hints.ts r=matklad a=Veetaha

I have reevaluated the fixme and it doesn't seem necessary to pass an array of files
to the inlay hints request.
This will (a) make the request more compilcated (b), make us wait for
inlay hints for `all` active editors resolve at once before rendering and (c)
doesn't seem required because 99% of the time there is a single active editor
in the IDE

Co-authored-by: Kirill Bulatov <[email protected]>
Co-authored-by: Veetaha <[email protected]>

Author: 3 people

crates/rust-analyzer/src/handlers.rs

@@ -1075,7 +1075,7 @@ pub(crate) fn handle_inlay_hints(
         .analysis
         .inlay_hints(file_id, &snap.config.inlay_hints)?
         .into_iter()
-        .map(|it| to_proto::inlay_int(&line_index, it))
+        .map(|it| to_proto::inlay_hint(&line_index, it))
         .collect())
 }
 

crates/rust-analyzer/src/to_proto.rs

@@ -294,7 +294,7 @@ pub(crate) fn signature_help(
     }
 }
 
-pub(crate) fn inlay_int(line_index: &LineIndex, inlay_hint: InlayHint) -> lsp_ext::InlayHint {
+pub(crate) fn inlay_hint(line_index: &LineIndex, inlay_hint: InlayHint) -> lsp_ext::InlayHint {
     lsp_ext::InlayHint {
         label: inlay_hint.label.to_string(),
         range: range(line_index, inlay_hint.range),

editors/code/src/inlay_hints.ts

@@ -111,7 +111,6 @@ class HintsUpdater implements Disposable {
     }
 
     syncCacheAndRenderHints() {
-        // FIXME: make inlayHints request pass an array of files?
         this.sourceFiles.forEach((file, uri) => this.fetchHints(file).then(hints => {
             if (!hints) return;
 

editors/code/src/lsp_ext.ts

@@ -1,5 +1,5 @@
 /**
- * This file mirrors `crates/rust-analyzer/src/req.rs` declarations.
+ * This file mirrors `crates/rust-analyzer/src/lsp_ext.rs` declarations.
  */
 
 import * as lc from "vscode-languageclient";