Enable aliasing a property that is forwarded in at the same level #24
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## dfed--renamed-received-resolution #24 +/- ##
=====================================================================
+ Coverage 99.28% 99.32% +0.03%
=====================================================================
Files 37 38 +1
Lines 8304 8597 +293
=====================================================================
+ Hits 8245 8539 +294
+ Misses 59 58 -1
|
dfed
force-pushed
the
dfed--resolve-received-forwarded-properties
branch
from
0d3ebd4
to
839d704
Compare
dfed
commented
Jan 19, 2024
| @@ -68,13 +68,10 @@ jobs: | |||
| linux: | |||
| name: Build and Test on Linux | |||
| runs-on: ubuntu-latest | |||
| container: swift:5.9 | |||
There was a problem hiding this comment.
following the advice here to avoid this kind of CI failure
dfed
force-pushed
the
dfed--resolve-received-forwarded-properties
branch
2 times, most recently
from
d7fa806
to
5c4ab59
Compare
dfed
commented
Jan 19, 2024
Comment on lines
+266
to
+276
| let forwardedProperties = Set( | ||
| scope | ||
| .instantiable | ||
| .dependencies | ||
| .filter(\.isForwarded) | ||
| .map(\.property) | ||
| ) | ||
| for receivedProperty in scope.receivedProperties { | ||
| let parentContainsProperty = receivableProperties.contains(receivedProperty) | ||
| if !parentContainsProperty { | ||
| let propertyIsForwarded = forwardedProperties.contains(receivedProperty) | ||
| if !parentContainsProperty && !propertyIsForwarded { |
There was a problem hiding this comment.
this is the crux of the change that makes the new tests pass. We were already inspecting properties that were forwarded by a higher-up scope (they're in receivedProperties), but we weren't inspecting the properties in out scope.
dfed
commented
Jan 19, 2024
| case .ifConfigDecl: | ||
| return false | ||
| } | ||
| element.instantiableMacro != nil |
There was a problem hiding this comment.
I simplified our macro access while I was adding associated types to the Dependency.Source enum in order to share this code.
dfed
commented
Jan 19, 2024
| @@ -35,7 +35,7 @@ public enum FixableInstantiableError: DiagnosticError { | |||
| public var description: String { | |||
| switch self { | |||
| case .dependencyHasTooManyAttributes: | |||
| "Dependency can have at most one of @\(Dependency.Source.instantiated), @\(Dependency.Source.received), or @\(Dependency.Source.forwarded) attached macro" | |||
There was a problem hiding this comment.
Dependency.Source is no longer a String-backed enum, so we need to use constants for these raw values now.
|
Closing in favor of #26 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes an issue where we could rename properties that were forwarded in above us, but not at the same level.
Due to our insight in #23 #23 (comment) (the PR on which this depends), I have rewritten
Dependency.Sourceto have a separate case for an alias. By adding associated values to the enum, we were able to remove multiple optional properties and hard-to-keep-track-of tribal knowledge in the codebase.Because we have updated the
Dependency.SourcewhichSafeDIToolmay persist, this PR is a breaking change and we will need to roll to a 0.3.0 when this merges.On top of that, this is a pretty meaty change. I recommend reviewing this change in side-by-side view and turning off whitespace diffs to best understand what we were accomplishing before vs after.