Fix #4465: Properly call default param getters for nested JS ctors #4502
Conversation
test-suite/js/src/test/scala/org/scalajs/testsuite/jsinterop/NestedJSClassTest.scala
Show resolved
Hide resolved
| val allParamsAndInfos = for { | ||
| (sym, info) <- allParamSyms.zip(jsParamInfos(sym)) | ||
| } yield { | ||
| genVarRef(sym) -> info | ||
| } |
There was a problem hiding this comment.
| val allParamsAndInfos = for { | |
| (sym, info) <- allParamSyms.zip(jsParamInfos(sym)) | |
| } yield { | |
| genVarRef(sym) -> info | |
| } | |
| val allParamsAndInfos = for { | |
| (paramSym, info) <- allParamSyms.zip(jsParamInfos(sym)) | |
| } yield { | |
| genVarRef(paramSym) -> info | |
| } |
The double sym on the left and on the right of <- is confusing.
There was a problem hiding this comment.
I have also renamed sym to ctorSym. It was confusing me as well :P
| if (!trgSym.isLifted) | ||
| genLoadModule(trgSym) | ||
| else | ||
| genNew(trgSym, trgSym.primaryConstructor, captures) |
There was a problem hiding this comment.
I'm pretty sure this is incorrect. We could create several instances of the module per enclosing instance, if we use a new every time. We should use the getter method on the enclosing instance instead. If the enclosing instance is a JS class, that means accessing the property of its JSName; if it is a Scala class, it means calling the Scala method with its name and 0 argument.
There was a problem hiding this comment.
We should add a side-effect in the constructor of the companion object in the tests, and test that it is only applied once per enclosing instance.
|
Uh oh, this sounds more complicated. Shall we postpone this past 1.6.0? |
|
Yes, let's postpone it. |
| val allParamsAndInfos = for { | ||
| (sym, info) <- allParamSyms.zip(jsParamInfos(sym)) | ||
| } yield { | ||
| genVarRef(sym) -> info | ||
| } |
| assert(captures.size == 1, "expected exactly one capture") | ||
|
|
||
| // Find the module accessor. | ||
| val outer = enteringPhase(currentRun.picklerPhase)(trgSym.owner) |
There was a problem hiding this comment.
Does trgSym.originalOwner work? It doesn't require time travel, IIRC.
| val name = enteringPhase(currentRun.typerPhase)(trgSym.unexpandedName) | ||
|
|
||
| val modAccessor = outer.info.members.lookupModule(name) | ||
| val receiver = captures(0) |
There was a problem hiding this comment.
| val receiver = captures(0) | |
| val receiver = captures.head |
?
No description provided.