Eliminate 'keyPathInParent usage

Replace with propertyInParent

Author: rintaro

Sources/SwiftIDEUtils/SyntaxClassification.swift

@@ -63,35 +63,35 @@ extension SyntaxClassification {
   ///   - childKind: The node syntax kind.
   /// - Returns: A pair of classification and whether it is "forced", or nil if
   ///   no classification is attached.
-  internal static func classify(_ keyPath: AnyKeyPath) -> (SyntaxClassification, Bool)? {
-    switch keyPath {
-    case \AttributeSyntax.attributeName:
+  internal static func classify(_ property: SyntaxLayoutProperty) -> (SyntaxClassification, Bool)? {
+    switch property {
+    case AttributeSyntax.layout[.attributeName]:
       return (.attribute, true)
-    case \PlatformVersionItemSyntax.platformVersion:
+    case PlatformVersionItemSyntax.layout[.platformVersion]:
       return (.keyword, false)
-    case \AvailabilityVersionRestrictionSyntax.platform:
+    case PlatformVersionSyntax.layout[.platform]:
       return (.keyword, false)
-    case \DeclModifierSyntax.name:
+    case DeclModifierSyntax.layout[.name]:
       return (.attribute, false)
-    case \IfConfigClauseSyntax.poundKeyword:
+    case IfConfigClauseSyntax.layout[.poundKeyword]:
       return (.ifConfigDirective, false)
-    case \IfConfigClauseSyntax.condition:
+    case IfConfigClauseSyntax.layout[.condition]:
       return (.ifConfigDirective, false)
-    case \IfConfigDeclSyntax.poundEndif:
+    case IfConfigDeclSyntax.layout[.poundEndif]:
       return (.ifConfigDirective, false)
-    case \MemberTypeIdentifierSyntax.name:
+    case MemberTypeSyntax.layout[.name]:
       return (.type, false)
-    case \OperatorDeclSyntax.name:
+    case OperatorDeclSyntax.layout[.name]:
       return (.operator, false)
-    case \PrecedenceGroupAssociativitySyntax.associativityLabel:
+    case PrecedenceGroupAssociativitySyntax.layout[.associativityLabel]:
       return (.keyword, false)
-    case \PrecedenceGroupRelationSyntax.higherThanOrLowerThanLabel:
+    case PrecedenceGroupRelationSyntax.layout[.higherThanOrLowerThanLabel]:
       return (.keyword, false)
-    case \SimpleTypeIdentifierSyntax.name:
+    case IdentifierTypeSyntax.layout[.name]:
       return (.type, false)
-    case \FunctionParameterSyntax.firstName:
+    case FunctionParameterSyntax.layout[.firstName]:
       return (.argumentLabel, false)
-    case \LabeledExprSyntax.label:
+    case LabeledExprSyntax.layout[.label]:
       return (.argumentLabel, false)
     default:
       return nil

Sources/SwiftIDEUtils/SyntaxClassifier.swift

@@ -21,8 +21,8 @@ fileprivate extension SyntaxProtocol {
     var contextualClassif: (SyntaxClassification, Bool)? = nil
     var curData = Syntax(self)
     repeat {
-      guard let parent = curData.parent, let keyPath = curData.keyPathInParent else { break }
-      contextualClassif = SyntaxClassification.classify(keyPath)
+      guard let parent = curData.parent, let property = curData.propertyInParent else { break }
+      contextualClassif = SyntaxClassification.classify(property)
       curData = parent
     } while contextualClassif == nil
     return contextualClassif
@@ -202,11 +202,8 @@ private struct ClassificationVisitor {
     for case (let index, let child?) in children.enumerated() {
 
       let classification: (classification: SyntaxClassification, force: Bool)?
-      if case .layout(let layout) = descriptor.node.kind.syntaxNodeType.structure {
-        classification = SyntaxClassification.classify(layout[index])
-      } else {
-        classification = nil
-      }
+      let property = SyntaxLayoutProperty(baseKind: child.kind, index: .init(UInt32(index)))
+      classification = SyntaxClassification.classify(property)
 
       if let classification, classification.force {
         // Leading trivia.

Sources/SwiftSyntax/SyntaxLayout.swift

@@ -13,7 +13,7 @@
 /// Represent an index in a layout.
 public struct SyntaxLayoutIndex: Equatable, Comparable {
   let value: UInt32
-  init(_ value: UInt32) {
+  public init(_ value: UInt32) {
     self.value = value
   }
   public static func == (lhs: Self, rhs: Self) -> Bool {
@@ -31,7 +31,7 @@ public struct SyntaxLayoutProperty: Equatable {
   /// Index in the parent node layout.
   let index: SyntaxLayoutIndex
 
-  init(baseKind: SyntaxKind, index: SyntaxLayoutIndex) {
+  public init(baseKind: SyntaxKind, index: SyntaxLayoutIndex) {
     self.baseKind = baseKind
     self.index = index
   }