[nongnu] elpa/scala-mode 3f724ed 030/217: Add the scala-indent:pad-equals setting.

[ELPA Syncer]

branch: elpa/scala-mode
commit 3f724ed1c9f5f5e6f6c07a3a39d0c8fd30f94fd8
Author: Erik Osheim <d_m@plastic-idolatry.com>
Commit: Erik Osheim <d_m@plastic-idolatry.com>

    Add the scala-indent:pad-equals setting.
    
    This setting (default t) controls whether you get extra indentation
    in the cases where statements follow =. Here is an example:
    
        // with scala-indent:pad-equals t
        def foo(x: Int) = x match {
            case _ => 999
          }
    
        // with scala-indent:pad-equals nil
        def foo(x: Int) = x match {
          case _ => 999
        }
    
    I've defaulted the setting to t to respect the old behavior, but I
    strongly suspect that most users of the mode will probably want the
    setting set to nil. We'll see I guess.
---
 scala-mode-indent.el | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/scala-mode-indent.el b/scala-mode-indent.el
index b88d8c1..54fb86e 100644
--- a/scala-mode-indent.el
+++ b/scala-mode-indent.el
@@ -13,6 +13,11 @@ indentation will be one or two steps depending on context."
   :type 'integer
   :group 'scala)
 
+(defcustom scala-indent:pad-equals t
+  "Whether or not to indent an extral level directly after =."
+  :type 'boolean
+  :group 'scala)
+
 (defconst scala-indent:eager-strategy 0
   "See 'scala-indent:run-on-strategy'")
 (defconst scala-indent:operator-strategy 1
@@ -464,14 +469,14 @@ anchor for calculating block indent for current point (or 
point
   "Resolves the appropriate indent step for block line at position
 'start' relative to the block anchor 'anchor'."
   (let 
-      ;; calculate a lead that is used for all steps. The lead is one
-      ;; indent step if there is a '=' between anchor and start,
-      ;; otherwise 0.
-      ((lead (if (ignore-errors 
+      ;;; calculate a lead that is used for all steps. The lead is one
+      ;;; indent step if there is a '=' between anchor and start,
+      ;;; otherwise 0.
+      ((lead (if (and scala-indent:pad-equals (ignore-errors 
                    (save-excursion
                      (let ((block-beg (nth 1 (syntax-ppss start))))
                        (goto-char anchor)
-                       (scala-syntax:has-char-before ?= block-beg))))
+                       (scala-syntax:has-char-before ?= block-beg)))))
                  scala-indent:step 0)))
     (cond
      ;; at end of buffer