Run Scalafix and Scalafmt

Author: olafurpg

lsif-java/src/main/scala/com/sourcegraph/lsif_java/buildtools/LsifBuildTool.scala

@@ -1,6 +1,8 @@
 package com.sourcegraph.lsif_java.buildtools
 
-import java.io.{File, FileOutputStream, IOException}
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
 import java.net.URLClassLoader
 import java.nio.file.FileSystems
 import java.nio.file.FileVisitResult
@@ -16,14 +18,19 @@ import java.util.Collections
 import java.util.Optional
 import java.util.ServiceLoader
 import java.util.concurrent.TimeUnit
+import java.util.jar.JarFile
+
 import scala.collection.mutable.ListBuffer
 import scala.jdk.CollectionConverters._
+import scala.language.postfixOps
 import scala.util.Failure
 import scala.util.Success
 import scala.util.Try
 import scala.util.control.NonFatal
+
 import scala.meta.pc.PresentationCompiler
 import scala.meta.pc.PresentationCompilerConfig
+
 import com.sourcegraph.io.DeleteVisitor
 import com.sourcegraph.lsif_java.BuildInfo
 import com.sourcegraph.lsif_java.Dependencies
@@ -44,21 +51,16 @@ import moped.reporters.Diagnostic
 import moped.reporters.Input
 import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
 import org.jetbrains.kotlin.cli.common.arguments.ParseCommandLineArgumentsKt.parseCommandLineArguments
-import org.jetbrains.kotlin.cli.common.messages.{
-  CompilerMessageSeverity,
-  CompilerMessageSourceLocation,
-  MessageCollector,
-  MessageRenderer
-}
+import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
+import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation
+import org.jetbrains.kotlin.cli.common.messages.MessageCollector
+import org.jetbrains.kotlin.cli.common.messages.MessageRenderer
 import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
 import org.jetbrains.kotlin.config.Services
 import os.CommandResult
 import os.ProcessOutput.Readlines
 import os.SubprocessException
 
