[gnome-builder/1074-vala-language-server-add-support-using-gvls: 8/14] GVls: plugin removed unused features
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder/1074-vala-language-server-add-support-using-gvls: 8/14] GVls: plugin removed unused features
- Date: Tue, 3 Dec 2019 05:52:21 +0000 (UTC)
commit d5e6089fa0d804fcc744d323d9af5e0e30adddc0
Author: Daniel Espinosa Ortiz <esodan gmail com>
Date: Wed Nov 20 19:00:27 2019 -0600
GVls: plugin removed unused features
src/plugins/gvls/gvls_plugin.py | 33 +++++----------------------------
1 file changed, 5 insertions(+), 28 deletions(-)
---
diff --git a/src/plugins/gvls/gvls_plugin.py b/src/plugins/gvls/gvls_plugin.py
index 4581d5ad7..7fb879262 100644
--- a/src/plugins/gvls/gvls_plugin.py
+++ b/src/plugins/gvls/gvls_plugin.py
@@ -62,26 +62,7 @@ class GVlsService(Ide.Object):
context = self.get_context()
workdir = context.ref_workdir()
- cargo_toml = workdir.get_child('Cargo.toml')
- if cargo_toml.query_exists():
- try:
- self._monitor = cargo_toml.monitor(0, None)
- self._monitor.set_rate_limit(5 * 1000) # 5 Seconds
- self._monitor.connect('changed', self._monitor_changed_cb)
- 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):
"""
@@ -90,11 +71,8 @@ class GVlsService(Ide.Object):
"""
if self._client is not None:
print ("Shutting down server")
- _client.stop ()
- if self._monitor is not None:
- monitor, self._monitor = self._monitor, None
- if monitor is not None:
- monitor.cancel()
+ _client.stop()
+ _client.destroy()
if self._supervisor is not None:
supervisor, self._supervisor = self._supervisor, None
@@ -115,22 +93,21 @@ class GVlsService(Ide.Object):
# to its :client property.
if not self._has_started:
self._has_started = True
+ print ('Starting GVls server')
# Setup a launcher to spawn the rust language server
launcher = self._create_launcher()
launcher.set_clear_env(False)
- if DEV_MODE:
- launcher.setenv('RUST_LOG', 'debug', True)
# Locate the directory of the project and run gvls from there.
workdir = self.get_context().ref_workdir()
launcher.set_cwd(workdir.get_path())
# If org.gnome.gvls.stdio.Server is installed by GVls
- path_to_rls = 'org.gnome.gvls.stdio.Server'
+ path = 'org.gnome.gvls.stdio.Server'
# 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)
+ launcher.push_argv(path)
# Spawn our peer process and monitor it for
# crashes. We may need to restart it occasionally.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]