Skip to content

chore: fixups for asyncio #30

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

Draft
rwols wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore: fixups for asyncio #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
78 changes: 32 additions & 46 deletions plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,21 @@

from .lib.tarball import decompress
from .lib.tarball import download
from functools import partial
from LSP.plugin import command_handler
from LSP.plugin import Error
from LSP.plugin import LspPlugin
from LSP.plugin import LspTextCommand
from LSP.plugin import LspWindowCommand
from LSP.plugin import notification_handler
from LSP.plugin import OnPreStartContext
from LSP.plugin import parse_uri
from LSP.plugin import PluginStartError
from LSP.plugin import Promise
from LSP.plugin import Request
from LSP.plugin import run_coroutine
from LSP.plugin import ServerResponse
from LSP.plugin import SessionViewProtocol
from LSP.plugin import uri_handler
from LSP.plugin.core.open import open_externally
from LSP.plugin.core.protocol import Error
from LSP.plugin.core.protocol import ResponseError
from LSP.plugin.core.typing import NotRequired
from LSP.plugin.core.typing import StrEnum
from LSP.plugin.core.views import first_selection_region
Expand Down Expand Up @@ -209,10 +207,10 @@ def on_pre_start_async(cls, context: OnPreStartContext) -> None:
decompress(tarball_path, str(cls.plugin_storage_path))
version_file.write_text(VERSION)

def on_initialized_async(self) -> None:
async def on_initialized(self) -> None:
self.preview_task_id: str = ''

def on_server_response_async(self, response: ServerResponse) -> None:
async def on_server_response(self, response: ServerResponse) -> None:
if response['method'] == 'textDocument/codeLens':
if (result := response['result']) and len(result) == 5:
del result[4] # More
Expand Down Expand Up @@ -247,26 +245,26 @@ def on_preview_dispose(self, params: PreviewDisposeParams) -> None:
pass

@uri_handler('command')
def on_open_command_uri(self, uri: DocumentUri, flags: sublime.NewFileFlags) -> Promise[sublime.Sheet | None]:
async def on_open_command_uri(self, uri: DocumentUri, flags: sublime.NewFileFlags) -> sublime.Sheet | None:
parsed = urlparse(uri)
scheme, filename = parse_uri(unquote(parsed.query).strip('[]"'))
if scheme != 'file':
return Promise.resolve(None)
return None
command = parsed.path
if command == 'tinymist.openInternal':
if session := self.weaksession():
view = session.window.open_file(filename, flags)
# Note that in case of an image file the returned View will not be valid and the only way to get the
# Sheet seems to be via Window.active_sheet().
sheet = view.sheet() if view.is_valid() else session.window.active_sheet()
return Promise.resolve(sheet)
return Promise.resolve(None)
return sheet
return None
if command == 'tinymist.openExternal':
open_externally(filename)
return Promise.resolve(None)
return None

@command_handler('tinymist.runCodeLens')
def on_run_code_lens(self, arguments: list[str] | None) -> Promise[None]:
async def on_run_code_lens(self, arguments: list[str] | None) -> None:
if arguments and (session := self.weaksession()):
action = arguments[0]
if action == 'preview':
Expand All @@ -277,7 +275,6 @@ def on_run_code_lens(self, arguments: list[str] | None) -> Promise[None]:
elif action == 'export-pdf':
if view := session.window.active_view():
view.run_command('lsp_tinymist_export', {'format': 'pdf'})
return Promise.resolve(None)

def on_selection_modified_async(self, session_view: SessionViewProtocol) -> None:
if not self.preview_task_id:
Expand All @@ -304,7 +301,10 @@ def on_selection_modified_async(self, session_view: SessionViewProtocol) -> None

class LspTinymistPreviewCommand(LspWindowCommand):

def run(self) -> None:
def run(self) -> None: # pyright: ignore[reportIncompatibleMethodOverride]
run_coroutine(self._run())

