[gnome-builder/wip/chergert/lsp-plugin-loader: 8/24] plugins/bash-language-server: port to generic LSP plugin




commit 73f2bbe9249efdb8ea3eb88e97c17732ebb86a5a
Author: Christian Hergert <chergert redhat com>
Date:   Fri Oct 14 12:12:07 2022 -0500

    plugins/bash-language-server: port to generic LSP plugin

 .../bash-language-server-plugin.c                  | 68 -------------------
 .../bash-language-server.gresource.xml             |  1 +
 .../bash-language-server.plugin                    |  7 +-
 .../gbp-bash-code-action-provider.c                | 65 ------------------
 .../gbp-bash-code-action-provider.h                | 31 ---------
 .../gbp-bash-completion-provider.c                 | 61 -----------------
 .../gbp-bash-completion-provider.h                 | 31 ---------
 .../gbp-bash-diagnostic-provider.c                 | 65 ------------------
 .../gbp-bash-diagnostic-provider.h                 | 31 ---------
 .../bash-language-server/gbp-bash-formatter.c      | 65 ------------------
 .../bash-language-server/gbp-bash-formatter.h      | 31 ---------
 .../bash-language-server/gbp-bash-highlighter.c    | 65 ------------------
 .../bash-language-server/gbp-bash-highlighter.h    | 31 ---------
 .../bash-language-server/gbp-bash-hover-provider.c | 66 ------------------
 .../bash-language-server/gbp-bash-hover-provider.h | 31 ---------
 .../gbp-bash-rename-provider.c                     | 65 ------------------
 .../gbp-bash-rename-provider.h                     | 31 ---------
 .../bash-language-server/gbp-bash-service.c        | 79 ----------------------
 .../bash-language-server/gbp-bash-service.h        | 31 ---------
 .../gbp-bash-symbol-resolver.c                     | 65 ------------------
 .../gbp-bash-symbol-resolver.h                     | 31 ---------
 src/plugins/bash-language-server/meson.build       | 13 ----
 src/plugins/bash-language-server/settings.json     |  4 ++
 23 files changed, 10 insertions(+), 958 deletions(-)
---
diff --git a/src/plugins/bash-language-server/bash-language-server.gresource.xml 
b/src/plugins/bash-language-server/bash-language-server.gresource.xml
index 3f77de6c9..494413573 100644
--- a/src/plugins/bash-language-server/bash-language-server.gresource.xml
+++ b/src/plugins/bash-language-server/bash-language-server.gresource.xml
@@ -2,5 +2,6 @@
 <gresources>
   <gresource prefix="/plugins/bash-language-server">
     <file>bash-language-server.plugin</file>
+    <file>settings.json</file>
   </gresource>
 </gresources>
diff --git a/src/plugins/bash-language-server/bash-language-server.plugin 
b/src/plugins/bash-language-server/bash-language-server.plugin
index 0ee5bcea1..a7c2ffdc2 100644
--- a/src/plugins/bash-language-server/bash-language-server.plugin
+++ b/src/plugins/bash-language-server/bash-language-server.plugin
@@ -1,11 +1,14 @@
 [Plugin]
 Builtin=true
-Copyright=Copyright © 2021 Günther Wagner, Copyright © 2022 Christian Hergert
+Copyright=Copyright © 2022 Christian Hergert
 Description=Provides integration with bash-language-server for Bash
-Embedded=_gbp_bash_register_types
+Embedded=ide_lsp_plugin_register_types
 Module=bash-language-server
 Name=Bash Language Server
 X-Category=lsps
+X-LSP-Command=bash-language-server start
+X-LSP-Languages=sh
+X-LSP-Settings=settings.json
 X-Completion-Provider-Languages=sh
 X-Symbol-Resolver-Languages=sh
 X-Diagnostic-Provider-Languages=sh
diff --git a/src/plugins/bash-language-server/meson.build b/src/plugins/bash-language-server/meson.build
index a044dc504..f894aef60 100644
--- a/src/plugins/bash-language-server/meson.build
+++ b/src/plugins/bash-language-server/meson.build
@@ -1,18 +1,5 @@
 if get_option('plugin_bash_language_server')
 
-plugins_sources += files([
-  'bash-language-server-plugin.c',
-  'gbp-bash-code-action-provider.c',
-  'gbp-bash-completion-provider.c',
-  'gbp-bash-diagnostic-provider.c',
-  'gbp-bash-formatter.c',
-  'gbp-bash-highlighter.c',
-  'gbp-bash-hover-provider.c',
-  'gbp-bash-rename-provider.c',
-  'gbp-bash-symbol-resolver.c',
-  'gbp-bash-service.c',
-])
-
 plugin_bash_resources = gnome.compile_resources(
   'bash-language-server-resources',
   'bash-language-server.gresource.xml',
diff --git a/src/plugins/bash-language-server/settings.json b/src/plugins/bash-language-server/settings.json
new file mode 100644
index 000000000..2c2e02b96
--- /dev/null
+++ b/src/plugins/bash-language-server/settings.json
@@ -0,0 +1,4 @@
+{
+    "bash-language-server" : {
+    }
+}


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]