Skip to content

Commit

Permalink
Add lsp-wgsl to lsp-client-packages
Browse files Browse the repository at this point in the history
  • Loading branch information
@yyoncho
yyoncho committed Mar 17, 2024
1 parent 3a5fec8 commit d3aaa9d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lsp-mode.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ As defined by the Language Server Protocol 3.16."
lsp-rust lsp-semgrep lsp-shader lsp-solargraph lsp-sorbet lsp-sourcekit
lsp-sonarlint lsp-tailwindcss lsp-tex lsp-terraform lsp-toml lsp-ttcn3
lsp-typeprof lsp-v lsp-vala lsp-verilog lsp-vetur lsp-volar lsp-vhdl
lsp-vimscript lsp-xml lsp-yaml lsp-ruby-lsp lsp-ruby-syntax-tree
lsp-vimscript lsp-wgsl lsp-xml lsp-yaml lsp-ruby-lsp lsp-ruby-syntax-tree
lsp-solidity lsp-sqls lsp-svelte lsp-steep lsp-tilt lsp-trunk lsp-zig lsp-jq)
"List of the clients to be automatically required."
:group 'lsp-mode
Expand Down

5 comments on commit d3aaa9d

@alanz
Copy link
Contributor

@alanz alanz commented on d3aaa9d Mar 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I get an error about lsp-ht not existing with this, after updating today.

@yyoncho
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, It should be from something else. Can you post the full error?

@alanz
Copy link
Contributor

@alanz alanz commented on d3aaa9d Mar 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The full error is

