[gnome-builder/wip/albfan/vala-language-server] Use vala-language-server as ls for vala

[Alberto Fanjul <albfan src gnome org>]

commit d3b85c597f8a5b51e192413b8cf37127b305cb18
Author: Alberto Fanjul <albertofanjul gmail com>
Date:   Sat Apr 4 14:39:41 2020 +0200

    Use vala-language-server as ls for vala

 build-aux/flatpak/org.gnome.Builder.json           | 25 ++++++++++++++++++++++
 ...server_Avoid-to-run-from-host-for-flatpak.patch | 24 +++++++++++++++++++++
 2 files changed, 49 insertions(+)
---
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index b418feb4c..dd30c69cf 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -7,6 +7,9 @@
     "tags" : [
         "nightly"
     ],
+    "config-opts" : [
+        "-Dgvls_plugin=false"
+    ],
     "desktop-file-name-prefix" : "(Nightly) ",
     "finish-args" : [
         "--require-version=1.0.0",
@@ -624,6 +627,28 @@
                 }
             ]
         },
+        {
+            "name" : "vala-language-server",
+            "config-opts" : [
+                "--libdir=/app/lib",
+                "--buildtype=debugoptimized",
+               "-Dbuilder_abi=3.37"
+            ],
+            "buildsystem" : "meson",
+            "builddir" : true,
+            "sources" : [
+                {
+                    "type" : "git",
+                    "_url" : "https://github.com/benwaffle/vala-language-server";,
+                    "url" : "https://github.com/albfan/vala-language-server";,
+                   "branch": "gnome-builder"
+                },
+               {
+                   "type": "patch",
+                   "path": "vala-language-server_Avoid-to-run-from-host-for-flatpak.patch"
+               }
+            ]
+        },
         {
             "name" : "gnome-builder",
             "buildsystem" : "meson",
diff --git a/build-aux/flatpak/vala-language-server_Avoid-to-run-from-host-for-flatpak.patch 
b/build-aux/flatpak/vala-language-server_Avoid-to-run-from-host-for-flatpak.patch
new file mode 100644
index 000000000..a5433c431
--- /dev/null
+++ b/build-aux/flatpak/vala-language-server_Avoid-to-run-from-host-for-flatpak.patch
@@ -0,0 +1,24 @@
+From c3b4a6ed88ac9672dd7925676e304b4f226c1ad0 Mon Sep 17 00:00:00 2001
+From: Alberto Fanjul <albertofanjul gmail com>
+Date: Sat, 4 Apr 2020 14:18:19 +0200
+Subject: [PATCH] Avoid to run from host for flatpak
+
+---
+ plugins/gnome-builder/vala_langserv.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/plugins/gnome-builder/vala_langserv.py b/plugins/gnome-builder/vala_langserv.py
+index e81cfc6f..93641d2c 100644
+--- a/plugins/gnome-builder/vala_langserv.py
++++ b/plugins/gnome-builder/vala_langserv.py
+@@ -190,7 +190,6 @@ class VlsService(Ide.Object):
+         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):
+-- 
+2.26.0
+