fix: issue suggesting in beetween other hx-* tags #16
Conversation
cristianoliveira
changed the title
lsp/src/tree_sitter.rs
Outdated
| match_ | ||
| .captures | ||
| .iter() | ||
| .filter(|capture| capture.node.start_position() <= trigger_point) |
There was a problem hiding this comment.
if the trigger_point is after the node end position this doesn't work as expected or am I understanding it wrong?
There was a problem hiding this comment.
I changed a bit this approach but you are correct, because the node may end after the trigger point for instance
<div hx-target="|" ... in the previous implementation it needed to understand what was else the node has or for the cases where there was a mismatch of quotes <div hx-foo="| class="bar"> the Errored node was at end, but I changed a bit and now it filters the nodes before the analysis happen
lsp/src/tree_sitter_querier.rs
Outdated
| Some(props) | ||
| } | ||
|
|
||
| pub fn query_attr_keys_for_completion(node: Node<'_>, source: &str) -> Option<Position> { |
There was a problem hiding this comment.
I moved the logic of querying for attribute key and name suggestions to their own function because it was getting a bit too complex and long to manage :)
cristianoliveira
force-pushed
the
fix/issue-suggesting-middle-of-tags
branch
from
ddb9edc
to
14e00e2
Compare
|
we have a conflict, could you resolve and i'll review |
cristianoliveira
force-pushed
the
fix/issue-suggesting-middle-of-tags
branch
from
14e00e2
to
95c6a1c
Compare
|
There you go. I also included the fix I mentioned in #17 |
cristianoliveira
force-pushed
the
fix/issue-suggesting-middle-of-tags
branch
from
b197a44
to
d0dc066
Compare
|
ok, let me review and validate :) |
| "\"".to_string(), | ||
| " ".to_string(), | ||
| ]), | ||
| trigger_characters: Some(vec!["-".to_string(), "\"".to_string(), " ".to_string()]), |
There was a problem hiding this comment.
hmm we may have a rustfmt issue here... maybe?
probably should just have one in the project
| @@ -198,19 +114,15 @@ pub fn get_position_from_lsp_completion( | |||
|
|
|||
| let tree = parser.parse(&text, None)?; | |||
| let root_node = tree.root_node(); | |||
| let trigger_point = Point::new(pos.line as usize, pos.character as usize); | |||
There was a problem hiding this comment.
is there a difference between position (line/char) and Point?
There was a problem hiding this comment.
oh i am dumb, its the treesitter struct, not our own. myb
|
this does appear to be a comprehensive change that is a good step forward thank you :) |
Fixing the issue I mentioned in another PR about suggesting in the middle of other tags, or when there are incomplete tags
demo-suggestion.mov