Updating Doom Emacs.

.emacs.d/modules/lang/ess/README.org

@@ -4,9 +4,16 @@ This module adds support for various statistics languages, including R, S-Plus,
 SAS, Julia and Stata.
 
 * Table of Contents :TOC:
-- [[Appendix][Appendix]]
-  - [[Keybindings][Keybindings]]
+- [[#prequisites][Prequisites]]
+- [[#appendix][Appendix]]
+  - [[#keybindings][Keybindings]]
 
+* Prequisites
+This module has several optional dependencies:
+
++ [[https://github.com/jimhester/lintr][lintr]]: Enables R linting.
++ [[https://github.com/REditorSupport/languageserver][languageserver]]: Enables LSP support in an R buffer (with =+lsp= flag).
+ 
 * Appendix
 ** Keybindings
 *** :map ess-doc-map

.emacs.d/modules/lang/ess/config.el

@@ -10,17 +10,19 @@
 (use-package! ess
   :commands stata SAS
   :init
-  (setq ess-smart-S-assign-key nil)
   (unless (featurep! :lang julia)
     (add-to-list 'auto-mode-alist '("\\.jl\\'" . ess-julia-mode)))
   :config
   (setq ess-offset-continued 'straight
-        ess-expression-offset 2
-        ess-use-flymake (not (featurep! :tools flycheck))
+        ess-use-flymake (not (featurep! :checkers syntax))
         ess-nuke-trailing-whitespace-p t
-        ess-default-style 'DEFAULT
+        ess-style 'DEFAULT
         ess-history-directory (expand-file-name "ess-history/" doom-cache-dir))
 
+  (set-docsets! 'ess-r-mode "R")
+  (when (featurep! +lsp)
+    (add-hook 'ess-r-mode-local-vars-hook #'lsp!))
+
   (set-repl-handler! 'ess-r-mode #'+ess/open-r-repl)
   (set-repl-handler! 'ess-julia-mode #'+ess/open-julia-repl)
   (set-lookup-handlers! '(ess-r-mode ess-julia-mode)
@@ -30,26 +32,32 @@
   (set-eval-handler! 'ess-help-mode #'ess-eval-region-and-go)
   (set-eval-handler! 'ess-r-help-mode #'ess-eval-region-and-go)
 
-  (map! (:after ess-help
-          :map ess-help-mode-map
-          :n "q"  #'kill-current-buffer
-          :n "Q"  #'ess-kill-buffer-and-go
-          :n "K"  #'ess-display-help-on-object
-          :n "go" #'ess-display-help-in-browser
-          :n "gO" #'ess-display-help-apropos
-          :n "gv" #'ess-display-vignettes
-          :m "]]" #'ess-skip-to-next-section
-          :m "[[" #'ess-skip-to-previous-section
-          :map ess-doc-map
-          "h" #'ess-display-help-on-object
-          "p" #'ess-R-dv-pprint
-          "t" #'ess-R-dv-ctable
-          [C-return] #'ess-eval-line
-          [up]       #'comint-next-input
-          [down]     #'comint-previous-input)
+  (setq-hook! 'ess-r-mode-hook
+    ;; HACK Fix #2233: Doom continues comments on RET, but ess-r-mode doesn't
+    ;;      have a sane `comment-line-break-function', so...
+    comment-line-break-function nil)
+
+  (map! (:after ess-help
+          (:map ess-help-mode-map
+            :n "q"  #'kill-current-buffer
+            :n "Q"  #'ess-kill-buffer-and-go
+            :n "K"  #'ess-display-help-on-object
+            :n "go" #'ess-display-help-in-browser
+            :n "gO" #'ess-display-help-apropos
+            :n "gv" #'ess-display-vignettes
+            :m "]]" #'ess-skip-to-next-section
+            :m "[[" #'ess-skip-to-previous-section)
+          (:map ess-doc-map
+            "h"    #'ess-display-help-on-object
+            "p"    #'ess-R-dv-pprint
+            "t"    #'ess-R-dv-ctable
+            [up]   #'comint-next-input
+            [down] #'comint-previous-input
+            [C-return] #'ess-eval-line))
 
-        :localleader
         :map ess-mode-map
+        :n [C-return] #'ess-eval-line
+        :localleader
         "," #'ess-eval-region-or-function-or-paragraph-and-step
         "'" #'R
         [tab]     #'ess-switch-to-inferior-or-script-buffer

.emacs.d/modules/lang/ess/packages.el

@@ -1,5 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/ess/packages.el
 
-(package! ess)
-(package! ess-R-data-view)
+(package! ess :pin "625041ad51")
+(package! ess-R-data-view :pin "d6e98d3ae1")
+(package! polymode :pin "44265e3516")
+(package! poly-R :pin "51ffeb6ec4")