[WIP] Update test cases & run swift-format

Author: StevenWong12

CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift

@@ -184,7 +184,7 @@ public let EXPR_NODES: [Node] = [
       ),
     ]
   ),
-  
+
   // the canImport expr in if config expression
   Node(
     name: "CanImportExpr",
@@ -216,7 +216,7 @@ public let EXPR_NODES: [Node] = [
       Child(
         name: "RightParen",
         kind: .token(choices: [.token(tokenKind: "RightParenToken")])
-      )
+      ),
     ]
   ),
 

Sources/SwiftParser/Expressions.swift

@@ -761,16 +761,15 @@ extension Parser {
         leadingExpr = self.parseDottedExpressionSuffix(leadingExpr)
         continue
       }
-      
-      
+
       // canImport expression
       if let leadingIdentifier = leadingExpr.as(RawIdentifierExprSyntax.self),
-         leadingIdentifier.identifier.tokenText == "canImport" {
+        leadingIdentifier.identifier.tokenText == "canImport"
+      {
         leadingExpr = self.parseCanImportExpression(leadingIdentifier)
         continue
       }
-      
-       
+
       // If there is an expr-call-suffix, parse it and form a call.
       if let lparen = self.consume(if: TokenSpec(.leftParen, allowAtStartOfLine: false)) {
         let args = self.parseArgumentListElements(pattern: pattern)
@@ -2022,7 +2021,7 @@ extension Parser {
     } while keepGoing != nil && loopProgress.evaluate(currentToken)
     return result
   }
-  
+
   mutating func parseTupleExprElement(pattern: PatternContext) -> RawTupleExprElementSyntax {
     let unexpectedBeforeLabel: RawUnexpectedNodesSyntax?
     let label: RawTokenSyntax?
@@ -2054,9 +2053,9 @@ extension Parser {
     } else {
       expr = self.parseExpression(pattern: pattern)
     }
-    
+
     let comma = self.consume(if: .comma)
-    
+
     return RawTupleExprElementSyntax(
       unexpectedBeforeLabel,
       label: label,
@@ -2066,7 +2065,7 @@ extension Parser {
       arena: self.arena
     )
   }
-  
+
 }
 
 extension Parser {
@@ -2566,16 +2565,16 @@ extension Parser {
 extension Parser {
   mutating func parseCanImportExpression(_ canImportIdentifierExpr: RawIdentifierExprSyntax) -> RawExprSyntax {
     let (unexpectedBeforeLeftParen, leftParen) = self.expect(.leftParen)
-    
+
     let (unexpectedBeforeImportPath, importPath) = self.expect(.identifier)
-    
+
     let comma = self.consume(if: .comma)
     var versionTupleExpr: RawTupleExprElementSyntax?
-    
+
     if comma != nil {
       versionTupleExpr = self.parseTupleExprElement(pattern: .none)
-      
-      if versionTupleExpr?.label == nil  {
+
+      if versionTupleExpr?.label == nil {
         versionTupleExpr = RawTupleExprElementSyntax(
           versionTupleExpr?.unexpectedBeforeLabel,
           label: self.missingToken(.identifier),
@@ -2588,11 +2587,11 @@ extension Parser {
           versionTupleExpr?.unexpectedAfterTrailingComma,
           arena: self.arena
         )
-      } else if !["_version", "_underlyingVersion"].map({SyntaxText.init($0)}).contains(versionTupleExpr?.label?.tokenText) {
+      } else if !["_version", "_underlyingVersion"].map({ SyntaxText.init($0) }).contains(versionTupleExpr?.label?.tokenText) {
         versionTupleExpr = RawTupleExprElementSyntax(
-          versionTupleExpr?.unexpectedBeforeLabel,
+          RawUnexpectedNodesSyntax(combining: versionTupleExpr?.unexpectedBeforeLabel, versionTupleExpr?.label, arena: self.arena),
           label: self.missingToken(.identifier),
-          RawUnexpectedNodesSyntax(combining: versionTupleExpr?.unexpectedBetweenLabelAndColon, versionTupleExpr?.label, arena: self.arena), 
+          versionTupleExpr?.unexpectedBetweenLabelAndColon,
           colon: versionTupleExpr?.colon,
           versionTupleExpr?.unexpectedBetweenColonAndExpression,
           expression: versionTupleExpr!.expression,
@@ -2603,9 +2602,9 @@ extension Parser {
         )
       }
     }
-    
+
     let (unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)
-    
+
     return RawExprSyntax(
       RawCanImportExprSyntax(
         canImportKeyword: canImportIdentifierExpr.identifier,

Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift

@@ -13,6 +13,7 @@
 import SwiftDiagnostics
 import SwiftParser
 @_spi(RawSyntax) import SwiftSyntax
+import Foundation
 
 fileprivate func getTokens(between first: TokenSyntax, and second: TokenSyntax) -> [TokenSyntax] {
   var tokens: [TokenSyntax] = []
@@ -513,27 +514,33 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
     }
     return .visitChildren
   }
-  
+
   public override func visit(_ node: CanImportExprSyntax) -> SyntaxVisitorContinueKind {
     if shouldSkip(node) {
       return .skipChildren
     }
-    
+
     if let versionTuple = node.version {
-      
-      let allowedLabel = ["_version", "_underlyingVersion"]
-      guard let label = versionTuple.label,
-            allowedLabel.contains(label.text) else {
+      if let label = versionTuple.label,
+        label.presence == .missing
+      {
         addDiagnostic(
           versionTuple,
           .canImportWrongSecondParameterLabel,
           handledNodes: [versionTuple.id]
         )
-        return .visitChildren
       }
-         
     }
-    
+
+    if let unexpectedBeforeRightParen = node.unexpectedBetweenVersionAndRightParen {
+      addDiagnostic(
+        unexpectedBeforeRightParen,
+        .canImportWrongParameterNumber,
+        handledNodes: [unexpectedBeforeRightParen.id]
+      )
+
+    }
+
     return .visitChildren
   }
 

Tests/SwiftParserTest/Assertions.swift

@@ -12,7 +12,7 @@
 
 import XCTest
 @_spi(RawSyntax) import SwiftSyntax
-@_spi(Testing) @_spi(RawSyntax) import SwiftParser
+@_spi(Testing)@_spi(RawSyntax) import SwiftParser
 @_spi(RawSyntax) import SwiftParserDiagnostics
 import SwiftDiagnostics
 import _SwiftSyntaxTestSupport

Tests/SwiftParserTest/DeclarationTests.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 @_spi(RawSyntax) import SwiftSyntax
-@_spi(Testing) @_spi(RawSyntax) import SwiftParser
+@_spi(Testing)@_spi(RawSyntax) import SwiftParser
 import SwiftSyntaxBuilder
 import SwiftBasicFormat
 import XCTest

Tests/SwiftParserTest/translated/IfconfigExprTests.swift

@@ -330,7 +330,7 @@ final class IfconfigExprTests: XCTestCase {
       #endif
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected value in function call", fixIts: ["insert value"])
+        DiagnosticSpec(message: "2nd parameter of canImport should be labeled as _version or _underlyingVersion")
       ]
     )
   }
@@ -351,12 +351,13 @@ final class IfconfigExprTests: XCTestCase {
   func testIfconfigExpr25() {
     assertParse(
       """
-      #if canImport(A, 2.2, 1.1)
+      #if canImport(A, 1️⃣2.2, 2️⃣1.1)
         let a = 1
       #endif
       """,
       diagnostics: [
-        // TODO: Old parser expected error on line 1: canImport can take only two parameters
+        DiagnosticSpec(locationMarker: "1️⃣", message: "2nd parameter of canImport should be labeled as _version or _underlyingVersion"),
+        DiagnosticSpec(locationMarker: "2️⃣", message: "canImport can take only two parameters"),
       ]
     )
   }
@@ -369,7 +370,7 @@ final class IfconfigExprTests: XCTestCase {
       #endif
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected value in function call", fixIts: ["insert value"])
+        DiagnosticSpec(message: "expected value in 'canImport' expression in if config expression", fixIts: ["insert value"])
       ]
     )
   }