[gnome-builder/1365-switch-to-gvls-18-0-and-backport-to-3-38] Switch to GVls 18.0

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit ce90151d2f34a4b9011b5856fe2de0c77d798c34
Author: Daniel Espinosa Ortiz <esodan gmail com>
Date:   Sun Dec 20 10:30:07 2020 -0600

    Switch to GVls 18.0

 build-aux/flatpak/org.gnome.Builder.json | 18 +++++++++++++++++-
 src/plugins/gvls/gvls.plugin             |  1 +
 src/plugins/gvls/gvls_plugin.py          |  4 ++++
 3 files changed, 22 insertions(+), 1 deletion(-)
---
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index 1e8d9b35e..eefbb9381 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -594,6 +594,22 @@
                 }
             ]
         },
+        {
+            "name" : "vala-linter",
+            "config-opts" : [
+                "--libdir=/app/lib",
+                "--buildtype=debugoptimized"
+            ],
+            "buildsystem" : "meson",
+            "builddir" : true,
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://github.com/vala-lang/vala-lint.git";,
+                    "branch": "f4c83d6e1a40d5379fba97f274a0057c69e9ed07"
+                }
+            ]
+        },
         {
             "name" : "gvls",
             "config-opts" : [
@@ -611,7 +627,7 @@
                 {
                     "type" : "git",
                     "url" : "https://gitlab.gnome.org/esodan/gvls.git";,
-                    "branch": "gvls-0.16.2"
+                    "branch": "gvls-18.0"
                 }
             ]
         },
diff --git a/src/plugins/gvls/gvls.plugin b/src/plugins/gvls/gvls.plugin
index 1770cc6f8..f12c0f704 100644
--- a/src/plugins/gvls/gvls.plugin
+++ b/src/plugins/gvls/gvls.plugin
@@ -12,3 +12,4 @@ X-Completion-Provider-Languages=vala
 X-Highlighter-Languages=vala
 X-Symbol-Resolver-Languages=vala
 X-Diagnostic-Provider-Languages=vala
+X-Formatter-Languages=vala
diff --git a/src/plugins/gvls/gvls_plugin.py b/src/plugins/gvls/gvls_plugin.py
index 2dca5e30b..09857097e 100644
--- a/src/plugins/gvls/gvls_plugin.py
+++ b/src/plugins/gvls/gvls_plugin.py
@@ -594,3 +594,7 @@ class GVlsHoverProvider(Ide.LspHoverProvider, Ide.HoverProvider):
         self.props.priority = 200
         GVlsService.bind_client(self)
 
+class GVlsFormatter(Ide.LspFormatter, Ide.Formatter):
+    def do_load(self):
+        GVlsService.bind_client(self)
+