Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: consider priority_selector when using best_session during rename #2538

Merged
merged 10 commits into from
Oct 27, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
missing a case
rchl committed Oct 26, 2024
commit 51d584b9dbf35124377a319426ec51e82a2160f8
11 changes: 6 additions & 5 deletions plugin/rename.py
Original file line number Diff line number Diff line change
@@ -136,7 +136,7 @@ def input(self, args: dict) -> sublime_plugin.TextInputHandler | None:
# Defer to "run" and trigger rename.
return
jwortmann marked this conversation as resolved.
Show resolved Hide resolved
point = get_position(self.view, point=args.get('point'))
prepare_provider_session = self.best_session("renameProvider.prepareProvider", point)
prepare_provider_session = self._get_prepare_rename_session(point, args.get('session_name'))
if prepare_provider_session and "placeholder" not in args:
# Defer to "run" and trigger "prepare" request.
return
@@ -161,10 +161,7 @@ def run(
if listener:
listener.purge_changes_async()
location = get_position(self.view, event, point)
prepare_provider_session = \
self.session_by_name(session_name, PREPARE_RENAME_CAPABILITY) if session_name \
else self.best_session(PREPARE_RENAME_CAPABILITY, point)
prepare_provider_session = self.best_session(PREPARE_RENAME_CAPABILITY, point)
prepare_provider_session = self._get_prepare_rename_session(point, session_name)
if new_name or placeholder or not prepare_provider_session:
if location is not None and new_name:
self._do_rename(location, new_name, prepare_provider_session)
@@ -179,6 +176,10 @@ def run(
prepare_provider_session.send_request(
request, partial(self._on_prepare_result, location, prepare_provider_session_name), self._on_prepare_error)

def _get_prepare_rename_session(self, point: int | None, session_name: str | None) -> Session | None:
return self.session_by_name(session_name, PREPARE_RENAME_CAPABILITY) if session_name \
else self.best_session(PREPARE_RENAME_CAPABILITY, point)

def _do_rename(self, position: int, new_name: str, preferred_session: Session | None) -> None:
session = preferred_session or self.best_session(self.capability, position)
if not session: