Merge pull request #2394 from ahoppen/ahoppen/standardize-copyright-header

ahoppen · web-flow · commit ab497720a8f9 · 2023-12-09T06:20:25.000-08:00
diff --git a/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/RawSyntaxNodesFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/RawSyntaxNodesFile.swift
@@ -39,7 +39,7 @@ fileprivate extension Node {
 }
 
 func rawSyntaxNodesFile(nodesStartingWith: [Character]) -> SourceFileSyntax {
-  return SourceFileSyntax {
+  return SourceFileSyntax(leadingTrivia: copyrightHeader) {
     for node in SYNTAX_NODES where node.kind.isBase && nodesStartingWith.contains(node.kind.syntaxType.description.first!) {
       DeclSyntax(
         """
diff --git a/Sources/SwiftBasicFormat/SyntaxProtocol+Formatted.swift b/Sources/SwiftBasicFormat/SyntaxProtocol+Formatted.swift
@@ -1,3 +1,15 @@
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
 import SwiftSyntax
 
 public extension SyntaxProtocol {
diff --git a/Sources/SwiftParser/Nominals.swift b/Sources/SwiftParser/Nominals.swift
@@ -1,4 +1,4 @@
-//===-------------------------- Nominals.swift -----------------------------===//
+//===----------------------------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
diff --git a/Sources/SwiftParserDiagnostics/LexerDiagnosticMessages.swift b/Sources/SwiftParserDiagnostics/LexerDiagnosticMessages.swift
@@ -1,4 +1,4 @@
-//===--- LexerDiagnosticMessages.swift ------------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesAB.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesAB.swift
@@ -1,3 +1,17 @@
+//// Automatically generated by generate-swift-syntax
+//// Do not edit directly!
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
 @_spi(RawSyntax)
 public struct RawAccessorBlockSyntax: RawSyntaxNodeProtocol {
   public enum Accessors: RawSyntaxNodeProtocol {
diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesC.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesC.swift
@@ -1,3 +1,17 @@
+//// Automatically generated by generate-swift-syntax
+//// Do not edit directly!
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
 @_spi(RawSyntax)
 public struct RawCanImportExprSyntax: RawExprSyntaxNodeProtocol {
   @_spi(RawSyntax)
diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesD.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesD.swift
@@ -1,3 +1,17 @@
+//// Automatically generated by generate-swift-syntax
+//// Do not edit directly!
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
 @_spi(RawSyntax)
 public protocol RawDeclSyntaxNodeProtocol: RawSyntaxNodeProtocol {}
 
diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesEF.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesEF.swift
@@ -1,3 +1,17 @@
+//// Automatically generated by generate-swift-syntax
+//// Do not edit directly!
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
 @_spi(RawSyntax)
 public protocol RawExprSyntaxNodeProtocol: RawSyntaxNodeProtocol {}
 
diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesGHI.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesGHI.swift
@@ -1,3 +1,17 @@
+//// Automatically generated by generate-swift-syntax
+//// Do not edit directly!
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
 @_spi(RawSyntax)
 public struct RawGenericArgumentClauseSyntax: RawSyntaxNodeProtocol {
   @_spi(RawSyntax)
diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesJKLMN.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesJKLMN.swift
@@ -1,3 +1,17 @@
+//// Automatically generated by generate-swift-syntax
+//// Do not edit directly!
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
 @_spi(RawSyntax)
 public struct RawKeyPathComponentListSyntax: RawSyntaxNodeProtocol {
   @_spi(RawSyntax)
diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesOP.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesOP.swift
@@ -1,3 +1,17 @@
+//// Automatically generated by generate-swift-syntax
+//// Do not edit directly!
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
 @_spi(RawSyntax)
 public protocol RawPatternSyntaxNodeProtocol: RawSyntaxNodeProtocol {}
 
diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesQRS.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesQRS.swift
@@ -1,3 +1,17 @@
+//// Automatically generated by generate-swift-syntax
+//// Do not edit directly!
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
 @_spi(RawSyntax)
 public protocol RawStmtSyntaxNodeProtocol: RawSyntaxNodeProtocol {}
 
diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesTUVWXYZ.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxNodesTUVWXYZ.swift
@@ -1,3 +1,17 @@
+//// Automatically generated by generate-swift-syntax
+//// Do not edit directly!
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
 @_spi(RawSyntax)
 public protocol RawTypeSyntaxNodeProtocol: RawSyntaxNodeProtocol {}
 
diff --git a/Sources/SwiftSyntaxBuilder/ResultBuilderExtensions.swift b/Sources/SwiftSyntaxBuilder/ResultBuilderExtensions.swift
@@ -1,4 +1,4 @@
-//===--- ResultBuilderExtensions.swift ------------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
diff --git a/Sources/SwiftSyntaxMacroExpansion/FunctionParameterUtils.swift b/Sources/SwiftSyntaxMacroExpansion/FunctionParameterUtils.swift
@@ -1,3 +1,15 @@
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
 import SwiftSyntax
 
 extension FunctionParameterSyntax {
diff --git a/Sources/SwiftSyntaxMacroExpansion/MacroReplacement.swift b/Sources/SwiftSyntaxMacroExpansion/MacroReplacement.swift
@@ -1,3 +1,15 @@
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
 import SwiftDiagnostics
 import SwiftSyntax
 import SwiftSyntaxBuilder
diff --git a/Sources/SwiftSyntaxMacros/MacroProtocols/AccessorMacro.swift b/Sources/SwiftSyntaxMacros/MacroProtocols/AccessorMacro.swift
@@ -1,3 +1,4 @@
+//===----------------------------------------------------------------------===//
 //
 // Copyright (c) 2014 - 2023 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
diff --git a/Sources/SwiftSyntaxMacros/MacroProtocols/AttachedMacro.swift b/Sources/SwiftSyntaxMacros/MacroProtocols/AttachedMacro.swift
@@ -1,3 +1,4 @@
+//===----------------------------------------------------------------------===//
 //
 // Copyright (c) 2014 - 2023 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
diff --git a/Sources/SwiftSyntaxMacros/MacroProtocols/BodyMacro.swift b/Sources/SwiftSyntaxMacros/MacroProtocols/BodyMacro.swift
@@ -1,3 +1,4 @@
+//===----------------------------------------------------------------------===//
 //
 // Copyright (c) 2014 - 2023 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
diff --git a/Sources/SwiftSyntaxMacros/MacroProtocols/CodeItemMacro.swift b/Sources/SwiftSyntaxMacros/MacroProtocols/CodeItemMacro.swift
@@ -1,3 +1,4 @@
+//===----------------------------------------------------------------------===//
 //
 // Copyright (c) 2014 - 2023 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
diff --git a/Sources/SwiftSyntaxMacros/MacroProtocols/DeclarationMacro.swift b/Sources/SwiftSyntaxMacros/MacroProtocols/DeclarationMacro.swift
@@ -1,3 +1,4 @@
+//===----------------------------------------------------------------------===//
 //
 // Copyright (c) 2014 - 2023 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
diff --git a/Sources/SwiftSyntaxMacros/MacroProtocols/FreestandingMacro.swift b/Sources/SwiftSyntaxMacros/MacroProtocols/FreestandingMacro.swift
@@ -1,3 +1,4 @@
+//===----------------------------------------------------------------------===//
 //
 // Copyright (c) 2014 - 2023 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
diff --git a/Sources/SwiftSyntaxMacros/MacroProtocols/PeerMacro.swift b/Sources/SwiftSyntaxMacros/MacroProtocols/PeerMacro.swift
@@ -1,3 +1,4 @@
+//===----------------------------------------------------------------------===//
 //
 // Copyright (c) 2014 - 2023 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
diff --git a/Sources/SwiftSyntaxMacros/MacroProtocols/PreambleMacro.swift b/Sources/SwiftSyntaxMacros/MacroProtocols/PreambleMacro.swift
@@ -1,3 +1,4 @@
+//===----------------------------------------------------------------------===//
 //
 // Copyright (c) 2014 - 2023 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
diff --git a/Tests/SwiftOperatorsTest/OperatorTableTests.swift b/Tests/SwiftOperatorsTest/OperatorTableTests.swift
@@ -1,6 +1,3 @@
-@_spi(Testing) import SwiftOperators
-import SwiftParser
-import SwiftSyntax
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
@@ -12,6 +9,10 @@ import SwiftSyntax
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
+
+@_spi(Testing) import SwiftOperators
+import SwiftParser
+import SwiftSyntax
 import XCTest
 import _SwiftSyntaxTestSupport
 
diff --git a/Tests/SwiftOperatorsTest/SyntaxSynthesisTests.swift b/Tests/SwiftOperatorsTest/SyntaxSynthesisTests.swift
@@ -1,5 +1,3 @@
-import SwiftOperators
-import SwiftSyntax
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
@@ -11,6 +9,9 @@ import SwiftSyntax
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
+
+import SwiftOperators
+import SwiftSyntax
 import XCTest
 
 public class SyntaxSynthesisTests: XCTestCase {
diff --git a/Tests/SwiftParserTest/translated/RecoveryTests.swift b/Tests/SwiftParserTest/translated/RecoveryTests.swift
@@ -1,3 +1,15 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 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/recovery.swift
 
 import XCTest

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ fileprivate extension Node {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`func rawSyntaxNodesFile(nodesStartingWith: [Character]) -> SourceFileSyntax {`
`42`		`- return SourceFileSyntax {`
	`42`	`+ return SourceFileSyntax(leadingTrivia: copyrightHeader) {`
`43`	`43`	`for node in SYNTAX_NODES where node.kind.isBase && nodesStartingWith.contains(node.kind.syntaxType.description.first!) {`
`44`	`44`	`DeclSyntax(`
`45`	`45`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//===-------------------------- Nominals.swift -----------------------------===//`
	`1`	`+//===----------------------------------------------------------------------===//`
`2`	`2`	`//`
`3`	`3`	`// This source file is part of the Swift.org open source project`
`4`	`4`	`//`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//===--- LexerDiagnosticMessages.swift ------------------------------------===//`
	`1`	`+//===----------------------------------------------------------------------===//`
`2`	`2`	`//`
`3`	`3`	`// This source file is part of the Swift.org open source project`
`4`	`4`	`//`