1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
|
//===----------------------------------------------------------------------===//
//
// This source file is part of the Swift.org open source project
//
// Copyright (c) 2014 - 2023 Apple Inc. and the Swift project authors
// Licensed under Apache License v2.0 with Runtime Library Exception
//
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
//
//===----------------------------------------------------------------------===//
// This test file has been translated from swift/test/Parse/conflict_markers.swift
import XCTest
final class ConflictMarkersTests: ParserTestCase {
func testConflictMarkers1() {
assertParse(
"""
// Conflict marker parsing should never conflict with operator parsing.
"""
)
}
func testConflictMarkers2() {
assertParse(
"""
prefix operator <<<<<<<
infix operator <<<<<<<
"""
)
}
func testConflictMarkers3() {
assertParse(
"""
prefix func <<<<<<< (x : String) {}
func <<<<<<< (x : String, y : String) {}
"""
)
}
func testConflictMarkers4() {
assertParse(
"""
prefix operator >>>>>>>
infix operator >>>>>>>
"""
)
}
func testConflictMarkers5() {
assertParse(
"""
prefix func >>>>>>> (x : String) {}
func >>>>>>> (x : String, y : String) {}
"""
)
}
func testConflictMarkers6() {
assertParse(
"""
// diff3-style conflict markers
"""
)
}
func testConflictMarkers7() {
assertParse(
#"""
1️⃣<<<<<<< HEAD:conflict_markers.swift
var a : String = "A"
var b : String = "b"
=======
var a : String = "a"
var b : String = "B"
>>>>>>> 18844bc65229786b96b89a9fc7739c0fc897905e:conflict_markers.swift
print(a + b)
"""#,
diagnostics: [
DiagnosticSpec(message: "source control conflict marker in source file")
]
)
}
func testConflictMarkers8() {
assertParse(
#"""
1️⃣<<<<<<< HEAD:conflict_markers.swift
=======
var d : String = "D"
>>>>>>> 18844bc65229786b96b89a9fc7739c0fc897905e:conflict_markers.swift
print(d)
"""#,
diagnostics: [
DiagnosticSpec(message: "source control conflict marker in source file")
]
)
}
func testConflictMarkers9() {
assertParse(
#"""
<<<<<<<"HEAD:fake_conflict_markers.swift" // No error
>>>>>>>"18844bc65229786b96b89a9fc7739c0fc897905e:fake_conflict_markers.swift" // No error
"""#
)
}
func testConflictMarkers10() {
assertParse(
#"""
1️⃣<<<<<<< HEAD:conflict_markers.swift
<<<<<<<"HEAD:fake_conflict_markers.swift"
var fake_b : String = "a"
>>>>>>>"18844bc65229786b96b89a9fc7739c0fc897905e:fake_conflict_markers.swift"
=======
<<<<<<<"HEAD:fake_conflict_markers.swift"
var fake_c : String = "a"
>>>>>>>"18844bc65229786b96b89a9fc7739c0fc897905e:fake_conflict_markers.swift"
>>>>>>> 18844bc65229786b96b89a9fc7739c0fc897905e:conflict_markers.swift
print(fake_b + fake_c)
"""#,
diagnostics: [
DiagnosticSpec(message: "source control conflict marker in source file")
]
)
}
func testConflictMarkers11() {
assertParse(
"""
// Disambiguating conflict markers from operator applications.
"""
)
}
func testConflictMarkers12() {
assertParse(
#"""
_ = {
// Conflict marker.
let a = "a", b = "b"
a
1️⃣<<<<<<< b
a
>>>>>>> b
// Not a conflict marker.
a
<<<<<<< b
a
>>>>>>> b
}()
"""#,
diagnostics: [
DiagnosticSpec(message: "source control conflict marker in source file")
]
)
}
func testConflictMarkers13() {
assertParse(
"""
// Perforce-style conflict markers
"""
)
}
func testConflictMarkers14() {
assertParse(
#"""
1️⃣>>>> ORIGINAL
var a : String = "A"
var b : String = "B"
==== THEIRS
var a : String = "A"
var b : String = "b"
==== YOURS
var a : String = "a"
var b : String = "B"
<<<<
print(a + b)
"""#,
diagnostics: [
DiagnosticSpec(message: "source control conflict marker in source file")
]
)
}
func testConflictMarkers15() {
assertParse(
#"""
1️⃣>>>> ORIGINAL
==== THEIRS
==== YOURS
var d : String = "D"
<<<<
print(d)
"""#,
diagnostics: [
DiagnosticSpec(message: "source control conflict marker in source file")
]
)
}
}
|
