From b12814ac5ee76fd6be08cd2fe7eb6e929f787492 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Sat, 3 Feb 2024 19:15:47 +0800 Subject: [PATCH] Fix #8005 - vala lang server path fix and crash on "..." in autocomplete signature --- src/Palete/CompletionProvider.vala | 4 ++++ src/Palete/LanguageClientVala.vala | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Palete/CompletionProvider.vala b/src/Palete/CompletionProvider.vala index cf2ff462e..9ef4c63fb 100644 --- a/src/Palete/CompletionProvider.vala +++ b/src/Palete/CompletionProvider.vala @@ -59,6 +59,10 @@ namespace Palete { for(var i = 0 ; i < args.length; i++) { word += i > 0 ? ", " : " "; var wbit = args[i].strip().split(" "); + if (wbit.length < 2) { + word += wbit[0]; + continue; + } var ty = wbit[wbit.length - 2]; ty = ty.has_suffix("?") ? "?" : ""; word += ty + wbit[wbit.length-1]; // property type..? diff --git a/src/Palete/LanguageClientVala.vala b/src/Palete/LanguageClientVala.vala index 4c7890574..ebe35e1b8 100644 --- a/src/Palete/LanguageClientVala.vala +++ b/src/Palete/LanguageClientVala.vala @@ -35,7 +35,13 @@ namespace Palete { } void startServer() { - this.initProcess("/usr/bin/vala-language-server"); + var exe = GLib.Environment.find_program_in_path( "vala-language-server"); + if (exe == null) { + GLib.warning("could not find vala-language-server"); + + return; + } + this.initProcess(exe); } -- 2.39.2