Merge pull request #31 from p-x9/feature/literal-type-inference

Author: p-x9

Package.resolved

@@ -1,5 +1,14 @@
 {
   "pins" : [
+    {
+      "identity" : "swift-literal-type-inference",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/p-x9/swift-literal-type-inference.git",
+      "state" : {
+        "revision" : "d4c97a7e48d3fab0c4575641c9a257602c1d17b7",
+        "version" : "0.1.0"
+      }
+    },
     {
       "identity" : "swift-macro-testing",
       "kind" : "remoteSourceControl",

Package.swift

@@ -20,6 +20,10 @@ let package = Package(
             url: "https://github.com/apple/swift-syntax.git",
             from: "509.0.0"
         ),
+        .package(
+            url: "https://github.com/p-x9/swift-literal-type-inference.git",
+            from: "0.1.0"
+        ),
         .package(
             url: "https://github.com/pointfreeco/swift-macro-testing.git",
             from: "0.2.2"
@@ -44,13 +48,18 @@ let package = Package(
                 .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
                 .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
                 .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
-                .product(name: "SwiftParserDiagnostics", package: "swift-syntax")
+                .product(name: "SwiftParserDiagnostics", package: "swift-syntax"),
+                .product(
+                    name: "LiteralTypeInference",
+                    package: "swift-literal-type-inference"
+                )
             ]
         ),
         .testTarget(
             name: "AssociatedObjectTests",
             dependencies: [
                 "AssociatedObject",
+                "AssociatedObjectPlugin",
                 .product(name: "SwiftSyntax", package: "swift-syntax"),
                 .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
                 .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),

Sources/AssociatedObjectPlugin/AssociatedObjectMacro.swift

@@ -9,6 +9,7 @@
 import SwiftSyntax
 import SwiftSyntaxBuilder
 import SwiftSyntaxMacros
+import LiteralTypeInference
 
 public struct AssociatedObjectMacro {}
 
@@ -41,7 +42,7 @@ extension AssociatedObjectMacro: PeerMacro {
         }
 
         let defaultValue = binding.initializer?.value
-        let type: TypeSyntax? = binding.typeAnnotation?.type ?? defaultValue?.detectedTypeByLiteral
+        let type: TypeSyntax? = binding.typeAnnotation?.type ?? defaultValue?.inferredType
 
         guard let type else {
             //  Explicit specification of type is required
@@ -148,9 +149,9 @@ extension AssociatedObjectMacro: AccessorMacro {
         if let specifiedType = binding.typeAnnotation?.type {
             //  TypeAnnotation
             type = specifiedType
-        } else if let detectedType = defaultValue?.detectedTypeByLiteral {
-            //  TypeDetection
-            type = detectedType
+        } else if let inferredType = defaultValue?.inferredType {
+            //  infer type of defaultValue
+            type = inferredType
         } else {
             //  Explicit specification of type is required
             context.diagnose(AssociatedObjectMacroDiagnostic.specifyTypeExplicitly.diagnose(at: identifier))