emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/scala-mode 5d28cb3 210/217: feat: support trailing commas


From: ELPA Syncer
Subject: [nongnu] elpa/scala-mode 5d28cb3 210/217: feat: support trailing commas (>= Scala 2.12.2)
Date: Sun, 29 Aug 2021 11:31:14 -0400 (EDT)

branch: elpa/scala-mode
commit 5d28cb3257d922c800e0ecea81e15e9a91aae254
Author: Keith Pinson <keith.pinson@banno.com>
Commit: Keith Pinson <keith.pinson@banno.com>

    feat: support trailing commas (>= Scala 2.12.2)
    
    Trailing commas were added in Scala
    [2.12.2](https://github.com/scala/scala/releases/tag/v2.12.2).
    
    Thought that before I jumped all the way in on the Scala 3 upgrade I would 
try
    patching something that has been bugging me w.r.t. the Scala 2 
implementation.
    
    Not 100% sure this is the most surgical fix. Will be testing locally and 
would
    love feedback.
---
 scala-mode-indent.el | 2 +-
 scala-mode-syntax.el | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scala-mode-indent.el b/scala-mode-indent.el
index d2237bd..486ae65 100644
--- a/scala-mode-indent.el
+++ b/scala-mode-indent.el
@@ -479,7 +479,7 @@ special word found. Special words include 'yield', 'else',
 
 (defun scala-indent:goto-list-anchor (&optional point)
   "Moves back to the point whose column will be used to indent
-list rows at current point (or point 'point'). Returns the new
+list rows at current point (or point `point'). Returns the new
 point or nil if the point is not in a list element > 1."
   (let ((list-beg (scala-syntax:list-p point)))
     (when list-beg
diff --git a/scala-mode-syntax.el b/scala-mode-syntax.el
index 995485b..edab1ab 100644
--- a/scala-mode-syntax.el
+++ b/scala-mode-syntax.el
@@ -943,7 +943,7 @@ not. A list must be either enclosed in parentheses or start 
with
     ;; first check that the previous line ended with ','
     (when point (goto-char point))
     (scala-syntax:beginning-of-code-line)
-    (when (scala-syntax:looking-back-token "," 1)
+    (when (and (scala-syntax:looking-back-token "," 1) (not (looking-at-p 
")")))
       (goto-char (match-beginning 0))
       (let ((parenpoint (nth 1 (syntax-ppss))))
         (if (and parenpoint (or (= (char-after parenpoint) ?\()



reply via email to

[Prev in Thread] Current Thread [Next in Thread]