Skip to content

Commit d0b412e

Browse files
kimdvkimdv
authored
Merge pull request #66106 from kimdv/kimdv/remove-newline-from-swift-syntax-code-gen
[SwiftSyntax] Remove `requiresLeadingNewline` from basic format
2 parents da15bf6 + 8140efb commit d0b412e

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

‎test/Macros/macro_expand.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ struct Bad {}
9898

9999
// CHECK-DIAGS: CONTENTS OF FILE @__swiftmacro_9MacroUser3Bad7InvalidfMp_.swift
100100
// CHECK-DIAGS: import Swift
101-
// CHECK-DIAGS: precedencegroup MyPrecedence {}
101+
// CHECK-DIAGS: precedencegroup MyPrecedence {
102+
// CHECK-DIAGS: }
102103
// CHECK-DIAGS: @attached(member) macro myMacro()
103104
// CHECK-DIAGS: extension Int {
104105
// CHECK-DIAGS: }

‎test/SourceKit/Macros/diags.swift.response

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
key.buffer_name: "@__swiftmacro_9MacroUser3fooyyF11coerceToIntfMf_.swift"
3838
},
3939
{
40-
key.buffer_text: "import Swift\n\nprecedencegroup MyPrecedence {}\n\n@attached(member) macro myMacro()\n\nextension Int {\n}\n\n@main\nstruct MyMain {\n static func main() {\n }\n}\n\ntypealias Array = Void\n\ntypealias Dictionary = Void\n\ntypealias BooleanLiteralType = Void\n\ntypealias ExtendedGraphemeClusterType = Void\n\ntypealias FloatLiteralType = Void\n\ntypealias IntegerLiteralType = Void\n\ntypealias StringLiteralType = Void\n\ntypealias UnicodeScalarType = Void\n\ntypealias _ColorLiteralType = Void\n\ntypealias _ImageLiteralType = Void\n\ntypealias _FileReferenceLiteralType = Void",
40+
key.buffer_text: "import Swift\n\nprecedencegroup MyPrecedence {\n}\n\n@attached(member) macro myMacro()\n\nextension Int {\n}\n\n@main\nstruct MyMain {\n static func main() {\n }\n}\n\ntypealias Array = Void\n\ntypealias Dictionary = Void\n\ntypealias BooleanLiteralType = Void\n\ntypealias ExtendedGraphemeClusterType = Void\n\ntypealias FloatLiteralType = Void\n\ntypealias IntegerLiteralType = Void\n\ntypealias StringLiteralType = Void\n\ntypealias UnicodeScalarType = Void\n\ntypealias _ColorLiteralType = Void\n\ntypealias _ImageLiteralType = Void\n\ntypealias _FileReferenceLiteralType = Void",
4141
key.original_location: {
4242
key.offset: 499,
4343
key.length: 0,
@@ -233,7 +233,7 @@
233233
]
234234
},
235235
{
236-
key.line: 5,
236+
key.line: 6,
237237
key.column: 25,
238238
key.filepath: "@__swiftmacro_9MacroUser3Bad7InvalidfMp_.swift",
239239
key.severity: source.diagnostic.severity.error,
@@ -257,7 +257,7 @@
257257
]
258258
},
259259
{
260-
key.line: 5,
260+
key.line: 6,
261261
key.column: 25,
262262
key.filepath: "@__swiftmacro_9MacroUser3Bad7InvalidfMp_.swift",
263263
key.severity: source.diagnostic.severity.error,
@@ -281,7 +281,7 @@
281281
]
282282
},
283283
{
284-
key.line: 7,
284+
key.line: 8,
285285
key.column: 1,
286286
key.filepath: "@__swiftmacro_9MacroUser3Bad7InvalidfMp_.swift",
287287
key.severity: source.diagnostic.severity.error,
@@ -305,7 +305,7 @@
305305
]
306306
},
307307
{
308-
key.line: 10,
308+
key.line: 11,
309309
key.column: 1,
310310
key.filepath: "@__swiftmacro_9MacroUser3Bad7InvalidfMp_.swift",
311311
key.severity: source.diagnostic.severity.error,
@@ -329,7 +329,7 @@
329329
]
330330
},
331331
{
332-
key.line: 11,
332+
key.line: 12,
333333
key.column: 8,
334334
key.filepath: "@__swiftmacro_9MacroUser3Bad7InvalidfMp_.swift",
335335
key.severity: source.diagnostic.severity.error,
@@ -353,7 +353,7 @@
353353
]
354354
},
355355
{
356-
key.line: 16,
356+
key.line: 17,
357357
key.column: 11,
358358
key.filepath: "@__swiftmacro_9MacroUser3Bad7InvalidfMp_.swift",
359359
key.severity: source.diagnostic.severity.error,
@@ -377,7 +377,7 @@
377377
]
378378
},
379379
{
380-
key.line: 18,
380+
key.line: 19,
381381
key.column: 11,
382382
key.filepath: "@__swiftmacro_9MacroUser3Bad7InvalidfMp_.swift",
383383
key.severity: source.diagnostic.severity.error,
@@ -401,7 +401,7 @@
401401
]
402402
},
403403
{
404-
key.line: 20,
404+
key.line: 21,
405405
key.column: 11,
406406
key.filepath: "@__swiftmacro_9MacroUser3Bad7InvalidfMp_.swift",
407407
key.severity: source.diagnostic.severity.error,
@@ -425,7 +425,7 @@
425425
]
426426
},
427427
{
428-
key.line: 22,
428+
key.line: 23,
429429
key.column: 11,
430430
key.filepath: "@__swiftmacro_9MacroUser3Bad7InvalidfMp_.swift",
431431
key.severity: source.diagnostic.severity.error,
@@ -449,7 +449,7 @@
449449
]
450450
},
451451
{
452-
key.line: 24,
452+
key.line: 25,
453453
key.column: 11,
454454
key.filepath: "@__swiftmacro_9MacroUser3Bad7InvalidfMp_.swift",
455455
key.severity: source.diagnostic.severity.error,
@@ -473,7 +473,7 @@
473473
]
474474
},
475475
{
476-
key.line: 26,
476+
key.line: 27,
477477
key.column: 11,
478478
key.filepath: "@__swiftmacro_9MacroUser3Bad7InvalidfMp_.swift",
479479
key.severity: source.diagnostic.severity.error,
@@ -497,7 +497,7 @@
497497
]
498498
},
499499
{
500-
key.line: 28,
500+
key.line: 29,
501501
key.column: 11,
502502
key.filepath: "@__swiftmacro_9MacroUser3Bad7InvalidfMp_.swift",
503503
key.severity: source.diagnostic.severity.error,
@@ -521,7 +521,7 @@
521521
]
522522
},
523523
{
524-
key.line: 30,
524+
key.line: 31,
525525
key.column: 11,
526526
key.filepath: "@__swiftmacro_9MacroUser3Bad7InvalidfMp_.swift",
527527
key.severity: source.diagnostic.severity.error,
@@ -545,7 +545,7 @@
545545
]
546546
},
547547
{
548-
key.line: 32,
548+
key.line: 33,
549549
key.column: 11,
550550
key.filepath: "@__swiftmacro_9MacroUser3Bad7InvalidfMp_.swift",
551551
key.severity: source.diagnostic.severity.error,
@@ -569,7 +569,7 @@
569569
]
570570
},
571571
{
572-
key.line: 34,
572+
key.line: 35,
573573
key.column: 11,
574574
key.filepath: "@__swiftmacro_9MacroUser3Bad7InvalidfMp_.swift",
575575
key.severity: source.diagnostic.severity.error,
@@ -593,7 +593,7 @@
593593
]
594594
},
595595
{
596-
key.line: 36,
596+
key.line: 37,
597597
key.column: 11,
598598
key.filepath: "@__swiftmacro_9MacroUser3Bad7InvalidfMp_.swift",
599599
key.severity: source.diagnostic.severity.error,

0 commit comments

Comments
 (0)