From d046d35aeb13e6456534c1739be61243e3a865f6 Mon Sep 17 00:00:00 2001 From: "M. Yas. Davoodeh" Date: Thu, 19 Mar 2020 13:42:06 +0330 Subject: [PATCH 1/4] Added +lsp to Tex-Mode. --- modules/lang/latex/README.org | 1 + modules/lang/latex/config.el | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/modules/lang/latex/README.org b/modules/lang/latex/README.org index 0d208c5c7..0fc3bd8a3 100644 --- a/modules/lang/latex/README.org +++ b/modules/lang/latex/README.org @@ -30,6 +30,7 @@ Provide a helping hand when working with LaTeX documents. ** Module Flags + =+latexmk= Use LatexMk instead of LaTeX to compile documents. + =+cdlatex= Enable [[https://github.com/cdominik/cdlatex][cdlatex]] for fast math insertion. ++ =+lsp= Start LSP automatically in `tex-mode-hook`. ** Plugins + [[http://www.gnu.org/software/auctex/][auctex]] diff --git a/modules/lang/latex/config.el b/modules/lang/latex/config.el index a73d5bb5a..45f3da203 100644 --- a/modules/lang/latex/config.el +++ b/modules/lang/latex/config.el @@ -180,6 +180,12 @@ If no viewers are found, `latex-preview-pane' is used.") :init (add-to-list '+latex--company-backends #'+latex-symbols-company-backend nil #'eq)) +(after! tex-mode + (when (featurep! +lsp) + (add-hook 'tex-mode-local-vars-hook #'lsp!) + (add-hook 'latex-mode-local-vars-hook #'lsp!) + (after! yatex + (add-hook 'yatex-mode-local-vars-hook #'lsp!)))) ;; bibtex + reftex (load! "+ref") From 6b68dcceee7f9d43ca72d98589aef51a482d0a96 Mon Sep 17 00:00:00 2001 From: "M. Yas. Davoodeh" Date: Thu, 19 Mar 2020 19:19:35 +0330 Subject: [PATCH 2/4] Minor fixes in docs and check for :lang lsp. --- docs/modules.org | 2 +- modules/lang/latex/README.org | 3 ++- modules/lang/latex/config.el | 6 ++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/modules.org b/docs/modules.org index 9eb0b8616..25ed94402 100644 --- a/docs/modules.org +++ b/docs/modules.org @@ -114,7 +114,7 @@ Modules that bring support for a language or group of languages to Emacs. + [[file:../modules/lang/javascript/README.org][javascript]] =+lsp= - JavaScript, TypeScript, and CoffeeScript support + julia - TODO + kotlin =+lsp+= - TODO -+ [[file:../modules/lang/latex/README.org][latex]] =+latexmk +cdlatex= - TODO ++ [[file:../modules/lang/latex/README.org][latex]] =+latexmk +cdlatex= =+lsp= - TODO + lean - TODO + [[file:../modules/lang/ledger/README.org][ledger]] - TODO + lua =+moonscript= - TODO diff --git a/modules/lang/latex/README.org b/modules/lang/latex/README.org index 0fc3bd8a3..9b6fe2e4b 100644 --- a/modules/lang/latex/README.org +++ b/modules/lang/latex/README.org @@ -30,7 +30,8 @@ Provide a helping hand when working with LaTeX documents. ** Module Flags + =+latexmk= Use LatexMk instead of LaTeX to compile documents. + =+cdlatex= Enable [[https://github.com/cdominik/cdlatex][cdlatex]] for fast math insertion. -+ =+lsp= Start LSP automatically in `tex-mode-hook`. ++ =+lsp= Start LSP automatically in `tex-mode-hook`. This + requires the =:tools lsp= module. ** Plugins + [[http://www.gnu.org/software/auctex/][auctex]] diff --git a/modules/lang/latex/config.el b/modules/lang/latex/config.el index 45f3da203..57d64fe60 100644 --- a/modules/lang/latex/config.el +++ b/modules/lang/latex/config.el @@ -181,11 +181,9 @@ If no viewers are found, `latex-preview-pane' is used.") (add-to-list '+latex--company-backends #'+latex-symbols-company-backend nil #'eq)) (after! tex-mode - (when (featurep! +lsp) + (when (and (featurep! +lsp) (featurep! :tools lsp)) (add-hook 'tex-mode-local-vars-hook #'lsp!) - (add-hook 'latex-mode-local-vars-hook #'lsp!) - (after! yatex - (add-hook 'yatex-mode-local-vars-hook #'lsp!)))) + (add-hook 'latex-mode-local-vars-hook #'lsp!))) ;; bibtex + reftex (load! "+ref") From 76ae9e687aede0a20927aec677313ac1b3fb6603 Mon Sep 17 00:00:00 2001 From: "M. Yas. Davoodeh" Date: Fri, 27 Mar 2020 16:25:33 +0430 Subject: [PATCH 3/4] Move hooks to `(after! tex)` block --- modules/lang/latex/config.el | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/lang/latex/config.el b/modules/lang/latex/config.el index 57d64fe60..081edf29b 100644 --- a/modules/lang/latex/config.el +++ b/modules/lang/latex/config.el @@ -74,7 +74,11 @@ If no viewers are found, `latex-preview-pane' is used.") (sp-local-pair modes open nil :actions :rem)) ;; And tweak these so that users can decide whether they want use latex ;; quotes or not, via `+latex-enable-plain-double-quotes' - (sp-local-pair modes "``" nil :unless '(:add sp-in-math-p))))) + (sp-local-pair modes "``" nil :unless '(:add sp-in-math-p)))) + ;; Hook lsp if enabled + (when (and (featurep! +lsp) (featurep! :tools lsp)) + (add-hook 'tex-mode-local-vars-hook #'lsp!) + (add-hook 'latex-mode-local-vars-hook #'lsp!))) (after! latex @@ -180,10 +184,5 @@ If no viewers are found, `latex-preview-pane' is used.") :init (add-to-list '+latex--company-backends #'+latex-symbols-company-backend nil #'eq)) -(after! tex-mode - (when (and (featurep! +lsp) (featurep! :tools lsp)) - (add-hook 'tex-mode-local-vars-hook #'lsp!) - (add-hook 'latex-mode-local-vars-hook #'lsp!))) - ;; bibtex + reftex (load! "+ref") From e4b570c9aeb15473e56d6c8351108706fdaee366 Mon Sep 17 00:00:00 2001 From: "M. Yas. Davoodeh" Date: Sun, 26 Apr 2020 10:33:10 +0430 Subject: [PATCH 4/4] Fix tex-lsp related commented issues --- docs/modules.org | 2 +- modules/lang/latex/README.org | 4 ++-- modules/lang/latex/config.el | 8 +++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/modules.org b/docs/modules.org index 25ed94402..e062d5113 100644 --- a/docs/modules.org +++ b/docs/modules.org @@ -114,7 +114,7 @@ Modules that bring support for a language or group of languages to Emacs. + [[file:../modules/lang/javascript/README.org][javascript]] =+lsp= - JavaScript, TypeScript, and CoffeeScript support + julia - TODO + kotlin =+lsp+= - TODO -+ [[file:../modules/lang/latex/README.org][latex]] =+latexmk +cdlatex= =+lsp= - TODO ++ [[file:../modules/lang/latex/README.org][latex]] =+latexmk +cdlatex +lsp= - TODO + lean - TODO + [[file:../modules/lang/ledger/README.org][ledger]] - TODO + lua =+moonscript= - TODO diff --git a/modules/lang/latex/README.org b/modules/lang/latex/README.org index 9b6fe2e4b..8a52cea48 100644 --- a/modules/lang/latex/README.org +++ b/modules/lang/latex/README.org @@ -30,8 +30,8 @@ Provide a helping hand when working with LaTeX documents. ** Module Flags + =+latexmk= Use LatexMk instead of LaTeX to compile documents. + =+cdlatex= Enable [[https://github.com/cdominik/cdlatex][cdlatex]] for fast math insertion. -+ =+lsp= Start LSP automatically in `tex-mode-hook`. This - requires the =:tools lsp= module. ++ =+lsp= Start LSP automatically in `tex-mode-hook`. This requires the =:tools + lsp= module. Supported servers are `digestif` and `TexLab`. ** Plugins + [[http://www.gnu.org/software/auctex/][auctex]] diff --git a/modules/lang/latex/config.el b/modules/lang/latex/config.el index 081edf29b..19a12c7b4 100644 --- a/modules/lang/latex/config.el +++ b/modules/lang/latex/config.el @@ -76,9 +76,10 @@ If no viewers are found, `latex-preview-pane' is used.") ;; quotes or not, via `+latex-enable-plain-double-quotes' (sp-local-pair modes "``" nil :unless '(:add sp-in-math-p)))) ;; Hook lsp if enabled - (when (and (featurep! +lsp) (featurep! :tools lsp)) - (add-hook 'tex-mode-local-vars-hook #'lsp!) - (add-hook 'latex-mode-local-vars-hook #'lsp!))) + (when (featurep! +lsp) + (add-hook! '(tex-mode-local-vars-hook + latex-mode-local-vars-hook) + #'lsp!))) (after! latex @@ -178,6 +179,7 @@ If no viewers are found, `latex-preview-pane' is used.") (add-to-list '+latex--company-backends #'company-auctex-environments nil #'eq) (add-to-list '+latex--company-backends #'company-auctex-macros nil #'eq)) + (use-package! company-math :when (featurep! :completion company) :defer t