-import java.util.jar.JarFile
-import scala.language.postfixOps
-
 /**
  * A custom build tool that is specifically made for lsif-java.
  *

lsif-java/src/main/scala/com/sourcegraph/lsif_java/commands/IndexDependencyCommand.scala

@@ -9,13 +9,13 @@ import java.nio.file.StandardOpenOption
 import java.util.jar.JarFile
 
 import com.sourcegraph.io.AbsolutePath
+import com.sourcegraph.io.DeleteVisitor
 import com.sourcegraph.lsif_java.Dependencies
 import com.sourcegraph.lsif_semanticdb.JavaVersion
-import moped.cli.Command
-import moped.cli.CommandParser
 import moped.annotations.DeprecatedName
 import moped.annotations.Hidden
-import com.sourcegraph.io.DeleteVisitor
+import moped.cli.Command
+import moped.cli.CommandParser
 
 final case class IndexDependencyCommand(
     @DeprecatedName("target", "Use --output instead", "0.6.10") output: Path =

semanticdb-java/src/main/protobuf/semanticdb.proto

@@ -33,7 +33,7 @@ enum Language {
   UNKNOWN_LANGUAGE = 0;
   SCALA = 1;
   JAVA = 2;
-  KOTLIN =3;
+  KOTLIN = 3;
 }
 
 message Range {

tests/snapshots/src/main/scala/tests/LibrarySnapshotGenerator.scala

@@ -1,32 +1,23 @@
 package tests
 
+import java.io.ByteArrayOutputStream
+import java.io.PrintStream
 import java.nio.charset.StandardCharsets
 import java.nio.file.FileSystems
+import java.nio.file.FileVisitResult
 import java.nio.file.Files
 import java.nio.file.Path
-import java.util.concurrent.atomic.AtomicInteger
+import java.nio.file.SimpleFileVisitor
+import java.nio.file.attribute.BasicFileAttributes
 
 import scala.util.Properties
 
-import scala.meta.inputs.Input
-import scala.meta.internal.io.FileIO
-import scala.meta.io.AbsolutePath
-
-import com.sourcegraph.io.DeleteVisitor
-import com.sourcegraph.lsif_java.Dependencies
-import com.sourcegraph.lsif_java.SemanticdbPrinters
 import com.sourcegraph.lsif_java.LsifJava
-import java.nio.file.SimpleFileVisitor
-import java.nio.file.FileVisitResult
-import java.nio.file.attribute.BasicFileAttributes
-import java.io.PrintStream
-import java.io.ByteArrayOutputStream
 import moped.reporters.ConsoleReporter
 
 class LibrarySnapshotGenerator extends SnapshotGenerator {
   val scalaPattern = FileSystems.getDefault.getPathMatcher("glob:**.scala")
   val javaPattern = FileSystems.getDefault.getPathMatcher("glob:**.java")
-  private case class IndexMetrics(occurrenceCount: Int, linesOfCode: Int)
   def runLsifJava(arguments: List[String]): Unit = {
     val baos = new ByteArrayOutputStream
     val exitCode = LsifJava
@@ -48,11 +39,7 @@ class LibrarySnapshotGenerator extends SnapshotGenerator {
 
   override def run(context: SnapshotContext, handler: SnapshotHandler): Unit = {
     val gen = new Gen(context, handler)
-    gen.checkLibrary(
-      "com.airbnb.android:epoxy:4.3.1"
-      // isIncluded = jar => jar.contains("epoxy")
-    )
-    // gen.checkLibrary("org.jetbrains.kotlin:kotlin-allopen:1.4.32")
+    gen.checkLibrary("com.airbnb.android:epoxy:4.3.1")
     gen.checkLibrary(
       "com.lihaoyi:ujson_2.13:1.4.0",
       provided = List(
@@ -93,67 +80,6 @@ class LibrarySnapshotGenerator extends SnapshotGenerator {
           }
         }
       )
-      // Files.walkFileTree(indexDir, new DeleteVisitor())
-      // Files.walkFileTree(snapshotDir, new DeleteVisitor())
-      // val deps = Dependencies.resolveDependencies(name :: provided)
-      // val counter = new AtomicInteger()
-
-      // val compiler =
-      //   new TestCompiler(
-      //     deps.classpathSyntax,
-      //     javacOptions = List("-Xlint:none"),
-      //     scalacOptions = Nil,
-      //     targetroot
-      //   )
-      // val timer = new Timer()
-      // val toIndex = deps.sources.filter(p => isIncluded(p.getFileName.toString))
-      // toIndex.foreach { source =>
-      //   val metrics = compileSourcesJar(source, compiler)
-      //   val i = counter.incrementAndGet()
-      //   val message =
-      //     f"$i%3s/${toIndex.size} jars; $timer%6s; " +
-      //       f"${metrics.occurrenceCount}%,.0f occurrences; " +
-      //       f"${metrics.linesOfCode}%,.0f loc; " + f"${source.getFileName}"
-      //   println(message)
-      // }
-    }
-
-    private def compileSourcesJar(
-        source: Path,
-        compiler: TestCompiler
-    ): IndexMetrics = {
-      var occurrenceCount, linesOfCode = 0
-      FileIO
-        .withJarFileSystem(AbsolutePath(source), create = false, close = true) {
-          root =>
-            val inputs =
-              FileIO
-                .listAllFilesRecursively(root)
-                .iterator
-                .filter(file =>
-                  javaPattern.matches(file.toNIO) ||
-                    scalaPattern.matches(file.toNIO)
-                )
-                .map { file =>
-                  val relpath = file.toRelative(root).toString()
-                  val text = FileIO.slurp(file, StandardCharsets.UTF_8)
-                  linesOfCode += text.linesIterator.size
-                  Input.VirtualFile(relpath, text)
-                }
-                .toArray
-
-            val result = compiler.compileSemanticdb(inputs)
-            result
-              .textDocuments
-              .getDocumentsList
-              .forEach { textDocument =>
-                occurrenceCount += textDocument.getOccurrencesCount
-                val print = SemanticdbPrinters.printTextDocument(textDocument)
-                val out = context.expectDirectory.resolve(textDocument.getUri)
-                handler.onSnapshotTest(context, out, () => print)
-              }
-        }
-      IndexMetrics(occurrenceCount, linesOfCode)
     }
   }
 }