diff --git a/.gitignore b/.gitignore index b8c8768..8957de9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ eshell/history tramp url/* transient/* +.lsp-session-* diff --git a/10themes.el b/10themes.el index 3e0e23b..a716b6b 100644 --- a/10themes.el +++ b/10themes.el @@ -20,7 +20,7 @@ (if (display-graphic-p) (progn (sml/apply-theme 'respectful) - (enable-theme 'base16-zenburn)) + (enable-theme 'base16-mocha)) (progn (enable-theme 'manoj-dark))) diff --git a/20web.el b/20web.el index 70d7527..d76f541 100644 --- a/20web.el +++ b/20web.el @@ -2,13 +2,13 @@ (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode)) (add-to-list 'auto-mode-alist '("\\.json\\'" . js2-mode)) -;; Tern is used for completion -(add-hook 'js2-mode-hook 'tern-mode) +;; Language Server Protocol is used for completion +(add-hook 'js2-mode-hook 'lsp) (defun activate-js2-mode () "Company list override." (add-to-list (make-local-variable 'company-backends) - '(company-tern company-yasnippet))) + '(company-yasnippet company-lsp))) (add-hook 'js2-mode-hook 'activate-js2-mode) diff --git a/init.el b/init.el index 084716b..ce0898a 100644 --- a/init.el +++ b/init.el @@ -40,6 +40,8 @@ flycheck ;; Compilation framework visual-regexp ;; Regexp replacement with preview in ;; current buffer. + + ;; Language server protocol lsp-mode company-lsp lsp-ui @@ -77,8 +79,6 @@ web-mode company-web js2-mode - tern - company-tern ;; Clojure clojure-mode