Skip to content

[backport] Use Java rules for member lookup in .java sources#7738

Merged
retronym merged 1 commit intoscala:2.12.xfrom
retronym:backport/7671-java-ident
Feb 19, 2019
Merged

[backport] Use Java rules for member lookup in .java sources#7738
retronym merged 1 commit intoscala:2.12.xfrom
retronym:backport/7671-java-ident

Conversation

@retronym
Copy link
Member

@retronym retronym commented Feb 12, 2019

  • Inherited type declarations are in scope in Java code
  • For static innner classes, we need to check in the companion
    module of each base classes.
  • Incorporate and accomodate test case from Fix scala/bug#10490: Allow Java nested class selection #6053
  • Tests to java code referring to module-class owned classes via companion class prefix

Backport of #7671

@scala-jenkins scala-jenkins added this to the 2.12.9 milestone Feb 12, 2019
@retronym retronym mentioned this pull request Feb 12, 2019
Merged
@retronym
[backport] Use Java rules for member lookup in .java sources
91bf0c7 
 - Inherited type declarations are in scope in Java code
 - For static innner classes, we need to check in the companion
module of each base classes.
 - Incorporate and accomodate test case from scala#6053
 - Tests to java code referring to module-class owned classes via companion class prefix

 Backport of scala#7671
@retronym retronym force-pushed the backport/7671-java-ident branch from dbbb10a to 91bf0c7 Compare February 12, 2019 01:18
@retronym retronym merged commit 9e6ca45 into scala:2.12.x Feb 19, 2019
@SethTisue
Copy link
Member

SethTisue commented Feb 27, 2019 •
edited
Loading

after

-scala_version_default="2.12.9-bin-2e02c9f"  # Feb 18
+scala_version_default="2.12.9-bin-a9337c2"  # Feb 24

over at https://scala-ci.typesafe.com/view/scala-2.12.x/job/scala-2.12.x-integrate-community-build/4194/ I'm seeing

[scalameta] Processing subproject: semanticdbScalacCore
...
[scalameta] [error] /home/jenkins/workspace/scala-2.12.x-integrate-community-build/target-0.9.16/project-builds/scalameta-3061af5e9db99cfa154e3c7d1c3d42cfbe1e0181/semanticdb/scalac/library/src/main/scala-2.12.6/scala/meta/internal/semanticdb/scalac/SemanticdbAnalyzer.scala:389: type mismatch;
[scalameta] [error]  found   : SemanticdbAnalyzer.this.global.gen.global.RefTree
[scalameta] [error]  required: SemanticdbAnalyzer.this.global.Type
[scalameta] [error]           else member(gen.mkAttributedRef(pre, companion), name) // assert(res.isStatic, s"inCompanionJavaStatic($pre, $cls, $name) = $res ${res.debugFlagString}")
[scalameta] [error]                                          ^

and further similar compile errors. I suspect this PR is the culprit

@retronym @olafurpg it looks like SemanticdbAnalyzer will need some changes for 2.12.9?

@retronym retronym mentioned this pull request Feb 27, 2019
Merged
retronym added a commit to retronym/scala that referenced this pull request Jun 19, 2019
@retronym
Test case for fixed Java interop bug
df44d5c 
Fixed in scala#7671, which was backported to 2.12.x in scala#7738
@retronym retronym mentioned this pull request Jun 19, 2019
Merged
@som-snytt som-snytt mentioned this pull request May 17, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

2.12.9

Development

Successfully merging this pull request may close these issues.

3 participants

@retronym @SethTisue @scala-jenkins