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



commit f45714dee20416ef5ec1d00b79b0404c4fba6a9b
Author: Christian Hergert <chergert redhat com>
Date:   Fri Oct 14 11:48:03 2022 -0500

    plugins/glsl-language-server: port to generic LSP plugin
    
    This one will ultimately crash the language server because it doesn't
    handle gracefully requests for features it doesn't support. So eventually
    we'll have to make IdeLspClient track capabilities better and make the
    providers actually check that state.

 .../gbp-glsl-diagnostic-provider.c                 | 65 ------------------
 .../gbp-glsl-diagnostic-provider.h                 | 31 ---------
 .../glsl-language-server/gbp-glsl-service.c        | 80 ----------------------
 .../glsl-language-server/gbp-glsl-service.h        | 31 ---------
 .../glsl-language-server-plugin.c                  | 40 -----------
 .../glsl-language-server.gresource.xml             |  1 +
 .../glsl-language-server.plugin                    | 11 +--
 src/plugins/glsl-language-server/meson.build       |  6 --
 src/plugins/glsl-language-server/settings.json     |  4 ++
 9 files changed, 12 insertions(+), 257 deletions(-)
---
diff --git a/src/plugins/glsl-language-server/glsl-language-server.gresource.xml 
b/src/plugins/glsl-language-server/glsl-language-server.gresource.xml
index 98f622169..d08cec664 100644
--- a/src/plugins/glsl-language-server/glsl-language-server.gresource.xml
+++ b/src/plugins/glsl-language-server/glsl-language-server.gresource.xml
@@ -2,5 +2,6 @@
 <gresources>
   <gresource prefix="/plugins/glsl-language-server">
     <file>glsl-language-server.plugin</file>
+    <file>settings.json</file>
   </gresource>
 </gresources>
diff --git a/src/plugins/glsl-language-server/glsl-language-server.plugin 
b/src/plugins/glsl-language-server/glsl-language-server.plugin
index d664db334..a85d5634d 100644
--- a/src/plugins/glsl-language-server/glsl-language-server.plugin
+++ b/src/plugins/glsl-language-server/glsl-language-server.plugin
@@ -2,15 +2,18 @@
 Builtin=true
 Copyright=Copyright © 2022 Christian Hergert
 Description=Provides integration with glsl-language-server
-Embedded=_gbp_glsl_register_types
+Embedded=ide_lsp_plugin_register_types
 Module=glsl-language-server
 Name=GLSL Language Server
 X-Category=lsps
+X-Code-Action-Languages=glsl
 X-Completion-Provider-Languages=glsl
-X-Symbol-Resolver-Languages=glsl
 X-Diagnostic-Provider-Languages=glsl
+X-Formatter-Languages=glsl
 X-Highlighter-Languages=glsl
 X-Hover-Provider-Languages=glsl
+X-LSP-Command=glslls --stdin
+X-LSP-Languages=glsl
+X-LSP-Settings=settings.json
 X-Rename-Provider-Languages=glsl
-X-Formatter-Languages=glsl
-X-Code-Action-Languages=glsl
+X-Symbol-Resolver-Languages=glsl
diff --git a/src/plugins/glsl-language-server/meson.build b/src/plugins/glsl-language-server/meson.build
index 3b362f513..33d83be75 100644
--- a/src/plugins/glsl-language-server/meson.build
+++ b/src/plugins/glsl-language-server/meson.build
@@ -1,11 +1,5 @@
 if get_option('plugin_glsl_language_server')
 
-plugins_sources += files([
-  'glsl-language-server-plugin.c',
-  'gbp-glsl-diagnostic-provider.c',
-  'gbp-glsl-service.c',
-])
-
 plugin_glsl_resources = gnome.compile_resources(
   'glsl-language-server-resources',
   'glsl-language-server.gresource.xml',
diff --git a/src/plugins/glsl-language-server/settings.json b/src/plugins/glsl-language-server/settings.json
new file mode 100644
index 000000000..a87d29921
--- /dev/null
+++ b/src/plugins/glsl-language-server/settings.json
@@ -0,0 +1,4 @@
+{
+    "glsl-language-server" : {
+    }
+}


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