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.

Sign up for GitHub

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

Nomanifest #37

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Nomanifest #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
356d1e7
Add `julia-ts-mode` support
chriselrod Jan 10, 2023
b52888c
Fix function shouldn't be wrapped in a list
chriselrod Jan 10, 2023
b30ec07
add Manifest.toml to .gitignore
chriselrod Jan 10, 2023
8f54d2b
Instantiate instead of resolve
chriselrod Jan 15, 2023
43f6e39
Switch back to resolve.
chriselrod Jan 15, 2023
0873fbc
Remove `Pkg.resolve()`
chriselrod Jan 17, 2023
92dbd9e
Add JuliaFormatter
chriselrod Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Manifest.toml
250 changes: 0 additions & 250 deletions Manifest.toml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[deps]
JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
LanguageServer = "2b0e0bc5-e4fd-59b4-8912-456d1b03d8d7"
SymbolServer = "cf896787-08d5-524d-9de7-132aaa0cb996"

Expand Down
4 changes: 2 additions & 2 deletions eglot-jl.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
(defconst eglot-jl-base (file-name-directory load-file-name))

(defgroup eglot-jl nil
"Interaction with LanguageServer.jl LSP server via eglot"
"Interaction with LanguageServer.jl LSP server via eglot."
:prefix "eglot-jl-"
:group 'applications)

Expand Down Expand Up @@ -88,7 +88,7 @@ Otherwise returns nil"
(add-hook 'project-find-functions #'eglot-jl--project-try)
(add-to-list 'eglot-server-programs
;; function instead of strings to find project dir at runtime
'(julia-mode . eglot-jl--ls-invocation)))
'((julia-mode julia-ts-mode) . eglot-jl--ls-invocation)))

(provide 'eglot-jl)
;;; eglot-jl.el ends here
13 changes: 0 additions & 13 deletions eglot-jl.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,6 @@
# being available on LOAD_PATH
import Pkg

# Resolving the environment is necessary for cases where the shipped
# Manifest.toml is not compatible with the Julia version.
for _ in 1:2
try
Pkg.resolve(io=stderr)
@info "Environment successfully resolved"
break
catch err
# Downgrading from 1.6 to 1.5 sometimes causes temporary errors
@warn "Error while resolving the environment; retrying..." err
end
end

# In julia 1.4 this operation takes under a second. This can be
# crushingly slow in older versions of julia though.
Pkg.instantiate()
Expand Down