language-servers/tinymist
1
0
Fork 0
mirror of https://github.com/Myriad-Dreamin/tinymist.git synced 2025-11-22 12:34:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

feat: prefer to select the previous token when cursor is before a marker (#1175)

Browse source 
* feat: prefer to select the previous token when cursor is before a marker

* test: update snapshot
This commit is contained in:
Myriad-Dreamin 2025-01-15 14:33:26 +08:00 • committed by GitHub
parent 0aafee1d13
commit faf807edb2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/tinymist-query/src/analysis/global.rs
View file

@ -30,8 +30,9 @@ use crate::analysis::{
};
use crate::docs::{DefDocs, TidyModuleDocs};
use crate::syntax::{
classify_syntax, construct_module_dependencies, resolve_id_by_path, scan_workspace_files, Decl,
DefKind, ExprInfo, ExprRoute, LexicalScope, ModuleDependency, SyntaxClass,
classify_syntax, construct_module_dependencies, is_mark, resolve_id_by_path,
scan_workspace_files, Decl, DefKind, ExprInfo, ExprRoute, LexicalScope, ModuleDependency,
SyntaxClass,
};
use crate::upstream::{tooltip_, Tooltip};
use crate::{
@ -622,15 +623,27 @@ impl SharedContext {
}
/// Classifies the syntax under position that can be operated on by IDE
/// functionality.
pub fn classify_pos<'s>(
/// functionality. It is preferred to select a decl if it is at the starts
/// of some mark.
pub fn classify_for_decl<'s>(
&self,
source: &'s Source,
position: LspPosition,
shift: usize,
) -> Option<SyntaxClass<'s>> {
let cursor = self.to_typst_pos_offset(source, position, shift)?;
let node = LinkedNode::new(source.root()).leaf_at_compat(cursor)?;
let cursor = self.to_typst_pos_offset(source, position, 1)?;
let mut node = LinkedNode::new(source.root()).leaf_at_compat(cursor)?;
// In the case that the cursor is at the end of an identifier.
// e.g. `f(x|)`, we will select the `x`
if cursor == node.offset() + 1 && is_mark(node.kind()) {
let prev_leaf = node.prev_leaf();
if let Some(prev_leaf) = prev_leaf {
if prev_leaf.range().end == node.offset() {
node = prev_leaf;
}
}
}
classify_syntax(node, cursor)
}