[gnome-builder] rls: port to IdeLspService
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] rls: port to IdeLspService
- Date: Wed, 22 Dec 2021 00:57:57 +0000 (UTC)
commit 223c272000b872090578b5162cec04b6e7cf7e79
Author: Christian Hergert <chergert redhat com>
Date: Tue Dec 21 16:57:38 2021 -0800
rls: port to IdeLspService
src/plugins/rls/rls_plugin.py | 192 ++++--------------------------------------
1 file changed, 18 insertions(+), 174 deletions(-)
---
diff --git a/src/plugins/rls/rls_plugin.py b/src/plugins/rls/rls_plugin.py
index 11f670129..b051f3867 100644
--- a/src/plugins/rls/rls_plugin.py
+++ b/src/plugins/rls/rls_plugin.py
@@ -31,40 +31,19 @@ from gi.repository import Gio
from gi.repository import GObject
from gi.repository import Ide
-DEV_MODE = False
-
-class RlsService(Ide.Object):
- _client = None
- _has_started = False
- _supervisor = None
- _monitor = None
-
- @classmethod
- def from_context(klass, context):
- return context.ensure_child_typed(RlsService)
-
- @GObject.Property(type=Ide.LspClient)
- def client(self):
- return self._client
-
- @client.setter
- def client(self, value):
- self._client = value
- self.notify('client')
+DEV_MODE = os.getenv('DEV_MODE') and True or False
+class RlsService(Ide.LspService):
def do_parent_set(self, parent):
- """
- After the context has been loaded, we want to watch the project
- Cargo.toml for changes if we find one. That will allow us to
- restart the process as necessary to pick up changes.
- """
- if parent is None:
- return
+ self.set_program('rls')
+ self.set_inherit_stderr(DEV_MODE)
+ self.set_search_path([os.path.expanduser("~/.cargo/bin")])
+ # Monitor Cargo.toml for changes so that we can reload the
+ # rls binary as necessary. This requires Cargo.toml to be
+ # in the root of the git however.
context = self.get_context()
- workdir = context.ref_workdir()
- cargo_toml = workdir.get_child('Cargo.toml')
-
+ cargo_toml = context.get_workdir().get_child('Cargo.toml')
if cargo_toml.query_exists():
try:
self._monitor = cargo_toml.monitor(0, None)
@@ -73,150 +52,15 @@ class RlsService(Ide.Object):
except Exception as ex:
Ide.debug('Failed to monitor Cargo.toml for changes:', repr(ex))
- def _monitor_changed_cb(self, monitor, file, other_file, event_type):
- """
- This method is called when Cargo.toml has changed. We need to
- cancel any supervised process and force the language server to
- restart. Otherwise, we risk it not picking up necessary changes.
- """
- if self._supervisor is not None:
- subprocess = self._supervisor.get_subprocess()
- if subprocess is not None:
- subprocess.force_exit()
-
- def do_stop(self):
- """
- Stops the Rust Language Server upon request to shutdown the
- RlsService.
- """
- if self._monitor is not None:
- monitor, self._monitor = self._monitor, None
- if monitor is not None:
- monitor.cancel()
-
- if self._supervisor is not None:
- supervisor, self._supervisor = self._supervisor, None
- supervisor.stop()
-
- def _ensure_started(self):
- """
- Start the rust service which provides communication with the
- Rust Language Server. We supervise our own instance of the
- language server and restart it as necessary using the
- Ide.SubprocessSupervisor.
-
- Various extension points (diagnostics, symbol providers, etc) use
- the RlsService to access the rust components they need.
- """
- # To avoid starting the `rls` process unconditionally at startup,
- # we lazily start it when the first provider tries to bind a client
- # to its :client property.
- if not self._has_started:
- self._has_started = True
-
- # Setup a launcher to spawn the rust language server
- launcher = self._create_launcher()
- launcher.set_clear_env(False)
- sysroot = self._discover_sysroot()
- if sysroot:
- launcher.setenv("SYS_ROOT", sysroot, True)
- launcher.setenv("LD_LIBRARY_PATH", os.path.join(sysroot, "lib"), True)
- if DEV_MODE:
- launcher.setenv('RUST_LOG', 'debug', True)
-
- # Locate the directory of the project and run rls from there.
- workdir = self.get_context().ref_workdir()
- launcher.set_cwd(workdir.get_path())
-
- # If rls was installed with Cargo, try to discover that
- # to save the user having to update PATH.
- path_to_rls = os.path.expanduser("~/.cargo/bin/rls")
- if os.path.exists(path_to_rls):
- old_path = os.getenv('PATH')
- new_path = os.path.expanduser('~/.cargo/bin')
- if old_path is not None:
- new_path += os.path.pathsep + old_path
- launcher.setenv('PATH', new_path, True)
- else:
- path_to_rls = "rls"
-
- # Setup our Argv. We want to communicate over STDIN/STDOUT,
- # so it does not require any command line options.
- launcher.push_argv(path_to_rls)
-
- # Spawn our peer process and monitor it for
- # crashes. We may need to restart it occasionally.
- self._supervisor = Ide.SubprocessSupervisor()
- self._supervisor.connect('spawned', self._rls_spawned)
- self._supervisor.set_launcher(launcher)
- self._supervisor.start()
-
- def _rls_spawned(self, supervisor, subprocess):
- """
- This callback is executed when the `rls` process is spawned.
- We can use the stdin/stdout to create a channel for our
- LspClient.
- """
- stdin = subprocess.get_stdin_pipe()
- stdout = subprocess.get_stdout_pipe()
- io_stream = Gio.SimpleIOStream.new(stdout, stdin)
-
- if self._client:
- self._client.stop()
- self._client.destroy()
-
- self._client = Ide.LspClient.new(io_stream)
- self.append(self._client)
- self._client.add_language('rust')
- self._client.start()
- self.notify('client')
-
- def _create_launcher(self):
- """
- Creates a launcher to be used by the rust service. This needs
- to be run on the host because we do not currently bundle rust
- inside our flatpak.
-
- In the future, we might be able to rely on the runtime for
- the tooling. Maybe even the program if flatpak-builder has
- prebuilt our dependencies.
- """
- flags = Gio.SubprocessFlags.STDIN_PIPE | Gio.SubprocessFlags.STDOUT_PIPE
- if not DEV_MODE:
- flags |= Gio.SubprocessFlags.STDERR_SILENCE
- launcher = Ide.SubprocessLauncher()
- launcher.set_flags(flags)
- launcher.set_cwd(GLib.get_home_dir())
- launcher.set_run_on_host(True)
- return launcher
-
- def _discover_sysroot(self):
- """
- The Rust Language Server needs to know where the sysroot is of
- the Rust installation we are using. This is simple enough to
- get, by using `rust --print sysroot` as the rust-language-server
- documentation suggests.
- """
- for rustc in ['rustc', os.path.expanduser('~/.cargo/bin/rustc')]:
- try:
- launcher = self._create_launcher()
- launcher.push_args([rustc, '--print', 'sysroot'])
- subprocess = launcher.spawn()
- _, stdout, _ = subprocess.communicate_utf8()
- return stdout.strip()
- except:
- pass
-
- @classmethod
- def bind_client(klass, provider):
- """
- This helper tracks changes to our client as it might happen when
- our `rls` process has crashed.
- """
- context = provider.get_context()
- self = RlsService.from_context(context)
- self._ensure_started()
- self.bind_property('client', provider, 'client', GObject.BindingFlags.SYNC_CREATE)
+ def _monitor_changed_cb(self, *args):
+ self.restart()
+
+ def do_configure_launcher(self, pipeline, launcher):
+ if DEV_MODE:
+ launcher.setenv('RUST_LOG', 'debug', True)
+
+ def do_configure_client(self, client):
+ client.add_language('rust')
class RlsDiagnosticProvider(Ide.LspDiagnosticProvider, Ide.DiagnosticProvider):
def do_load(self):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]