Skip to content

Commit

Permalink
Fix extraction of source <-> class mappings for Java
Browse files Browse the repository at this point in the history
This was in the original, to-upstream source, but it got lost somewhere.
  • Loading branch information
dwijnand committed Aug 11, 2020
1 parent 2b2f8b9 commit e085744
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 1 deletion.
2 changes: 1 addition & 1 deletion internal/compiler-bridge/src/main/scala/xsbt/API.scala
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ final class API(val global: CallbackGlobal) extends Compat with GlobalHelpers wi
!ignoredSymbol(sym) &&
sym.isStatic &&
!sym.isImplClass &&
!sym.hasFlag(Flags.JAVA) &&
(!sym.hasFlag(Flags.JAVA) || global.callback.isPickleJava) &&
!sym.isNestedClass
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"projects": [
{
"name": "use",
"dependsOn": [
"dep"
],
"scalaVersion": "2.13.3"
},
{
"name": "dep",
"scalaVersion": "2.13.3"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package example

object B {
val y = A.x + 1
def main(args: Array[String]): Unit = println(y)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package example

object Other {
def z = 1
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package example;

public class A {
public static int x() { return 3; }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pipelining = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# base-line
> use/compile
$ sleep 1000

# 1. make dep recompile something other than A
# 2. make use recompile, needing a pickle for A
$ copy-file changes/Other.scala dep/Other.scala
$ copy-file changes/B2.scala use/B.scala
> use/compile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package example

object B {
val y = A.x
def main(args: Array[String]): Unit = println(y)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pipelining = true

0 comments on commit e085744

Please sign in to comment.