From 4dffd058da63afa54d5ddff90b6040785bf584e9 Mon Sep 17 00:00:00 2001 From: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com> Date: Thu, 11 Jul 2024 12:33:52 +0200 Subject: [PATCH 1/2] [lsp-magik] Add extra settings, re-order and remove obsolete setting --- clients/lsp-magik.el | 45 ++++++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/clients/lsp-magik.el b/clients/lsp-magik.el index 3e5c682159..af6f018ff7 100644 --- a/clients/lsp-magik.el +++ b/clients/lsp-magik.el @@ -59,7 +59,7 @@ :package-version '(lsp-mode . "9.0.0")) (defcustom lsp-magik-java-home nil - "Path to Java Runtime, Java 11 minimum." + "Path to Java Runtime, Java 17 minimum." :type `string :group `lsp-magik :package-version '(lsp-mode . "9.0.0")) @@ -70,21 +70,45 @@ :group `lsp-magik :package-version '(lsp-mode . "9.0.0")) +(defcustom lsp-magik-libs-dirs [] + "Paths to libs dirs of Smallworld products." + :type `lsp-string-vector + :group `lsp-magik + :package-version '(lsp-mode . "9.0.0")) + +(defcustom lsp-magik-lint-override-config-file nil + "Override path to magiklintrc.properties." + :type 'string + :group `lsp-magik + :package-version '(lsp-mode . "9.0.0")) + (defcustom lsp-magik-typing-type-database-paths [] "Paths to type databases." :type `lsp-string-vector :group `lsp-magik :package-version '(lsp-mode . "9.0.0")) +(defcustom lsp-magik-typing-show-atom-inlay-hints nil + "Show atom type inlay hints." + :type `boolean + :group `lsp-magik + :package-version '(lsp-mode . "9.0.0")) + +(defcustom lsp-magik-typing-show-argument-inlay-hints nil + "Show (certain) argument name inlay hints." + :type `boolean + :group `lsp-magik + :package-version '(lsp-mode . "9.0.0")) + (defcustom lsp-magik-typing-enable-checks nil "Enable typing checks." :type `boolean :group `lsp-magik :package-version '(lsp-mode . "9.0.0")) -(defcustom lsp-magik-trace-server "off" - "Traces the communication between VS Code and the Magik language server." - :type `(choice (const "off") (const "message") (const "verbose")) +(defcustom lsp-magik-typing-index-usages t + "Enable indexing of usages of globals/methods/slots/conditions by methods." + :type `boolean :group `lsp-magik :package-version '(lsp-mode . "9.0.0")) @@ -98,12 +122,6 @@ :group `lsp-magik :package-version '(lsp-mode . "9.0.0")) -(defcustom lsp-magik-lint-override-config-file nil - "Override path to magiklintrc.properties." - :type 'string - :group `lsp-magik - :package-version '(lsp-mode . "9.0.0")) - (lsp-register-client (make-lsp-client :download-server-fn (lambda (_client callback error-callback _update?) @@ -124,10 +142,13 @@ (lsp-register-custom-settings `(("magik.javaHome" lsp-magik-java-home) ("magik.smallworldGis" lsp-magik-smallworld-gis) + ("magik.libsDirs" lsp-magik-libs-dirs) + ("magik.lint.overrideConfigFile" lsp-magik-lint-override-config-file) ("magik.typing.typeDatabasePaths" lsp-magik-typing-type-database-paths) + ("magik.typing.showAtomInlayHints" lsp-magik-typing-show-atom-inlay-hints) + ("magik.typing.showArgumentInlayHints" lsp-magik-typing-show-argument-inlay-hints) ("magik.typing.enableChecks" lsp-magik-typing-enable-checks) - ("magik.trace.server" lsp-magik-trace-server) - ("magik.lint.overrideConfigFile" lsp-magik-lint-override-config-file))) + ("magik.typing.indexUsages" lsp-magik-typing-index-usages))) (lsp-consistency-check lsp-magik) From 6bcd399db90cbed9cdded24a67e38d36f8070b58 Mon Sep 17 00:00:00 2001 From: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com> Date: Thu, 11 Jul 2024 12:43:49 +0200 Subject: [PATCH 2/2] Update lsp-magik.el --- clients/lsp-magik.el | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/clients/lsp-magik.el b/clients/lsp-magik.el index af6f018ff7..77c9c7e985 100644 --- a/clients/lsp-magik.el +++ b/clients/lsp-magik.el @@ -58,12 +58,6 @@ :group `lsp-magik :package-version '(lsp-mode . "9.0.0")) -(defcustom lsp-magik-java-home nil - "Path to Java Runtime, Java 17 minimum." - :type `string - :group `lsp-magik - :package-version '(lsp-mode . "9.0.0")) - (defcustom lsp-magik-smallworld-gis nil "Path to Smallworld Core." :type `string @@ -117,7 +111,7 @@ (or (lsp-resolve-value (executable-find (expand-file-name "bin/java" (getenv "JAVA_HOME")))) (lsp-resolve-value (executable-find "java")))) (t "java"))) - "Path of the java executable." + "Path to Java Runtime, Java 11 minimum." :type 'string :group `lsp-magik :package-version '(lsp-mode . "9.0.0")) @@ -140,8 +134,7 @@ :server-id 'magik)) (lsp-register-custom-settings - `(("magik.javaHome" lsp-magik-java-home) - ("magik.smallworldGis" lsp-magik-smallworld-gis) + `(("magik.smallworldGis" lsp-magik-smallworld-gis) ("magik.libsDirs" lsp-magik-libs-dirs) ("magik.lint.overrideConfigFile" lsp-magik-lint-override-config-file) ("magik.typing.typeDatabasePaths" lsp-magik-typing-type-database-paths)