Skip to content

Commit

Permalink
Revert changes to eglot
Browse files Browse the repository at this point in the history
InitializationOptions aren't handled this way. An example of handling
ccls init options is provided on joaotavora/eglot#545, hoping that a fix
gets merged upstream instead of having to handle ccls specifics in Doom
only
  • Loading branch information
gagbo committed Oct 6, 2020
1 parent 081b648 commit a788241
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions modules/lang/cc/config.el
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,7 @@ If rtags or rdm aren't available, fail silently instead of throwing a breaking e
;; IS-MAC custom configuration
(when IS-MAC
(add-to-list 'eglot-workspace-configuration
`((:ccls . ((:index . ,(list :trackDependency 1 :threads (max 1 (/ (string-to-number (shell-command-to-string "nproc")) 2))))
(:clang . ,(list :extraArgs ["-isystem/Library/Developer/CommandLineTools/usr/include/c++/v1"
`((:ccls . ((:clang . ,(list :extraArgs ["-isystem/Library/Developer/CommandLineTools/usr/include/c++/v1"
"-isystem/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include"
"-isystem/usr/local/include"]
:resourceDir (cdr (doom-call-process "clang" "-print-resource-dir"))))))))))))
Expand Down

0 comments on commit a788241

Please sign in to comment.