From 044a4ac7e4b02e644586434795a9f567b5bee06a Mon Sep 17 00:00:00 2001 From: JCWasmx86 Date: Wed, 13 Mar 2024 18:39:52 +0100 Subject: [PATCH] plugins/swift-mesonlsp: Rename to mesonlsp Swift-MesonLSP is replaced by a C++-version --- meson_options.txt | 2 +- src/plugins/meson.build | 3 ++- src/plugins/mesonlsp/meson.build | 11 +++++++++++ .../mesonlsp.gresource.xml} | 4 ++-- .../mesonlsp.plugin} | 12 ++++++------ src/plugins/mesonlsp/settings.json | 4 ++++ src/plugins/swift-mesonlsp/meson.build | 11 ----------- src/plugins/swift-mesonlsp/settings.json | 4 ---- 8 files changed, 26 insertions(+), 25 deletions(-) create mode 100644 src/plugins/mesonlsp/meson.build rename src/plugins/{swift-mesonlsp/swift-mesonlsp.gresource.xml => mesonlsp/mesonlsp.gresource.xml} (56%) rename src/plugins/{swift-mesonlsp/swift-mesonlsp.plugin => mesonlsp/mesonlsp.plugin} (70%) create mode 100644 src/plugins/mesonlsp/settings.json delete mode 100644 src/plugins/swift-mesonlsp/meson.build delete mode 100644 src/plugins/swift-mesonlsp/settings.json diff --git a/meson_options.txt b/meson_options.txt index 149234fb4..967f3ae30 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -65,6 +65,7 @@ option('plugin_markdown_preview', type: 'boolean') option('plugin_markdown_indenter', type: 'boolean') option('plugin_maven', type: 'boolean') option('plugin_meson', type: 'boolean') +option('plugin_mesonlsp', type: 'boolean') option('plugin_meson_templates', type: 'boolean') option('plugin_modelines', type: 'boolean') option('plugin_mono', type: 'boolean') @@ -91,7 +92,6 @@ option('plugin_stylelint', type: 'boolean') option('plugin_swift', type: 'boolean') option('plugin_swiftformat', type: 'boolean') option('plugin_swiftlint', type: 'boolean') -option('plugin_swift_mesonlsp', type: 'boolean') option('plugin_sysprof', type: 'boolean') option('plugin_todo', type: 'boolean') option('plugin_ts_language_server', type: 'boolean') diff --git a/src/plugins/meson.build b/src/plugins/meson.build index f729e5ac2..101ccfb01 100644 --- a/src/plugins/meson.build +++ b/src/plugins/meson.build @@ -99,6 +99,7 @@ subdir('markdown-indenter') subdir('maven') subdir('menu-search') subdir('meson') +subdir('mesonlsp') subdir('meson-templates') subdir('messages') subdir('modelines') @@ -137,7 +138,6 @@ subdir('stylelint') subdir('swift') subdir('swiftlint') subdir('swift-format') -subdir('swift-mesonlsp') subdir('symbol-tree') subdir('sysprof') subdir('terminal') @@ -249,6 +249,7 @@ status += [ 'jdtls ......................... (Java) : @0@'.format(get_option('plugin_jdtls')), 'jedi-language-server ........ (Python) : @0@ **'.format(get_option('plugin_jedi_language_server')), 'lua-language-server ............ (Lua) : @0@'.format(get_option('plugin_lua_language_server')), + 'mesonlsp ..................... (Meson) : @0@'.format(get_option('plugin_mesonlsp')), 'python-lsp-server ........... (Python) : @0@'.format(get_option('plugin_python_lsp_server')), 'serve-d .......................... (D) : @0@'.format(get_option('plugin_serve_d')), 'SourceKit .................... (Swift) : @0@'.format(get_option('plugin_sourcekit_lsp')), diff --git a/src/plugins/mesonlsp/meson.build b/src/plugins/mesonlsp/meson.build new file mode 100644 index 000000000..2e8a7f238 --- /dev/null +++ b/src/plugins/mesonlsp/meson.build @@ -0,0 +1,11 @@ +if get_option('plugin_mesonlsp') + +plugin_mesonlsp_resources = gnome.compile_resources( + 'mesonlsp-resources', + 'mesonlsp.gresource.xml', + c_name: 'gbp_mesonlsp', +) + +plugins_sources += plugin_mesonlsp_resources + +endif diff --git a/src/plugins/swift-mesonlsp/swift-mesonlsp.gresource.xml b/src/plugins/mesonlsp/mesonlsp.gresource.xml similarity index 56% rename from src/plugins/swift-mesonlsp/swift-mesonlsp.gresource.xml rename to src/plugins/mesonlsp/mesonlsp.gresource.xml index 3adb5f726..606bb62bd 100644 --- a/src/plugins/swift-mesonlsp/swift-mesonlsp.gresource.xml +++ b/src/plugins/mesonlsp/mesonlsp.gresource.xml @@ -1,7 +1,7 @@ - - swift-mesonlsp.plugin + + mesonlsp.plugin settings.json diff --git a/src/plugins/swift-mesonlsp/swift-mesonlsp.plugin b/src/plugins/mesonlsp/mesonlsp.plugin similarity index 70% rename from src/plugins/swift-mesonlsp/swift-mesonlsp.plugin rename to src/plugins/mesonlsp/mesonlsp.plugin index 45cc80445..5e94af549 100644 --- a/src/plugins/swift-mesonlsp/swift-mesonlsp.plugin +++ b/src/plugins/mesonlsp/mesonlsp.plugin @@ -1,11 +1,11 @@ [Plugin] Authors=JCWasmx86 -Copyright=Copyright © 2023 JCWasmx86 -Description=Meson code intelligence provided by Swift-MesonLSP +Copyright=Copyright © 2024 JCWasmx86 +Description=Meson code intelligence provided by mesonlsp Embedded=ide_lsp_plugin_register_types -Module=Swift-MesonLSP -Name=Swift-MesonLSP -Website=https://github.com/JCWasmx86/Swift-MesonLSP +Module=mesonlsp +Name=mesonlsp +Website=https://github.com/JCWasmx86/mesonlsp X-Category=lsps X-Code-Action-Languages=meson X-Completion-Provider-Languages=meson @@ -16,7 +16,7 @@ X-Formatter-Languages=meson X-Highlighter-Languages-Priority=100 X-Highlighter-Languages=meson X-Hover-Provider-Languages=meson -X-LSP-Command=Swift-MesonLSP --lsp +X-LSP-Command=mesonlsp --lsp X-LSP-Languages=meson; X-LSP-Settings=settings.json X-Rename-Provider-Languages=meson diff --git a/src/plugins/mesonlsp/settings.json b/src/plugins/mesonlsp/settings.json new file mode 100644 index 000000000..16a8b6c9c --- /dev/null +++ b/src/plugins/mesonlsp/settings.json @@ -0,0 +1,4 @@ +{ + "mesonlsp" : { + } +} diff --git a/src/plugins/swift-mesonlsp/meson.build b/src/plugins/swift-mesonlsp/meson.build deleted file mode 100644 index a259d85d9..000000000 --- a/src/plugins/swift-mesonlsp/meson.build +++ /dev/null @@ -1,11 +0,0 @@ -if get_option('plugin_swift_mesonlsp') - -plugin_swift_mesonlsp_resources = gnome.compile_resources( - 'swift-mesonlsp-resources', - 'swift-mesonlsp.gresource.xml', - c_name: 'gbp_swift_mesonlsp', -) - -plugins_sources += plugin_swift_mesonlsp_resources - -endif diff --git a/src/plugins/swift-mesonlsp/settings.json b/src/plugins/swift-mesonlsp/settings.json deleted file mode 100644 index ce74b8d09..000000000 --- a/src/plugins/swift-mesonlsp/settings.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "swift-mesonlsp" : { - } -} -- GitLab