Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

editor: Fix double $ sign on completion accept in PHP (#34726)

Browse source 
Closes #33510 https://github.com/zed-extensions/php/issues/29

If certain language servers do not provide an insert/replace range, we
use `surrounding_word` as a fallback for that range, which internally
uses `word_characters`. It makes sense to use
`completion_query_characters` instead of `word_characters` to get that
range, because we use `completion_query_characters` to query completions
in the first place.

That means, for some hypothetical reason (e.g., if the Tailwind server
stops providing insert/replace ranges), we would correctly fall back to
the range "bg-blue-200^" instead of "200^", because
`completion_query_characters` includes "-" in this case.

For this particular fix, right now the default PHP language server
`phpactor` does not provide an insert/replace range, and hence
completion query character is used, which is `$` in this case.

Note that `$` isn't in word characters for reasons mentioned here:
https://github.com/zed-extensions/php/issues/14

Release Notes:

- Fixed an issue where accepting variable completion in PHP would result
in a double $ sign in the prefix.
This commit is contained in:
Smit Barmase 2025-07-18 22:39:00 +05:30 • committed by GitHub
parent 8bc8d61fa6
commit 1dd470ca48
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/editor/src/editor.rs
View file

@ -5451,7 +5451,7 @@ impl Editor {
};
let (word_replace_range, word_to_exclude) = if let (word_range, Some(CharKind::Word)) =
buffer_snapshot.surrounding_word(buffer_position)
buffer_snapshot.surrounding_word(buffer_position, false)
{
let word_to_exclude = buffer_snapshot
.text_for_range(word_range.clone())
@ -6605,8 +6605,8 @@ impl Editor {
}
let snapshot = cursor_buffer.read(cx).snapshot();
let (start_word_range, _) = snapshot.surrounding_word(cursor_buffer_position);
let (end_word_range, _) = snapshot.surrounding_word(tail_buffer_position);
let (start_word_range, _) = snapshot.surrounding_word(cursor_buffer_position, false);
let (end_word_range, _) = snapshot.surrounding_word(tail_buffer_position, false);
if start_word_range != end_word_range {
self.document_highlights_task.take();
self.clear_background_highlights::<DocumentHighlightRead>(cx);
@ -22137,7 +22137,7 @@ impl SemanticsProvider for Entity<Project> {
// Fallback on using TreeSitter info to determine identifier range
buffer.read_with(cx, |buffer, _| {
let snapshot = buffer.snapshot();
let (range, kind) = snapshot.surrounding_word(position);
let (range, kind) = snapshot.surrounding_word(position, false);
if kind != Some(CharKind::Word) {
return None;
}