Repository navigation
Sync fork with upstream main and preserve Android resolver fixes - #14
Merged
Merged
Conversation
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.
Scope
Bring fork
main(61224b6) up to upstreammain(e63fe2e) in a separate integration branch. This includes the current upstream PR colbymchenry#1927, colbymchenry#1928, and colbymchenry#1929 changes already maintained in this fork, while retaining the Java static-field work from upstream colbymchenry#1949 and the fork's Kotlin follow-up. Forkmainis unchanged until this PR passes CI and is reviewed.Conflict resolution
name-matcher.ts.function_ref) throughresolveMethodOnType; the calls-only guard broke two Go method-value cases in the integrated tree.Validation
function-ref.test.ts: 31 passed after the Go fix.e1f3c2a92be8aa8b2f853d7d3175955efbe18a1ewith this branch. The citedInteger.TYPE.equalsandXMLConstants.DEFAULT_NS_PREFIX.equalslocations have no incorrect call edge. This source set does not establish the vendor SystemUI 37-row diff; the request for that diff and its boundaries remains open on upstream fix(java): resolve calls through static fields colbymchenry/codegraph#1949.Please keep this PR open until its Node 22/24 and native AOSP checks complete.