async def _run(self) -> None:
session = self.session()
if not session:
return
Expand All @@ -320,15 +320,15 @@ def run(self) -> None:
'command': 'tinymist.doStartBrowsingPreview',
'arguments': [['--task-id', plugin.preview_task_id] + session.config.settings.get('preview.browsing.args')]
}
session.execute_command(command).then(self._on_preview_result_async) # pyright: ignore[reportArgumentType]

def _on_preview_result_async(self, params: PreviewResult | Error) -> None:
pass
await session.run_command(command)


class LspTinymistExportCommand(LspTextCommand):

def run(self, edit: sublime.Edit, format: str) -> None: # pyright: ignore[reportIncompatibleMethodOverride]
run_coroutine(self._run(format))

async def _run(self, format: str) -> None:
filename = self.view.file_name()
if not filename:
self._status_message('Export unavailable for unsaved file')
Expand Down Expand Up @@ -364,15 +364,12 @@ def run(self, edit: sublime.Edit, format: str) -> None: # pyright: ignore[repor
'command': command_name,
'arguments': [filename, extra_opts, actions]
}
session.execute_command(command).then(self._on_export_result_async) # pyright: ignore[reportArgumentType]
await session.run_command(command)

def input(self, args: dict[str, Any]) -> sublime_plugin.ListInputHandler | None:
if 'format' not in args:
return ExportFormatInputHandler()

def _on_export_result_async(self, response: ExportResponse | Error) -> None:
pass

def _status_message(self, msg: str) -> None:
if window := self.view.window():
window.status_message(msg)
Expand All @@ -392,10 +389,10 @@ class LspTinymistOnEnterCommand(LspTextCommand):

capability = 'experimental.onEnter'

def run(self, edit: sublime.Edit) -> None:
sublime.set_timeout_async(self._run_async)
def run(self, edit: sublime.Edit) -> None: # pyright: ignore[reportIncompatibleMethodOverride]
run_coroutine(self._run())

def _run_async(self) -> None:
async def _run(self) -> None:
session = self.session_by_name(self.session_name, self.capability)
if not session:
return
Expand All @@ -405,33 +402,22 @@ def _run_async(self) -> None:
session_view = session.session_view_for_view_async(self.view)
if not session_view:
return
session_view.session_buffer.purge_changes_async(self.view) # pyright: ignore[reportAttributeAccessIssue]
await session_view.session_buffer.purge_changes(self.view) # pyright: ignore[reportAttributeAccessIssue]
params: OnEnterParams = {
'textDocument': text_document_identifier(self.view),
'range': region_to_range(self.view, selection_region)
}
version = self.view.change_count()
session.send_request_async(
Request('experimental/onEnter', params, self.view),
partial(self._on_result_async, version),
partial(self._on_error_async, version)
)

def _on_result_async(self, version: int, text_edits: list[TextEdit] | None) -> None:
text_edits = await session.request(Request('experimental/onEnter', params, self.view))
if version != self.view.change_count():
return
if text_edits:
# Convert custom TextEdit with placeholder into SnippetTextEdit
edits: list[TextEdit | SnippetTextEdit] = [
{'range': text_edit['range'], 'snippet': {'kind': 'snippet', 'value': value}}
if '$0' in (value := text_edit['newText']) else text_edit
for text_edit in text_edits
]
self.view.run_command('lsp_apply_text_document_edit', {'edits': edits})
else:
if isinstance(text_edits, Error) or not text_edits:
self.view.run_command('insert', {'characters': '\n'})

def _on_error_async(self, version: int, error: ResponseError) -> None:
if version != self.view.change_count():
return
self.view.run_command('insert', {'characters': '\n'})
# Convert custom TextEdit with placeholder into SnippetTextEdit
edits: list[TextEdit | SnippetTextEdit] = [
{'range': text_edit['range'], 'snippet': {'kind': 'snippet', 'value': value}}
if '$0' in (value := text_edit['newText']) else text_edit
for text_edit in text_edits
]
self.view.run_command('lsp_apply_text_document_edit', {'edits': edits}) # pyright: ignore[reportArgumentType]