Skip to content

Commit 7423f68

Browse files
committed
Simplify code
1 parent 86eb49c commit 7423f68

File tree

4 files changed

+34
-9
lines changed

4 files changed

+34
-9
lines changed

swift-mode-indent.el

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,10 +1014,7 @@ comma at eol."
10141014
;; foo()
10151015
;;
10161016
;; TODO make customizable
1017-
(setq result parent))
1018-
1019-
((eq (swift-mode:token:type next-token) 'supertype-:)
1020-
parent))
1017+
(setq result parent)))
10211018

10221019
(forward-comment (point-max))
10231020
(if (< (point) pos)

test/swift-files/declarations.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@ enum Foo
323323
}
324324

325325
// Struct declarations
326+
// See also types.swift
326327

327328
@A
328329
fileprivate

test/swift-files/statements.swift

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,25 @@ for
108108
foo()
109109
}
110110

111+
for case
112+
Foo
113+
.Bar(x)
114+
in
115+
xs {
116+
foo()
117+
foo()
118+
}
119+
120+
for
121+
case
122+
Foo
123+
.Bar(x)
124+
in
125+
xs {
126+
foo()
127+
foo()
128+
}
129+
111130

112131

113132
for x as

test/swift-files/types.swift

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,30 @@ let foo
1515
:A = abc
1616

1717
class Foo:
18-
A,
18+
A
19+
.A,
1920
B, C,
2021
D {
2122
}
2223

2324
class Foo
24-
: A,
25+
: A
26+
.A,
2527
B, C,
2628
D {
2729
}
2830

2931

3032
class Foo: A
33+
.A
3134
, B , C
3235
, D
3336
{
3437
}
3538

3639
class Foo
37-
: A
40+
: A.
41+
A
3842
, B , C
3943
, D
4044
{
@@ -59,25 +63,29 @@ let foo
5963

6064
class Foo:
6165
@A
62-
A, // swift-mode:test:known-bug
66+
A // swift-mode:test:known-bug
67+
.A, // swift-mode:test:known-bug
6368
B {
6469
}
6570

6671
class Foo
6772
: @A
68-
A, // swift-mode:test:known-bug
73+
A // swift-mode:test:known-bug
74+
.A, // swift-mode:test:known-bug
6975
B {
7076
}
7177

7278
class Foo: @A
7379
A // swift-mode:test:known-bug
80+
.A // swift-mode:test:known-bug
7481
, B
7582
{
7683
}
7784

7885
class Foo
7986
: @A
8087
A // swift-mode:test:known-bug
88+
.A // swift-mode:test:known-bug
8189
, B
8290
{
8391
}

0 commit comments

Comments
 (0)