diff options
Diffstat (limited to 'support/texlab/src/features/completion/color_model.rs')
-rw-r--r-- | support/texlab/src/features/completion/color_model.rs | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/support/texlab/src/features/completion/color_model.rs b/support/texlab/src/features/completion/color_model.rs index a24953caa5..2190b690ad 100644 --- a/support/texlab/src/features/completion/color_model.rs +++ b/support/texlab/src/features/completion/color_model.rs @@ -1,11 +1,7 @@ -use cancellation::CancellationToken; -use cstree::TextRange; use lsp_types::CompletionParams; +use rowan::{ast::AstNode, TextRange}; -use crate::{ - features::cursor::CursorContext, - syntax::{latex, CstNode}, -}; +use crate::{features::cursor::CursorContext, syntax::latex}; use super::types::{InternalCompletionItem, InternalCompletionItemData}; @@ -14,10 +10,7 @@ const MODEL_NAMES: &[&str] = &["gray", "rgb", "RGB", "HTML", "cmyk"]; pub fn complete_color_models<'a>( context: &'a CursorContext<CompletionParams>, items: &mut Vec<InternalCompletionItem<'a>>, - cancellation_token: &CancellationToken, ) -> Option<()> { - cancellation_token.result().ok()?; - let range = check_color_definition(context).or_else(|| check_color_definition_set(context))?; for name in MODEL_NAMES { @@ -51,7 +44,7 @@ fn check_color_definition_set(context: &CursorContext<CompletionParams>) -> Opti #[cfg(test)] mod tests { - use cstree::TextRange; + use rowan::TextRange; use crate::features::testing::FeatureTester; @@ -69,7 +62,7 @@ mod tests { let context = CursorContext::new(request); let mut actual_items = Vec::new(); - complete_color_models(&context, &mut actual_items, CancellationToken::none()); + complete_color_models(&context, &mut actual_items); assert!(actual_items.is_empty()); } @@ -86,7 +79,7 @@ mod tests { let context = CursorContext::new(request); let mut actual_items = Vec::new(); - complete_color_models(&context, &mut actual_items, CancellationToken::none()); + complete_color_models(&context, &mut actual_items); assert!(actual_items.is_empty()); } @@ -103,7 +96,7 @@ mod tests { let context = CursorContext::new(request); let mut actual_items = Vec::new(); - complete_color_models(&context, &mut actual_items, CancellationToken::none()); + complete_color_models(&context, &mut actual_items); assert!(!actual_items.is_empty()); for item in actual_items { @@ -123,7 +116,7 @@ mod tests { let context = CursorContext::new(request); let mut actual_items = Vec::new(); - complete_color_models(&context, &mut actual_items, CancellationToken::none()); + complete_color_models(&context, &mut actual_items); assert!(!actual_items.is_empty()); for item in actual_items { @@ -143,7 +136,7 @@ mod tests { let context = CursorContext::new(request); let mut actual_items = Vec::new(); - complete_color_models(&context, &mut actual_items, CancellationToken::none()); + complete_color_models(&context, &mut actual_items); assert!(!actual_items.is_empty()); for item in actual_items { @@ -163,7 +156,7 @@ mod tests { let context = CursorContext::new(request); let mut actual_items = Vec::new(); - complete_color_models(&context, &mut actual_items, CancellationToken::none()); + complete_color_models(&context, &mut actual_items); assert!(!actual_items.is_empty()); for item in actual_items { |