Merge pull request #1256 from eed3si9n/revert/flatten

Revert "Get fullName post flatten, to get flatten names"

internal/compiler-bridge/src/main/scala/xsbt/CallbackGlobal.scala

@@ -242,7 +242,7 @@ sealed class ZincCompiler(settings: Settings, dreporter: DelegatingReporter, out
       }
       ()
     }
-    exitingFlatten(loop(suffix.length(), symbol))
+    loop(suffix.length(), symbol)
     b.append(suffix)
     b.toString
   }

internal/compiler-bridge/src/main/scala_2.10/xsbt/Compat.scala

@@ -15,7 +15,7 @@ import java.io.PrintWriter
 import xsbti.compile.Output
 import scala.reflect.{ internal => sri }
 import scala.reflect.internal.{ util => sriu }
-import scala.tools.nsc.{ Global, Phase, Settings }
+import scala.tools.nsc.{ Global, Settings }
 import scala.tools.nsc.interactive.RangePositions
 import scala.tools.nsc.symtab.Flags, Flags._
 
@@ -150,8 +150,7 @@ abstract class Compat {
 }
 
 /** Defines compatibility utils for [[ZincCompiler]]. */
-trait ZincGlobalCompat { g: Global =>
-  @inline final def exitingFlatten[T](op: => T): T = atPhase(currentRun.flattenPhase.next)(op)
+trait ZincGlobalCompat {
 
   /** Use `dropRun` only in 2.10.x series. It was removed as of 2.11.0. */
   protected def superDropRun(): Unit = {

internal/zinc-scripted/src/test/scala/sbt/internal/inc/IncHandler.scala

@@ -232,9 +232,6 @@ class IncHandler(directory: Path, cacheDir: Path, scriptedLog: ManagedLogger, co
     onArgs("checkProducts") {
       case (p, src :: products, i) => p.checkProducts(i, dropRightColon(src), products)
     },
-    onArgs("checkProductsExists") {
-      case (p, src :: Nil, i) => p.checkProductsExist(i, src)
-    },
     onArgs("checkDependencies") {
       case (p, cls :: dependencies, i) => p.checkDependencies(i, dropRightColon(cls), dependencies)
     },
@@ -444,32 +441,28 @@ case class ProjectStructure(
       ()
     }
 
-  def getProducts(analysis: Analysis)(srcFile: String): Set[VirtualFileRef] =
-    analysis.relations.products(converter.toVirtualFile(baseDirectory / srcFile))
-
   def checkProducts(i: IncState, src: String, expected: List[String]): Future[Unit] =
     compile(i).map { analysis =>
+      // def isWindows: Boolean = sys.props("os.name").toLowerCase.startsWith("win")
+      // def relativeClassDir(f: File): File = f.relativeTo(classesDir) getOrElse f
+      // def normalizePath(path: String): String = {
+      //   if (isWindows) path.replace('\\', '/') else path
+      // }
+      def products(srcFile: String): Set[String] = {
+        val productFiles = analysis.relations.products(converter.toVirtualFile(baseDirectory / src))
+        productFiles.map { file: VirtualFileRef =>
+          // if (JarUtils.isClassInJar(file)) {
+          //   JarUtils.ClassInJar.fromPath(output.toPath).toClassFilePath
+          // } else {
+          //   normalizePath(relativeClassDir(file).getPath)
+          // }
+          file.id
+        }
+      }
       def assertClasses(expected: Set[String], actual: Set[String]) =
-        assert(
-          expected == actual,
-          s"""Mismatch:
-             |Expected:${expected.map("\n  " + _).mkString}
-             |Obtained:${actual.map("\n  " + _).mkString}""".stripMargin
-        )
+        assert(expected == actual, s"Expected $expected products, got $actual")
 
-      assertClasses(expected.toSet, getProducts(analysis)(src).map(_.id))
-      ()
-    }
-
-  def checkProductsExist(i: IncState, src: String): Future[Unit] =
-    compile(i).map { analysis =>
-      val missing =
-        for (p <- getProducts(analysis)(src).toList if !Files.exists(converter.toPath(p))) yield p
-      assert(
-        missing.isEmpty,
-        s"""Missing ${missing.size} products:${missing.map("\n  " + _).mkString}
-           |Generated:${generatedClassFiles.get.toList.map("\n  " + _).mkString}""".stripMargin
-      )
+      assertClasses(expected.toSet, products(src))
       ()
     }