refactor(ide): model source token resolution

crates/ide/src/document_highlight.rs

@@ -33,14 +33,15 @@ pub(crate) fn document_highlight(
     let hir_file_id = file_id.into();
     let parsed_file = sema.parse_file(file_id);
     let root = parsed_file.root()?;
-    let selection = crate::source_tokens::token_candidates_at_offset(
+    let tokens = crate::source_tokens::source_token_resolution_at_offset(
         db,
         file_id,
         root,
         offset,
         token_precedence,
-    )?;
-    let tokens = selection.tokens()?;
+    )?
+    .resolved()?
+    .into_tokens();
     let highlights = tokens
         .into_iter()
         .filter_map(|token| highlight_for_token(&sema, file_id, hir_file_id, token, config.clone()))

crates/ide/src/goto_declaration.rs

@@ -17,14 +17,15 @@ pub(crate) fn goto_declaration(
     let hir_file_id = file_id.into();
     let parsed_file = sema.parse_file(file_id);
     let root = parsed_file.root()?;
-    let selection = crate::source_tokens::token_candidates_at_offset(
+    let selection = crate::source_tokens::source_token_resolution_at_offset(
         db,
         file_id,
         root,
         offset,
         goto_definition::token_precedence,
-    )?;
-    let (range, tokens) = selection.range_and_tokens()?;
+    )?
+    .resolved()?;
+    let (range, tokens) = selection.into_parts();
 
     let origins = tokens
         .into_iter()

crates/ide/src/goto_definition.rs

@@ -40,14 +40,15 @@ pub(crate) fn goto_definition(
     let hir_file_id = file_id.into();
     let parsed_file = sema.parse_file(file_id);
     let root = parsed_file.root()?;
-    let selection = crate::source_tokens::token_candidates_at_offset(
+    let selection = crate::source_tokens::source_token_resolution_at_offset(
         db,
         file_id,
         root,
         offset,
         token_precedence,
-    )?;
-    let (range, tokens) = selection.range_and_tokens()?;
+    )?
+    .resolved()?;
+    let (range, tokens) = selection.into_parts();
     let navs = tokens
         .into_iter()
         .filter_map(|token| nav_targets_for_token(db, &sema, hir_file_id, token))

crates/ide/src/hover.rs

@@ -27,12 +27,8 @@ use utils::{
 use vfs::FileId;
 
 use crate::{
-    FilePosition, RangeInfo,
-    db::root_db::RootDb,
-    definitions::DefinitionClass,
-    markup::Markup,
-    render,
-    source_tokens::{PreprocTokenSelection, SourceTokenSelection},
+    FilePosition, RangeInfo, db::root_db::RootDb, definitions::DefinitionClass, markup::Markup,
+    render, source_tokens::SourceTokenSelection,
 };
 
 const MACRO_EXPANSION_SEPARATOR: &str = "--------------------";
@@ -78,31 +74,24 @@ pub(crate) fn hover(
     let hir_file_id = file_id.into();
     let parsed_file = sema.parse_file(file_id);
     let root = parsed_file.root()?;
-    let selection = crate::source_tokens::token_candidates_at_offset(
+    let selection = crate::source_tokens::source_token_resolution_at_offset(
         db,
         file_id,
         root,
         offset,
         token_precedence,
-    )?;
-    let hover = match selection {
-        SourceTokenSelection::NormalSyntax(selection) => {
-            hover_for_token_selection(&sema, hir_file_id, selection.range, selection.tokens)
-        }
-        SourceTokenSelection::Preproc(selection) => {
-            hover_for_preproc_selection(&sema, hir_file_id, selection)
-        }
-        SourceTokenSelection::Unavailable(_) | SourceTokenSelection::Ambiguous(_) => None,
-    }?;
+    )?
+    .resolved()?;
+    let hover = hover_for_source_token_selection(&sema, hir_file_id, selection)?;
     Some(with_expanded_macro_hover(db, file_id, offset, hover))
 }
 
-fn hover_for_preproc_selection(
+fn hover_for_source_token_selection(
     sema: &Semantics<RootDb>,
     hir_file_id: HirFileId,
-    selection: PreprocTokenSelection<'_>,
+    selection: SourceTokenSelection<'_>,
 ) -> Option<RangeInfo<Markup>> {
-    let (range, tokens) = selection.range_and_tokens();
+    let (range, tokens) = selection.into_parts();
     hover_for_token_selection(sema, hir_file_id, range, tokens)
 }
 

crates/ide/src/references.rs

@@ -102,14 +102,15 @@ pub(crate) fn references(
     let hir_file_id = file_id.into();
     let parsed_file = sema.parse_file(file_id);
     let root = parsed_file.root()?;
-    let selection = crate::source_tokens::token_candidates_at_offset(
+    let tokens = crate::source_tokens::source_token_resolution_at_offset(
         db,
         file_id,
         root,
         offset,
         token_precedence,
-    )?;
-    let tokens = selection.tokens()?;
+    )?
+    .resolved()?
+    .into_tokens();
     let references = tokens
         .into_iter()
         .filter_map(|token| references_for_token(&sema, hir_file_id, token, config.clone()))

crates/ide/src/references/search.rs

@@ -276,22 +276,20 @@ impl<'a, 'b> ReferencesCtx<'a, 'b> {
         offset: TextSize,
         source_token_cache: &mut SourceTokenRequestCache,
     ) -> Vec<SyntaxTokenWithParent<'tree>> {
-        let Some(selection) = crate::source_tokens::token_candidates_at_offset_with_cache(
+        let Some(selection) = crate::source_tokens::source_token_resolution_at_offset_with_cache(
             db,
             file_id,
             node,
             offset,
             super::token_precedence,
             source_token_cache,
-        ) else {
+        )
+        .and_then(|resolution| resolution.resolved()) else {
             return Vec::new();
         };
 
-        let Some(tokens) = selection.tokens() else {
-            return Vec::new();
-        };
-
-        tokens
+        selection
+            .into_tokens()
             .into_iter()
             .filter(|tok| tok.kind().name_like())
             .filter(|tok| {