Inline firstStringSegment (#133)

dfed · Jan 1, 2025 · 2babda3 · 2babda3
1 parent 238c5a5
commit 2babda3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 38 deletions.
diff --git a/Sources/SafeDICore/Extensions/AttributeSyntaxExtensions.swift b/Sources/SafeDICore/Extensions/AttributeSyntaxExtensions.swift
@@ -75,12 +75,13 @@ extension AttributeSyntax {
 
     public var fulfillingPropertyName: String? {
         guard let fulfilledByDependencyNamed,
-              let stringLiteral = StringLiteralExprSyntax(fulfilledByDependencyNamed)
+              let stringLiteral = StringLiteralExprSyntax(fulfilledByDependencyNamed),
+              case let .stringSegment(firstSegment) = stringLiteral.segments.first
         else {
             return nil
         }
 
-        return stringLiteral.segments.firstStringSegment
+        return firstSegment.content.text
     }
 
     public var fulfilledByType: ExprSyntax? {
@@ -125,9 +126,9 @@ extension AttributeSyntax {
     public var fulfillingTypeDescription: TypeDescription? {
         if let expression = fulfilledByType,
            let stringLiteral = StringLiteralExprSyntax(expression),
-           let firstStringSegement = stringLiteral.segments.firstStringSegment
+           case let .stringSegment(firstSegment) = stringLiteral.segments.first
         {
-            TypeSyntax(stringLiteral: firstStringSegement).typeDescription
+            TypeSyntax(stringLiteral: firstSegment.content.text).typeDescription
         } else {
             ofType?.typeDescription
         }

diff --git a/Sources/SafeDICore/Extensions/StringLiteralSegmentListSyntax.swift b/Sources/SafeDICore/Extensions/StringLiteralSegmentListSyntax.swift
diff --git a/Sources/SafeDIMacros/Macros/InjectableMacro.swift b/Sources/SafeDIMacros/Macros/InjectableMacro.swift
@@ -51,9 +51,9 @@ public struct InjectableMacro: PeerMacro {
 
             if let stringLiteralExpression = StringLiteralExprSyntax(fulfilledByType),
                stringLiteralExpression.segments.count == 1,
-               let stringLiteral = stringLiteralExpression.segments.firstStringSegment
+               case let .stringSegment(stringLiteral) = stringLiteralExpression.segments.first
             {
-                switch TypeSyntax(stringLiteral: stringLiteral).typeDescription {
+                switch TypeSyntax(stringLiteral: stringLiteral.content.text).typeDescription {
                 case .simple, .nested:
                     break
                 case .composition, .optional, .implicitlyUnwrappedOptional, .some, .any, .metatype, .attributed, .array, .dictionary, .tuple, .closure, .unknown, .void: