lsp-pwsh: support code formatting (#1215)

emacs-lsp · Dec 4, 2019 · fc8c860 · fc8c860
1 parent b121626
commit fc8c860
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lsp-mode.el b/lsp-mode.el
@@ -3136,6 +3136,8 @@ The method uses `replace-buffer-contents'."
                                     beg (+ beg (length newText))
                                     length)))))))))
 
+(defvar-local lsp--filter-cr? t)
+
 (defun lsp--apply-text-edits (edits)
   "Apply the edits described in the TextEdit[] object."
   (unless (seq-empty-p edits)
@@ -3153,6 +3155,11 @@ The method uses `replace-buffer-contents'."
                            'lsp--apply-text-edit)))
         (unwind-protect
             (->> edits
+                 (mapc (lambda (edit)
+                         (when lsp--filter-cr?
+                           ;; filter \r out of text since it's mostly useless
+                           (ht-set edit "newText"
+                                   (s-replace "\r" "" (ht-get edit "newText" ""))))))
                  (nreverse)
                  (seq-sort #'lsp--text-edit-sort-predicate)
                  (mapc (lambda (edit)

diff --git a/lsp-pwsh.el b/lsp-pwsh.el
@@ -307,7 +307,10 @@ Must not nil.")
   :initialized-fn (lambda (w)
                     (with-lsp-workspace w
                       (lsp--set-configuration
-                       (lsp-configuration-section "powershell"))))
+                       (lsp-configuration-section "powershell")))
+                    (let ((caps (lsp--workspace-server-capabilities w)))
+                      (ht-set caps "documentRangeFormattingProvider" t)
+                      (ht-set caps "documentFormattingProvider" t)))
   ))
 
 ;; Compatibility