Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add multi-server feature #85

Merged
merged 23 commits into from
Mar 18, 2024

Conversation

sfavazza
Copy link
Contributor

@sfavazza sfavazza commented Jan 6, 2024

High level summary of changes:

  • add support for multiple language-servers (LS)
  • share path mappings among LS
  • use variables instead of explicit strings as JSON keys
  • improve concerned functions documentation
  • update README
  • add few files for quick manual testing

sfavazza and others added 22 commits December 9, 2023 13:58
- replace all <'key> instances with their dedicated 'defconst'
- distinguish between 'server top-node and 'server key
…t-server-image-name' functions, improve error message
…'lsp-docker-get-server-image-name' functions, improve error message"
@factyy
Copy link
Collaborator

factyy commented Jan 10, 2024

@sfavazza , I will take a look in a few days, a bit busy right now :)

@sfavazza
Copy link
Contributor Author

The feature is there it won't go anywhere 😊

README.org Outdated
@@ -143,6 +147,7 @@
It is structured in the following way:

#+begin_src yaml
# signle server configuration
Copy link
Collaborator

Choose a reason for hiding this comment

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

A small typo

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Addressed in b23d606

@factyy
Copy link
Collaborator

factyy commented Feb 1, 2024

@sfavazza , I finally managed to get a bit of time to review all changes. First of all I have to say that you've done a wonderful work with not only functional changes but refactoring as well!

As for the changes everything looks good, I think you can merge this PR (but fix this small typo first though :)

@yyoncho , sorry to bother, could you please take a look at these changes? I don't feel comfortable reviewing this amount while not being a elisp guru myself :)

@sfavazza
Copy link
Contributor Author

@factyy thank you for dedicating the time to this review, really appreciated. Please observe that I don't have the necessary rights to merge, so let's wait for the feedback of @yyoncho and then you guys can merge (if everything is proper).

Unless you already did it, I strongly suggest to try these changes also on your machine via the simple setup suggested in the test/README.md file.

@@ -300,63 +336,67 @@ the docker container to run the language server."
(defun lsp-docker-get-config-from-lsp ()
"Get the LSP configuration based on a project-local configuration (using lsp-mode)"
(let ((project-config-file-path (lsp-docker--find-project-config-file-from-lsp)))
(or (lsp-docker-get-config-from-project-config-file project-config-file-path)
(ht-copy lsp-docker-persistent-default-config))))
(if project-config-file-path
Copy link
Collaborator

Choose a reason for hiding this comment

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

@sfavazza , I noticed a small issue: what if there is no config file? We have to use the default one, but here we are getting an error instead

@factyy
Copy link
Collaborator

factyy commented Mar 18, 2024

Managed to test it briefly, everything looks fine, thanks @sfavazza

@factyy factyy merged commit e4401a4 into emacs-lsp:master Mar 18, 2024
11 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants