diff options
author | Steffen Lyngbaek <[email protected]> | 2020-03-10 18:21:56 +0000 |
---|---|---|
committer | Steffen Lyngbaek <[email protected]> | 2020-03-10 21:36:01 +0000 |
commit | cfb48df149bfa8a15b113b1a252598457a4ea392 (patch) | |
tree | 8672e75715e2def7963e6250700125b17f233009 /crates/ra_ide/src/lib.rs | |
parent | e98aff109a1c4bda6a05f16981898425c302aa0c (diff) |
Address Issues from Github
- Updated naming of config
- Define struct in ra_ide and use remote derive in rust-analyzer/config
- Make inlayConfig type more flexible to support more future types
- Remove constructor only used in tests
Diffstat (limited to 'crates/ra_ide/src/lib.rs')
-rw-r--r-- | crates/ra_ide/src/lib.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs index 8b1292a41..a3acfd225 100644 --- a/crates/ra_ide/src/lib.rs +++ b/crates/ra_ide/src/lib.rs | |||
@@ -44,7 +44,6 @@ mod marks; | |||
44 | #[cfg(test)] | 44 | #[cfg(test)] |
45 | mod test_utils; | 45 | mod test_utils; |
46 | 46 | ||
47 | use ra_project_model::InlayHintOptions; | ||
48 | use std::sync::Arc; | 47 | use std::sync::Arc; |
49 | 48 | ||
50 | use ra_cfg::CfgOptions; | 49 | use ra_cfg::CfgOptions; |
@@ -69,7 +68,7 @@ pub use crate::{ | |||
69 | expand_macro::ExpandedMacro, | 68 | expand_macro::ExpandedMacro, |
70 | folding_ranges::{Fold, FoldKind}, | 69 | folding_ranges::{Fold, FoldKind}, |
71 | hover::HoverResult, | 70 | hover::HoverResult, |
72 | inlay_hints::{InlayHint, InlayKind}, | 71 | inlay_hints::{InlayConfig, InlayHint, InlayKind}, |
73 | references::{Declaration, Reference, ReferenceAccess, ReferenceKind, ReferenceSearchResult}, | 72 | references::{Declaration, Reference, ReferenceAccess, ReferenceKind, ReferenceSearchResult}, |
74 | runnables::{Runnable, RunnableKind, TestId}, | 73 | runnables::{Runnable, RunnableKind, TestId}, |
75 | source_change::{FileSystemEdit, SourceChange, SourceFileEdit}, | 74 | source_change::{FileSystemEdit, SourceChange, SourceFileEdit}, |
@@ -319,7 +318,7 @@ impl Analysis { | |||
319 | pub fn inlay_hints( | 318 | pub fn inlay_hints( |
320 | &self, | 319 | &self, |
321 | file_id: FileId, | 320 | file_id: FileId, |
322 | inlay_hint_opts: &InlayHintOptions, | 321 | inlay_hint_opts: &InlayConfig, |
323 | ) -> Cancelable<Vec<InlayHint>> { | 322 | ) -> Cancelable<Vec<InlayHint>> { |
324 | self.with_db(|db| inlay_hints::inlay_hints(db, file_id, inlay_hint_opts)) | 323 | self.with_db(|db| inlay_hints::inlay_hints(db, file_id, inlay_hint_opts)) |
325 | } | 324 | } |