[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/swift-mode 01a1127 318/496: Fix indentation before "where"
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/swift-mode 01a1127 318/496: Fix indentation before "where" |
Date: |
Sun, 29 Aug 2021 11:33:58 -0400 (EDT) |
branch: elpa/swift-mode
commit 01a112754ebb21df12a9b900d595044c5db675fe
Author: taku0 <mxxouy6x3m_github@tatapa.org>
Commit: taku0 <mxxouy6x3m_github@tatapa.org>
Fix indentation before "where"
---
swift-mode-indent.el | 16 +++++++++++-----
test/swift-files/statements.swift | 30 +++++++++++++++---------------
2 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/swift-mode-indent.el b/swift-mode-indent.el
index b1bca83..fcdc999 100644
--- a/swift-mode-indent.el
+++ b/swift-mode-indent.el
@@ -311,11 +311,17 @@
(let ((parent (save-excursion (swift-mode:backward-sexps-until
(append swift-mode:statement-parent-tokens
'("case"))))))
- (swift-mode:find-and-align-with-parents
- (append swift-mode:statement-parent-tokens
- '(< "case" "catch" "for")
- (if (equal (swift-mode:token:text parent) "case") '(\,) '()))
- swift-mode:multiline-statement-offset)))
+ (if (equal (swift-mode:token:text parent) "case")
+ (progn
+ (goto-char (swift-mode:token:end previous-token))
+ (swift-mode:backward-token-or-list)
+ (swift-mode:calculate-indent-of-expression
+ swift-mode:multiline-statement-offset
+ swift-mode:multiline-statement-offset))
+ (swift-mode:find-and-align-with-parents
+ (append swift-mode:statement-parent-tokens
+ '(< "case" "catch" "for"))
+ swift-mode:multiline-statement-offset))))
;; After {
((eq previous-type '{)
diff --git a/test/swift-files/statements.swift
b/test/swift-files/statements.swift
index 3decd4f..adecd27 100644
--- a/test/swift-files/statements.swift
+++ b/test/swift-files/statements.swift
@@ -577,17 +577,17 @@ default:
switch foo {
case let
.P(x)
- where // swift-mode:test:known-bug
+ where
foo
.bar(),
let
.Q(x)
- where // swift-mode:test:known-bug
+ where
foo
.bar(),
let
.R(x)
- where // swift-mode:test:known-bug
+ where
foo
.bar():
foo()
@@ -601,17 +601,17 @@ switch foo {
case
let
.P(x)
- where // swift-mode:test:known-bug
+ where
foo
.bar(),
let
.Q(x)
- where // swift-mode:test:known-bug
+ where
foo
.bar(),
let
.R(x)
- where // swift-mode:test:known-bug
+ where
foo
.bar():
foo()
@@ -625,17 +625,17 @@ switch foo {
case
let Foo
.P(x)
- where // swift-mode:test:known-bug
+ where
foo
.bar(),
let Foo
.Q(x)
- where // swift-mode:test:known-bug
+ where
foo
.bar(),
let Foo
.R(x)
- where // swift-mode:test:known-bug
+ where
foo
.bar():
foo()
@@ -657,19 +657,19 @@ case
let
Foo
.P(x)
- where // swift-mode:test:known-bug
+ where
foo
.bar(),
let
Foo
.Q(x)
- where // swift-mode:test:known-bug
+ where
foo
.bar(),
let
Foo
.R(x)
- where // swift-mode:test:known-bug
+ where
foo
.bar():
foo()
@@ -683,18 +683,18 @@ switch foo {
case
is
Foo
- where // swift-mode:test:known-bug
+ where
foo
.bar(),
is
Foo
- where // swift-mode:test:known-bug
+ where
foo
.bar(),
let Foo
.Bar
.Baz
- where // swift-mode:test:known-bug
+ where
foo
.bar():
foo()
- [nongnu] elpa/swift-mode cb7ba6f 245/496: Add an option for indent after hanging comma, (continued)
- [nongnu] elpa/swift-mode cb7ba6f 245/496: Add an option for indent after hanging comma, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 0185315 274/496: Merge pull request #107 from uk-ar/fix-forward-list, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 27ec163 286/496: Merge pull request #113 from uk-ar/add-keyword-for-attribute, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode f43317e 290/496: Add MELPA badge in README, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode c73ce40 301/496: Update README.md about swift3-mode, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 7fc03bf 295/496: Merge pull request #119 from syohex/update-url, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 73abb98 292/496: Use cl-lib function instead of cl.el one, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 787658f 305/496: Update CONTRIBUTING.md, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 0e24233 307/496: Fix forward/backward-sexp inside comments, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 60dab9b 308/496: Update test to return informative exit status, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 01a1127 318/496: Fix indentation before "where",
ELPA Syncer <=
- [nongnu] elpa/swift-mode b135df3 316/496: Fix output messages of the test, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 7837c90 319/496: Fix indentation around "where" and "catch", ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 42a209c 322/496: Fix indentation of guard, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode ab9f414 320/496: Fix indentation of close curly brace of switch, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 97d86cd 326/496: Tweak test runner, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode ea77cf9 328/496: Add comments, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 6cd2948 342/496: Bump version to 2.2.1, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 7e78225 336/496: Bump version to 2.2, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 1868590 348/496: Add build/debug command, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode a6d00b5 352/496: Simplify code, ELPA Syncer, 2021/08/29