[gnome-builder/1554-gvls-switch-to-builder-41-to-gvls-20-1: 159/162] gvls: set autoconfigure as default

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit d51a97defffb14242abb57e275ca8757a3d356e3
Author: Daniel Espinosa Ortiz <esodan gmail com>
Date:   Mon Oct 11 11:05:12 2021 -0500

    gvls: set autoconfigure as default

 build-aux/flatpak/org.gnome.Builder.json | 51 +++++++++++++++++---------------
 src/plugins/gvls/gvls_plugin.py          | 13 ++++++--
 2 files changed, 37 insertions(+), 27 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index 977bd55ae..bbe5ff94f 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -12,15 +12,15 @@
         "nightly"
     ],
     "desktop-file-name-prefix" : "(Nightly) ",
-    "add-extensions": {
-        "org.gnome.Builder.Plugin": {
-            "version": "master",
-            "directory": "extensions",
-            "add-ld-path": "lib",
-            "merge-dirs": "lib/gnome-builder/plugins",
-            "subdirectories": true,
-            "no-autodownload": true,
-            "autodelete": true
+    "add-extensions" : {
+        "org.gnome.Builder.Plugin" : {
+            "version" : "master",
+            "directory" : "extensions",
+            "add-ld-path" : "lib",
+            "merge-dirs" : "lib/gnome-builder/plugins",
+            "subdirectories" : true,
+            "no-autodownload" : true,
+            "autodelete" : true
         }
     },
     "finish-args" : [
@@ -60,12 +60,13 @@
     ],
     "build-options" : {
         "env" : {
+            "V" : "1",
             "BASH_COMPLETIONSDIR" : "/app/share/bash-completion/completions",
             "MOUNT_FUSE_PATH" : "../tmp/",
-            "V" : "1"
+            "JSONRPC_DEBUG" : "1"
         },
-        "prepend-path": "/usr/lib/sdk/llvm12/bin",
-        "prepend-ld-library-path": "/usr/lib/sdk/llvm12/lib"
+        "prepend-path" : "/usr/lib/sdk/llvm12/bin",
+        "prepend-ld-library-path" : "/usr/lib/sdk/llvm12/lib"
     },
     "cleanup" : [
         "/bin/rst*",
@@ -138,7 +139,7 @@
             "cleanup" : [
                 "/bin/ulockmgr_server"
             ],
-            "post-install": [
+            "post-install" : [
                 "install -m a+rx fusermount-wrapper.sh /app/bin/fusermount"
             ],
             "sources" : [
@@ -162,13 +163,15 @@
             ]
         },
         {
-            "name": "intltool",
-            "cleanup": [ "*" ],
-            "sources": [
+            "name" : "intltool",
+            "cleanup" : [
+                "*"
+            ],
+            "sources" : [
                 {
-                    "type": "archive",
-                    "url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz";,
-                    "sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
+                    "type" : "archive",
+                    "url" : "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz";,
+                    "sha256" : "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
                 }
             ]
         },
@@ -612,9 +615,9 @@
             ]
         },
         {
-            "name": "html-tidy",
-            "buildsystem": "cmake-ninja",
-            "config-opts": [
+            "name" : "html-tidy",
+            "buildsystem" : "cmake-ninja",
+            "config-opts" : [
                 "-DCMAKE_BUILD_TYPE=Release",
                 "-DBUILD_SHARED_LIB=OFF"
             ],
@@ -630,8 +633,8 @@
             "buildsystem" : "cmake-ninja",
             "builddir" : true,
             "config-opts" : [
-              "-DCMARK_TESTS=OFF",
-              "-DCMARK_SHARED=OFF"
+                "-DCMARK_TESTS=OFF",
+                "-DCMARK_SHARED=OFF"
             ],
             "cleanup" : [
                 "/bin/cmark"
diff --git a/src/plugins/gvls/gvls_plugin.py b/src/plugins/gvls/gvls_plugin.py
index 7e3ab190c..f66ada9cd 100644
--- a/src/plugins/gvls/gvls_plugin.py
+++ b/src/plugins/gvls/gvls_plugin.py
@@ -36,11 +36,12 @@ class GVlsService(Ide.Object):
     _has_started = False
     _supervisor = None
     _monitor = None
+    autoconfigure = True
     meson_build_system = True
     initialized = True
     default_namespaces = True
     default_vapi_dirs = True
-    scan_work_space = True
+    scan_work_space = False
     add_using_namespaces = True
     library_vapidir = ""
     system_vapidir = ""
@@ -177,10 +178,16 @@ class GVlsService(Ide.Object):
             b.add_value(self.create_dict_entry_string('libraryVapi', self.library_vapidir))
             Ide.debug('Library VAPI dir:{0}'.format(self.library_vapidir))
             b.add_value(self.create_dict_entry_string('systemVapi', self.system_vapidir))
-            Ide.debug('System VAPI dir:{0}'.format(self.system_vapidir))
-            b.add_value(self.create_dict_entry_string('valaApiVersion', self.vala_api_version))
             b.add_value(self.create_dict_entry_string('mesonCompileCommands', self.meson_compile_commands))
             b.add_value(self.create_dict_entry_string('mesonTargetsIntro', self.meson_targets_intro))
+            Ide.debug('System VAPI dir:{0}'.format(self.system_vapidir))
+            if (self.library_vapidir == "" or self.system_vapidir == "" or self.meson_compile_commands == 
""):
+                self.autoconfigure = True
+            else:
+                self.autoconfigure = False
+
+            b.add_value(self.create_dict_entry_boolean('autoConfigure', self.autoconfigure))
+            b.add_value(self.create_dict_entry_string('valaApiVersion', self.vala_api_version))
             ad = GLib.Variant.new_string ('valaArgs')
             vadi = self.dict_to_array_variant(self.vala_args)
             adi = GLib.Variant.new_dict_entry(ad, GLib.Variant.new_variant (vadi))