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.

Sign up for GitHub

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

Jump to bottom

Remember the cwd for plugins #1814

Merged
merged 3 commits into from
Aug 1, 2021
Merged

Remember the cwd for plugins #1814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e38cd5
Remember the cwd for plugins
rwols Jul 31, 2021
c29238c
we want the result from on_pre_start
rwols Jul 31, 2021
71fd725
Revert "Remember the cwd for plugins"
rwols Jul 31, 2021
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
10 changes: 9 additions & 1 deletion plugin/core/sessions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,7 @@ class Session(TransportCallbacks):
def __init__(self, manager: Manager, logger: Logger, workspace_folders: List[WorkspaceFolder],
config: ClientConfig, plugin_class: Optional[Type[AbstractPlugin]]) -> None:
self.transport = None # type: Optional[Transport]
self.working_directory = None # type: Optional[str]
self.request_id = 0 # Our request IDs are always integers.
self._logger = logger
self._response_handlers = {} # type: Dict[int, Tuple[Request, Callable, Optional[Callable[[Any], None]]]]
Expand Down Expand Up @@ -1050,8 +1051,15 @@ def update_folders(self, folders: List[WorkspaceFolder]) -> None:
else:
self._workspace_folders = folders[:1]

def initialize_async(self, variables: Dict[str, str], transport: Transport, init_callback: InitCallback) -> None:
def initialize_async(
self,
variables: Dict[str, str],
working_directory: Optional[str],
transport: Transport,
init_callback: InitCallback
) -> None:
self.transport = transport
self.working_directory = working_directory
params = get_initialize_params(variables, self._workspace_folders, self.config)
self._init_callback = init_callback
self.send_request_async(
Expand Down
15 changes: 10 additions & 5 deletions plugin/core/windows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,16 +347,21 @@ def start_async(self, config: ClientConfig, initiating_view: sublime.View) -> No
cwd = plugin_class.on_pre_start(self._window, initiating_view, workspace_folders, config)
config.set_view_status(initiating_view, "starting...")
session = Session(self, self._create_logger(config.name), workspace_folders, config, plugin_class)
if not cwd:
cwd = workspace_folders[0].path if workspace_folders else None
if cwd:
transport_cwd = cwd # type: Optional[str]
else:
transport_cwd = workspace_folders[0].path if workspace_folders else None
transport_config = config.resolve_transport_config(variables)
transport = create_transport(transport_config, cwd, session)
transport = create_transport(transport_config, transport_cwd, session)
if plugin_class:
plugin_class.on_post_start(self._window, initiating_view, workspace_folders, config)
config.set_view_status(initiating_view, "initialize")
session.initialize_async(
variables, transport,
lambda session, is_error: self._on_post_session_initialize(initiating_view, session, is_error))
variables=variables,
transport=transport,
working_directory=cwd,
init_callback=functools.partial(self._on_post_session_initialize, initiating_view)
)
self._new_session = session
except Exception as e:
message = "".join((
Expand Down