Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@kassick
kassick committed Aug 20, 2024
2 parents 11c9cf0 + 12befaa commit 3120ce6
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 47 deletions.
78 changes: 38 additions & 40 deletions clients/lsp-magik.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
:tag "Lsp Magik"
:package-version '(lsp-mode . "9.0.0"))

(defcustom lsp-magik-version "0.10.0"
(defcustom lsp-magik-version "0.10.1"
"Version of LSP server."
:type `string
:group `lsp-magik
Expand All @@ -58,77 +58,89 @@
:group `lsp-magik
:package-version '(lsp-mode . "9.0.0"))

(defcustom lsp-magik-java-home nil
(lsp-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"))
:package-version '(lsp-mode . "9.0.0")
:lsp-path "magik.javaHome")

(defcustom lsp-magik-product-dirs []
(lsp-defcustom lsp-magik-product-dirs []
"Paths to (compiled, containing a libs/ directory) products."
:type `lsp-string-vector
:group `lsp-magik
:package-version '(lsp-mode . "9.0.0"))
:package-version '(lsp-mode . "9.0.1")
:lsp-path "magik.productDirs")

(defcustom lsp-magik-lint-override-config-file nil
(lsp-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"))
:package-version '(lsp-mode . "9.0.0")
:lsp-path "magik.lint.overrideConfigFile")

(defcustom lsp-magik-typing-type-database-paths []
(lsp-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"))
:package-version '(lsp-mode . "9.0.0")
:lsp-path "magik.typing.typeDatabasePaths")

(defcustom lsp-magik-typing-show-typing-inlay-hints nil
(lsp-defcustom lsp-magik-typing-show-typing-inlay-hints nil
"Show typing inlay hints."
:type `boolean
:group `lsp-magik
:package-version '(lsp-mode . "9.0.0"))
:package-version '(lsp-mode . "9.0.1")
:lsp-path "magik.typing.showTypingInlayHints")

(defcustom lsp-magik-typing-show-argument-inlay-hints nil
(lsp-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"))
:package-version '(lsp-mode . "9.0.1")
:lsp-path "magik.typing.showArgumentInlayHints")

(defcustom lsp-magik-typing-enable-checks nil
(lsp-defcustom lsp-magik-typing-enable-checks nil
"Enable typing checks."
:type `boolean
:group `lsp-magik
:package-version '(lsp-mode . "9.0.0"))
:package-version '(lsp-mode . "9.0.0")
:lsp-path "magik.typing.enableChecks")

(defcustom lsp-magik-typing-index-global-usages t
(lsp-defcustom lsp-magik-typing-index-global-usages t
"Enable indexing of usages of globals by methods."
:type `boolean
:group `lsp-magik
:package-version '(lsp-mode . "9.0.0"))
:package-version '(lsp-mode . "9.0.1")
:lsp-path "magik.typing.indexGlobalUsages")

(defcustom lsp-magik-typing-index-method-usages nil
(lsp-defcustom lsp-magik-typing-index-method-usages nil
"Enable indexing of usages of methods by methods."
:type `boolean
:group `lsp-magik
:package-version '(lsp-mode . "9.0.0"))
:package-version '(lsp-mode . "9.0.1")
:lsp-path "magik.typing.indexMethodUsages")

(defcustom lsp-magik-typing-index-slot-usages t
(lsp-defcustom lsp-magik-typing-index-slot-usages t
"Enable indexing of usages of slots by methods."
:type `boolean
:group `lsp-magik
:package-version '(lsp-mode . "9.0.0"))
:package-version '(lsp-mode . "9.0.1")
:lsp-path "magik.typing.indexSlotUsages")

(defcustom lsp-magik-typing-index-condition-usages t
(lsp-defcustom lsp-magik-typing-index-condition-usages t
"Enable indexing of usages of conditions by methods."
:type `boolean
:group `lsp-magik
:package-version '(lsp-mode . "9.0.0"))
:package-version '(lsp-mode . "9.0.1")
:lsp-path "magik.typing.indexConditionUsages")

(defcustom lsp-magik-typing-cache-indexed-definitions-method-usages t
(lsp-defcustom lsp-magik-typing-cache-indexed-definitions-method-usages t
"Store and load the indexed definitions in the workspace folders."
:type `boolean
:group `lsp-magik
:package-version '(lsp-mode . "9.0.0"))
:package-version '(lsp-mode . "9.0.1")
:lsp-path "magik.typing.cacheIndexedDefinitions")

(defcustom lsp-magik-java-path (lambda ()
(cond ((eq system-type 'windows-nt)
Expand All @@ -138,7 +150,7 @@
"Path to Java Runtime, Java 11 minimum."
:type 'string
:group `lsp-magik
:package-version '(lsp-mode . "9.0.0"))
:package-version '(lsp-mode . "9.0.1"))

(lsp-register-client
(make-lsp-client
Expand All @@ -157,20 +169,6 @@
(lsp--set-configuration (lsp-configuration-section "magik"))))
:server-id 'magik))

(lsp-register-custom-settings
`(("magik.javaHome" lsp-magik-java-home)
("magik.productDirs" lsp-magik-product-dirs)
("magik.lint.overrideConfigFile" lsp-magik-lint-override-config-file)
("magik.typing.typeDatabasePaths" lsp-magik-typing-type-database-paths)
("magik.typing.showTypingInlayHints" lsp-magik-typing-show-typing-inlay-hints)
("magik.typing.showArgumentInlayHints" lsp-magik-typing-show-argument-inlay-hints)
("magik.typing.enableChecks" lsp-magik-typing-enable-checks)
("magik.typing.indexGlobalUsages" lsp-magik-typing-index-global-usages)
("magik.typing.indexMethodUsages" lsp-magik-typing-index-method-usages)
("magik.typing.indexSlotUsages" lsp-magik-typing-index-slot-usages)
("magik.typing.indexConditionUsages" lsp-magik-typing-index-condition-usages)
("magik.typing.cacheIndexedDefinitions" lsp-magik-typing-cache-indexed-definitions)))

(lsp-consistency-check lsp-magik)

(provide 'lsp-magik)
Expand Down
12 changes: 11 additions & 1 deletion clients/lsp-rust.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1761,7 +1761,17 @@ https://github.com/rust-lang/rust-analyzer/blob/master/docs/dev/lsp-extensions.m
:semantic-tokens-faces-overrides `( :discard-default-modifiers t
:modifiers ,(lsp-rust-analyzer--semantic-modifiers))
:server-id 'rust-analyzer
:custom-capabilities `((experimental . ((snippetTextEdit . ,(and lsp-enable-snippet (fboundp 'yas-minor-mode))))))
:custom-capabilities `((experimental .
((snippetTextEdit . ,(and lsp-enable-snippet (fboundp 'yas-minor-mode)))
(commands . ((commands .
[
"rust-analyzer.runSingle"
"rust-analyzer.debugSingle"
"rust-analyzer.showReferences"
;; "rust-analyzer.gotoLocation"
"rust-analyzer.triggerParameterHints"
;; "rust-analyzer.rename"
]))))))
:download-server-fn (lambda (_client callback error-callback _update?)
(lsp-package-ensure 'rust-analyzer callback error-callback))))

Expand Down
17 changes: 11 additions & 6 deletions clients/lsp-yaml.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,16 @@ Limited for performance reasons."
(lsp-package-ensure 'yaml-language-server
callback error-callback))))

(defconst lsp-yaml--built-in-kubernetes-schema
'((name . "Kubernetes")
(description . "Built-in kubernetes manifest schema definition")
(url . "kubernetes")
(fileMatch . ["*-k8s.yaml" "*-k8s.yml"])))
(defcustom lsp-yaml-schema-extensions '(((name . "Kubernetes v1.30.3")
(description . "Kubernetes v1.30.3 manifest schema definition")
(url . "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.30.3-standalone-strict/all.json")
(fileMatch . ["*-k8s.yaml" "*-k8s.yml"])))
"User defined schemas that extend default schema store.
Used in `lsp-yaml--get-supported-schemas' to supplement schemas provided by
`lsp-yaml-schema-store-uri'."
:type 'list
:group 'lsp-yaml
:package-version '(lsp-mode . "9.0.1"))

(defun lsp-yaml-download-schema-store-db (&optional force-downloading)
"Download remote schema store at `lsp-yaml-schema-store-uri' into local cache.
Expand All @@ -194,7 +199,7 @@ Set FORCE-DOWNLOADING to non-nil to force re-download the database."
(lsp-yaml-download-schema-store-db)
(setq lsp-yaml--schema-store-schemas-alist
(alist-get 'schemas (json-read-file lsp-yaml-schema-store-local-db))))
(seq-concatenate 'list (list lsp-yaml--built-in-kubernetes-schema) lsp-yaml--schema-store-schemas-alist))
(seq-concatenate 'list lsp-yaml-schema-extensions lsp-yaml--schema-store-schemas-alist))

(defun lsp-yaml-set-buffer-schema (uri-string)
"Set yaml schema for the current buffer to URI-STRING."
Expand Down

0 comments on commit 3120ce6

Please sign in to comment.