From: Alan Knowles <alan@roojs.com>
Date: Sat, 3 Feb 2024 11:15:47 +0000 (+0800)
Subject: Fix #8005 - vala lang server path fix and crash on "..." in autocomplete signature
X-Git-Tag: release-5.0.2~13
X-Git-Url: http://git.roojs.org/?p=roobuilder;a=commitdiff_plain;h=b12814ac5ee76fd6be08cd2fe7eb6e929f787492

Fix #8005 - vala lang server path fix and crash on "..." in autocomplete signature
---

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);
 		}