Debugger entered--Lisp error: (invalid-function lsp-ht)
  lsp-ht()
  #f(compiled-function () #<bytecode 0x19817eb41b214>)()
  funcall(#f(compiled-function () #<bytecode 0x19817eb41b214>))
  eval((funcall #'#f(compiled-function () #<bytecode 0x19817eb41b214>)))
  custom-initialize-reset(lsp-wgsl-custom-imports (funcall #'#f(compiled-function () #<bytecode 0x19817eb41b214>)))
  custom-declare-variable(lsp-wgsl-custom-imports (funcall #'#f(compiled-function () #<bytecode 0x19817eb41b214>)) "List of custom imports in the style of Bevy" :type ht :group lsp-wgsl :package-version (lsp-mode . "8.0.1"))
  byte-code("\300\301\302\303\304\305\306\307\310\311&\11\210\312\313\314\315\316DD\317\320\321\304\301\310\322&\11\210\312\323\314\315\324DD\325\320\321\304\301\310\326&\11\210\312\327\314..." [custom-declare-group lsp-wgsl nil "LSP support for wgsl, using wgsl-analyzer." :group lsp-mode :link (url-link "https://github.com/wgsl-analyzer/wgsl-analyzer") :package-version (lsp-mode . "8.0.1") custom-declare-variable lsp-wgsl-server-command funcall function #f(compiled-function () #<bytecode 0x183bb1497f812896>) "Command to run the wgsl-analyzer executable." :type boolean (lsp-mode . "8.0.1") lsp-wgsl-diagnostics-type-errors #f(compiled-function () #<bytecode 0x19800016fe5d4>) "Whether to show type errors in diagnostics or not." (lsp-mode . "8.0.1") lsp-wgsl-diagnostics-naga-parsing-errors #f(compiled-function () #<bytecode 0x19800016fe5d4>) "Whether to show naga parsing errors in diagnostics..." (lsp-mode . "8.0.1") lsp-wgsl-diagnostics-naga-validation-errors #f(compiled-function () #<bytecode 0x19800016fe5d4>) "Whether to show naga validation errors in diagnost..." (lsp-mode . "8.0.1") lsp-wgsl-diagnostics-naga-version #f(compiled-function () #<bytecode 0x198000f804854>) "Naga version to use." string (lsp-mode . "8.0.1") lsp-wgsl-inlayhints-enabled #f(compiled-function () #<bytecode 0x19800016fe5d4>) "Whether to enable inlay hints or not." (lsp-mode . "8.0.1") lsp-wgsl-inlayhints-typehints #f(compiled-function () #<bytecode 0x19800016fe5d4>) "Whether to enable type hints or not when using inl..." (lsp-mode . "8.0.1") lsp-wgsl-inlayhints-parameterhints #f(compiled-function () #<bytecode 0x19800016fe5d4>) "Whether to enable parameter hints or not when usin..." (lsp-mode . "8.0.1") lsp-wgsl-inlayhints-structlayout #f(compiled-function () #<bytecode 0x19800016fe5d4>) ...] 10)
  require(lsp-wgsl nil t)
  (if (featurep package) nil (require package nil t))
  (closure (tramp-ssh-controlmaster-options tramp-use-ssh-controlmaster-options view-inhibit-help-message lsp-help-mode-abbrev-table lsp-help-mode-syntax-table eldoc-documentation-default cl-struct-lsp--log-entry-tags cl-struct-lsp-session-tags cl-struct-lsp--workspace-tags cl-struct-lsp--registered-capability-tags lsp-mode-menu cl-struct-lsp--folding-range-tags cl-struct-lsp-watch-tags cl-struct-lsp--client-tags lsp--log-lines company-minimum-prefix-length dap-ui-menu-items t) (package) (if (featurep package) nil (require package nil t)))(lsp-wgsl)
  mapc((closure (tramp-ssh-controlmaster-options tramp-use-ssh-controlmaster-options view-inhibit-help-message lsp-help-mode-abbrev-table lsp-help-mode-syntax-table eldoc-documentation-default cl-struct-lsp--log-entry-tags cl-struct-lsp-session-tags cl-struct-lsp--workspace-tags cl-struct-lsp--registered-capability-tags lsp-mode-menu cl-struct-lsp--folding-range-tags cl-struct-lsp-watch-tags cl-struct-lsp--client-tags lsp--log-lines company-minimum-prefix-length dap-ui-menu-items t) (package) (if (featurep package) nil (require package nil t))) (ccls lsp-actionscript lsp-ada lsp-angular lsp-ansible lsp-autotools lsp-awk lsp-asm lsp-astro lsp-bash lsp-beancount lsp-bufls lsp-clangd lsp-clojure lsp-cmake lsp-cobol lsp-credo lsp-crystal lsp-csharp lsp-css lsp-cucumber lsp-cypher lsp-d lsp-dart lsp-dhall lsp-docker lsp-dockerfile lsp-elm lsp-elixir lsp-emmet lsp-erlang lsp-eslint lsp-fortran lsp-fsharp lsp-gdscript lsp-go lsp-golangci-lint lsp-gleam lsp-glsl lsp-graphql lsp-hack lsp-grammarly lsp-groovy lsp-haskell lsp-haxe lsp-idris lsp-java lsp-javascript lsp-json lsp-kotlin ...))
  seq-do((closure (tramp-ssh-controlmaster-options tramp-use-ssh-controlmaster-options view-inhibit-help-message lsp-help-mode-abbrev-table lsp-help-mode-syntax-table eldoc-documentation-default cl-struct-lsp--log-entry-tags cl-struct-lsp-session-tags cl-struct-lsp--workspace-tags cl-struct-lsp--registered-capability-tags lsp-mode-menu cl-struct-lsp--folding-range-tags cl-struct-lsp-watch-tags cl-struct-lsp--client-tags lsp--log-lines company-minimum-prefix-length dap-ui-menu-items t) (package) (if (featurep package) nil (require package nil t))) (ccls lsp-actionscript lsp-ada lsp-angular lsp-ansible lsp-autotools lsp-awk lsp-asm lsp-astro lsp-bash lsp-beancount lsp-bufls lsp-clangd lsp-clojure lsp-cmake lsp-cobol lsp-credo lsp-crystal lsp-csharp lsp-css lsp-cucumber lsp-cypher lsp-d lsp-dart lsp-dhall lsp-docker lsp-dockerfile lsp-elm lsp-elixir lsp-emmet lsp-erlang lsp-eslint lsp-fortran lsp-fsharp lsp-gdscript lsp-go lsp-golangci-lint lsp-gleam lsp-glsl lsp-graphql lsp-hack lsp-grammarly lsp-groovy lsp-haskell lsp-haxe lsp-idris lsp-java lsp-javascript lsp-json lsp-kotlin ...))
  (progn (seq-do #'(lambda (package) (if (featurep package) nil (require package nil t))) lsp-client-packages) (setq lsp--client-packages-required t))
  (if (and lsp-auto-configure (not lsp--client-packages-required)) (progn (seq-do #'(lambda (package) (if (featurep package) nil (require package nil t))) lsp-client-packages) (setq lsp--client-packages-required t)))
  lsp--require-packages()
  lsp()
  (progn (lsp))
  (if (and lsp-mode (not lsp--buffer-workspaces)) (progn (lsp)))
  (let ((last-message (current-message))) (setq lsp-mode (cond ((eq arg 'toggle) (not lsp-mode)) ((and (numberp arg) (< arg 1)) nil) (t t))) (if (boundp 'local-minor-modes) (progn (setq local-minor-modes (delq 'lsp-mode local-minor-modes)) (if lsp-mode (progn (setq local-minor-modes (cons 'lsp-mode local-minor-modes)))))) (if (and lsp-mode (not lsp--buffer-workspaces)) (progn (lsp))) (run-hooks 'lsp-mode-hook (if lsp-mode 'lsp-mode-on-hook 'lsp-mode-off-hook)) (if (called-interactively-p 'any) (progn nil (if (and (current-message) (not (equal last-message (current-message)))) nil (let ((local " in current buffer")) (message "%s %sabled%s" "Lsp mode" (if lsp-mode "en" "dis") local))))))
  lsp-mode(toggle)
  funcall-interactively(lsp-mode toggle)
  command-execute(lsp-mode record)
  execute-extended-command(nil "lsp-mode" nil)
  funcall-interactively(execute-extended-command nil "lsp-mode" nil)
  command-execute(execute-extended-command)

Context is opening a file in rust-analyzer checked out at tag 2024-03-11

If I undo this commit the error does not occur.

@yyoncho
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

b9b9d38 maybe this fix will make it go away.

@alanz
Copy link
Contributor

@alanz alanz commented on d3aaa9d Mar 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it does, for me. Thanks for the quick action.

Please sign in to comment.