branch: elpa/swift-mode
commit ee83a1d349aedb65aff86e049640b34c33f2ab7d
Author: ap4y <l...@pisem.net>
Commit: ap4y <l...@pisem.net>
Rename swift-indent-multiline-dot-offset to
swift-indent-multiline-statement-offset
---
swift-mode.el | 8 ++++----
test/indentation-tests.el | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/swift-mode.el b/swift-mode.el
index 370f78b..c7d1d16 100644
--- a/swift-mode.el
+++ b/swift-mode.el
@@ -53,8 +53,8 @@
:group 'swift
:type 'integerp)
-(defcustom swift-indent-multiline-dot-offset 2
- "Defines the indentation offset for for multiline dot statement."
+(defcustom swift-indent-multiline-statement-offset 2
+ "Defines the indentation offset for for multiline statements."
:group 'swift
:type 'integerp
:package-version '(swift-mode "0.3.0"))
@@ -272,13 +272,13 @@
(if (smie-rule-parent-p "case" "default")
(smie-rule-parent swift-indent-offset)))
- ;; Apply swift-indent-multiline-dot-offset only if
+ ;; Apply swift-indent-multiline-statement-offset only if
;; - dot is followed by newline, or
;; - have at least one whitespace character before dot
(`(:before . ".")
(if (or (looking-at "[.][\n]")
(looking-back "[ \t\n]" 1 t))
- (smie-rule-parent swift-indent-multiline-dot-offset)))
+ (smie-rule-parent swift-indent-multiline-statement-offset)))
(`(:before . "if")
(if (smie-rule-prev-p "else")
diff --git a/test/indentation-tests.el b/test/indentation-tests.el
index c4c9e2a..203d0d5 100644
--- a/test/indentation-tests.el
+++ b/test/indentation-tests.el
@@ -58,7 +58,7 @@ values of customisable variables."
;; Bind customisable vars to default values for tests.
(swift-indent-offset 4)
(swift-indent-switch-case-offset 0)
- (swift-indent-multiline-dot-offset 2)
+ (swift-indent-multiline-statement-offset 2)
,@var-bindings)
(with-temp-buffer
(insert ,before)
@@ -819,7 +819,7 @@ NSNotificationCenter.defaultCenter().
NSNotificationCenter.defaultCenter().
|postNotificationName(foo, object: nil)
"
-((swift-indent-multiline-dot-offset 4)))
+((swift-indent-multiline-statement-offset 4)))
(check-indentation indents-multiline-expressions-to-user-defined-offset/2
"
@@ -829,7 +829,7 @@ NSNotificationCenter.defaultCenter()
NSNotificationCenter.defaultCenter()
|.postNotificationName(foo, object: nil)
"
-((swift-indent-multiline-dot-offset 4)))
+((swift-indent-multiline-statement-offset 4)))
(check-indentation indents-multiline-expressions-to-user-defined-offset/3
"
@@ -839,7 +839,7 @@ let json_ary = NSJSONSerialization
let json_ary = NSJSONSerialization
|.JSONObjectWithData(data, options: nil, error: &json_err) as
NSArray
"
-((swift-indent-multiline-dot-offset 4)))
+((swift-indent-multiline-statement-offset 4)))
(check-indentation indents-type-annotations/1
"
