[nongnu] elpa/scala-mode b85fa5e 213/217: Merge pull request #167 from Kazark/trailing-comma

[ELPA Syncer]

branch: elpa/scala-mode
commit b85fa5efe01d7deb0709280d50fa5eb4155e29e1
Merge: 1ab5f64 5d28cb3
Author: Heikki Vesalainen <heikkivesalainen@yahoo.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #167 from Kazark/trailing-comma
    
    feat: support trailing commas (>= Scala 2.12.2)
---
 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) ?\()