Merge pull request #2807 from rintaro/assertion-fileid

Use #fileID for assertion

Author: rintaro

CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/RawSyntaxValidationFile.swift

@@ -84,7 +84,7 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: copyrightHead
 
               DeclSyntax(
                 """
-                func verify<Node: RawSyntaxNodeProtocol>(_ raw: RawSyntax?, as _: Node.Type, file: StaticString = #filePath, line: UInt = #line) -> ValidationError? {
+                func verify<Node: RawSyntaxNodeProtocol>(_ raw: RawSyntax?, as _: Node.Type, file: StaticString = #fileID, line: UInt = #line) -> ValidationError? {
                   guard let raw = raw else {
                     return .expectedNonNil(expectedKind: Node.self, file: file, line: line)
                   }
@@ -98,7 +98,7 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: copyrightHead
 
               DeclSyntax(
                 """
-                func verify<Node: RawSyntaxNodeProtocol>(_ raw: RawSyntax?, as _: Node?.Type, file: StaticString = #filePath, line: UInt = #line) -> ValidationError? {
+                func verify<Node: RawSyntaxNodeProtocol>(_ raw: RawSyntax?, as _: Node?.Type, file: StaticString = #fileID, line: UInt = #line) -> ValidationError? {
                   if raw != nil {
                     return verify(raw, as: Node.self, file: file, line: line)
                   }
@@ -109,7 +109,7 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: copyrightHead
 
               DeclSyntax(
                 """
-                func verify(_ raw: RawSyntax?, as _: RawTokenSyntax?.Type, tokenChoices: [TokenChoice], file: StaticString = #filePath, line: UInt = #line) -> ValidationError? {
+                func verify(_ raw: RawSyntax?, as _: RawTokenSyntax?.Type, tokenChoices: [TokenChoice], file: StaticString = #fileID, line: UInt = #line) -> ValidationError? {
                   // Validation of token choice is currently causing assertion failures where
                   // the list of expected token choices in the syntax tree doesn't match those
                   // the parser generates. Disable the verification for now until all issues
@@ -124,7 +124,7 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: copyrightHead
 
               DeclSyntax(
                 """
-                func verify(_ raw: RawSyntax?, as _: RawTokenSyntax.Type, tokenChoices: [TokenChoice], file: StaticString = #filePath, line: UInt = #line) -> ValidationError? {
+                func verify(_ raw: RawSyntax?, as _: RawTokenSyntax.Type, tokenChoices: [TokenChoice], file: StaticString = #fileID, line: UInt = #line) -> ValidationError? {
                   // Validation of token choice is currently causing assertion failures where
                   // the list of expected token choices in the syntax tree doesn't match those
                   // the parser generates. Disable the verification for now until all issues

Sources/SwiftSyntax/Assert.swift

@@ -32,7 +32,7 @@
 public func assert(
   _ condition: @autoclosure () -> Bool,
   _ message: @autoclosure () -> String = String(),
-  file: StaticString = #file,
+  file: StaticString = #fileID,
   line: UInt = #line
 ) {
   #if SWIFTSYNTAX_ENABLE_ASSERTIONS
@@ -51,7 +51,7 @@ public func assert(
 @_transparent
 public func assertionFailure(
   _ message: @autoclosure () -> String = String(),
-  file: StaticString = #file,
+  file: StaticString = #fileID,
   line: UInt = #line
 ) {
   #if SWIFTSYNTAX_ENABLE_ASSERTIONS
@@ -71,7 +71,7 @@ public func assertionFailure(
 public func precondition(
   _ condition: @autoclosure () -> Bool,
   _ message: @autoclosure () -> String = String(),
-  file: StaticString = #file,
+  file: StaticString = #fileID,
   line: UInt = #line
 ) {
   #if !SWIFTSYNTAX_DISABLE_PRECONDITIONS

Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift

@@ -86,7 +86,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
   func verify<Node: RawSyntaxNodeProtocol>(
       _ raw: RawSyntax?, 
       as _: Node.Type, 
-      file: StaticString = #filePath, 
+      file: StaticString = #fileID, 
       line: UInt = #line
     ) -> ValidationError? {
     guard let raw = raw else {
@@ -105,7 +105,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
   func verify<Node: RawSyntaxNodeProtocol>(
       _ raw: RawSyntax?, 
       as _: Node?.Type, 
-      file: StaticString = #filePath, 
+      file: StaticString = #fileID, 
       line: UInt = #line
     ) -> ValidationError? {
     if raw != nil {
@@ -122,7 +122,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
       _ raw: RawSyntax?, 
       as _: RawTokenSyntax?.Type, 
       tokenChoices: [TokenChoice], 
-      file: StaticString = #filePath, 
+      file: StaticString = #fileID, 
       line: UInt = #line
     ) -> ValidationError? {
     // Validation of token choice is currently causing assertion failures where
@@ -144,7 +144,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
       _ raw: RawSyntax?, 
       as _: RawTokenSyntax.Type, 
       tokenChoices: [TokenChoice], 
-      file: StaticString = #filePath, 
+      file: StaticString = #fileID, 
       line: UInt = #line
     ) -> ValidationError? {
     // Validation of token choice is currently causing assertion failures where