diff --git a/build.sbt b/build.sbt index 677dd992b..18f3fd867 100644 --- a/build.sbt +++ b/build.sbt @@ -112,7 +112,7 @@ lazy val gradlePlugin = project .settings( name := "semanticdb-gradle", scalaVersion := V.scala213, - buildInfoPackage := "com.sourcegraph.scip_java", + buildInfoPackage := "com.sourcegraph.internal.scip_java", publish / skip := true, javaToolchainVersion := "8", scalacOptions ++= Seq("-target:8", "-release", "8"), @@ -245,7 +245,7 @@ lazy val cli = project "minimalMillVersion" -> V.minimalMillVersion, "millScipVersion" -> V.millScipVersion ), - buildInfoPackage := "com.sourcegraph.scip_java", + buildInfoPackage := "com.sourcegraph.internal.scip_java", libraryDependencies ++= List( "io.get-coursier" %% "coursier" % V.coursier, diff --git a/scip-java-proto/src/main/protobuf/scip.proto b/scip-java-proto/src/main/protobuf/scip.proto index 6504ad740..c9a0dfb4f 100644 --- a/scip-java-proto/src/main/protobuf/scip.proto +++ b/scip-java-proto/src/main/protobuf/scip.proto @@ -13,7 +13,7 @@ syntax = "proto3"; package lib.codeintel.scip; option go_package = "github.com/sourcegraph/sourcegraph/lib/codeintel/scip/"; -option java_package = "com.sourcegraph"; +option java_package = "com.sourcegraph.internal"; // Index represents a complete SCIP index for a workspace this is rooted at a // single directory. An Index message payload can have a large memory footprint diff --git a/scip-java/src/main/scala/com/sourcegraph/io/AbsolutePath.scala b/scip-java/src/main/scala/com/sourcegraph/internal/io/AbsolutePath.scala similarity index 92% rename from scip-java/src/main/scala/com/sourcegraph/io/AbsolutePath.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/io/AbsolutePath.scala index 80e771744..0109b4337 100644 --- a/scip-java/src/main/scala/com/sourcegraph/io/AbsolutePath.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/io/AbsolutePath.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.io +package com.sourcegraph.internal.io import java.nio.file.Path import java.nio.file.Paths diff --git a/scip-java/src/main/scala/com/sourcegraph/io/AutoDeletedFile.scala b/scip-java/src/main/scala/com/sourcegraph/internal/io/AutoDeletedFile.scala similarity index 96% rename from scip-java/src/main/scala/com/sourcegraph/io/AutoDeletedFile.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/io/AutoDeletedFile.scala index 2574e0f77..8dc1c8c96 100644 --- a/scip-java/src/main/scala/com/sourcegraph/io/AutoDeletedFile.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/io/AutoDeletedFile.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.io +package com.sourcegraph.internal.io import java.nio.charset.StandardCharsets import java.nio.file.Files diff --git a/scip-java/src/main/scala/com/sourcegraph/io/DeleteVisitor.scala b/scip-java/src/main/scala/com/sourcegraph/internal/io/DeleteVisitor.scala similarity index 97% rename from scip-java/src/main/scala/com/sourcegraph/io/DeleteVisitor.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/io/DeleteVisitor.scala index 24344652c..dff41010c 100644 --- a/scip-java/src/main/scala/com/sourcegraph/io/DeleteVisitor.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/io/DeleteVisitor.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.io +package com.sourcegraph.internal.io import java.io.IOException import java.nio.file.FileVisitResult diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/Dependencies.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/Dependencies.scala similarity index 99% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/Dependencies.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/Dependencies.scala index 2d6629085..acae0ee37 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/Dependencies.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/Dependencies.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java +package com.sourcegraph.internal.scip_java import java.io.File import java.nio.file.Path diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/Embedded.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/Embedded.scala similarity index 97% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/Embedded.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/Embedded.scala index 757bdd4c2..954c2f6bb 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/Embedded.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/Embedded.scala @@ -1,11 +1,11 @@ -package com.sourcegraph.scip_java +package com.sourcegraph.internal.scip_java import java.nio.charset.StandardCharsets import java.nio.file.Files import java.nio.file.Path import java.nio.file.StandardCopyOption -import com.sourcegraph.scip_java.BuildInfo +import com.sourcegraph.internal.scip_java.BuildInfo import moped.reporters.Reporter import os.CommandResult diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/ScipPrinters.scala similarity index 96% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/ScipPrinters.scala index eb73e1eff..1dea6f317 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/ScipPrinters.scala @@ -1,12 +1,12 @@ -package com.sourcegraph.scip_java +package com.sourcegraph.internal.scip_java import scala.collection.mutable import scala.jdk.CollectionConverters.CollectionHasAsScala import scala.math.Ordering.Implicits.seqOrdering -import com.sourcegraph.Scip -import com.sourcegraph.Scip.SymbolRole -import com.sourcegraph.scip_java.commands.CommentSyntax +import com.sourcegraph.internal.Scip +import com.sourcegraph.internal.Scip.SymbolRole +import com.sourcegraph.internal.scip_java.commands.CommentSyntax import moped.reporters.Input import moped.reporters.Position diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipSymbol.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/ScipSymbol.scala similarity index 88% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/ScipSymbol.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/ScipSymbol.scala index 2ab5e2b1f..7a00491ff 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipSymbol.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/ScipSymbol.scala @@ -1,7 +1,7 @@ -package com.sourcegraph.scip_java +package com.sourcegraph.internal.scip_java -import com.sourcegraph.scip_semanticdb.SymbolDescriptor -import com.sourcegraph.semanticdb_javac.SemanticdbSymbols +import com.sourcegraph.internal.scip_semanticdb.SymbolDescriptor +import com.sourcegraph.internal.semanticdb_javac.SemanticdbSymbols sealed abstract class ScipSymbol {} final case class LocalScipSymbol(identifier: String) extends ScipSymbol diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BazelBuildTool.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/BazelBuildTool.scala similarity index 97% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BazelBuildTool.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/BazelBuildTool.scala index a9918b73b..46196552b 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BazelBuildTool.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/BazelBuildTool.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java.buildtools +package com.sourcegraph.internal.scip_java.buildtools import java.nio.charset.StandardCharsets import java.nio.file.FileSystems @@ -11,9 +11,9 @@ import java.nio.file.attribute.BasicFileAttributes import scala.collection.mutable.ListBuffer -import com.sourcegraph.io.AbsolutePath -import com.sourcegraph.scip_java.Embedded -import com.sourcegraph.scip_java.commands.IndexCommand +import com.sourcegraph.internal.io.AbsolutePath +import com.sourcegraph.internal.scip_java.Embedded +import com.sourcegraph.internal.scip_java.commands.IndexCommand import moped.cli.Application import os.ProcessOutput.Readlines diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BuildTool.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/BuildTool.scala similarity index 95% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BuildTool.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/BuildTool.scala index c8e671763..528a29d1d 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BuildTool.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/BuildTool.scala @@ -1,9 +1,9 @@ -package com.sourcegraph.scip_java.buildtools +package com.sourcegraph.internal.scip_java.buildtools import java.nio.file.Files import java.nio.file.Path -import com.sourcegraph.scip_java.commands.IndexCommand +import com.sourcegraph.internal.scip_java.commands.IndexCommand import os.CommandResult /** diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ClasspathEntry.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/ClasspathEntry.scala similarity index 97% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ClasspathEntry.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/ClasspathEntry.scala index b7caebcd1..43799ba2e 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ClasspathEntry.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/ClasspathEntry.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java.buildtools +package com.sourcegraph.internal.scip_java.buildtools import java.io.File import java.nio.charset.StandardCharsets @@ -9,7 +9,7 @@ import java.nio.file.Paths import scala.annotation.tailrec import scala.jdk.CollectionConverters._ -import com.sourcegraph.scip_semanticdb.MavenPackage +import com.sourcegraph.internal.scip_semanticdb.MavenPackage /** * Represents a single classpath entry on the classpath of a project, used to diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/GradleBuildTool.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/GradleBuildTool.scala similarity index 91% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/GradleBuildTool.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/GradleBuildTool.scala index 7d69fb24f..2073cc577 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/GradleBuildTool.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/GradleBuildTool.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java.buildtools +package com.sourcegraph.internal.scip_java.buildtools import java.nio.charset.StandardCharsets import java.nio.file._ @@ -6,10 +6,10 @@ import java.nio.file._ import scala.collection.mutable.ListBuffer import scala.util.Properties -import com.sourcegraph.io.DeleteVisitor -import com.sourcegraph.scip_java.BuildInfo -import com.sourcegraph.scip_java.Embedded -import com.sourcegraph.scip_java.commands.IndexCommand +import com.sourcegraph.internal.io.DeleteVisitor +import com.sourcegraph.internal.scip_java.BuildInfo +import com.sourcegraph.internal.scip_java.Embedded +import com.sourcegraph.internal.scip_java.commands.IndexCommand import os.CommandResult class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) { @@ -111,7 +111,7 @@ class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) { | } | } | - | import com.sourcegraph.gradle.semanticdb.SemanticdbGradlePlugin + | import com.sourcegraph.internal.gradle.semanticdb.SemanticdbGradlePlugin | | allprojects { | project.extra["semanticdbTarget"] = "$targetroot" diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/GradleJavaCompiler.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/GradleJavaCompiler.scala similarity index 96% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/GradleJavaCompiler.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/GradleJavaCompiler.scala index 7e6eeeaf9..ac859948e 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/GradleJavaCompiler.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/GradleJavaCompiler.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java.buildtools +package com.sourcegraph.internal.scip_java.buildtools import java.nio.charset.StandardCharsets import java.nio.file.Files @@ -9,8 +9,8 @@ import java.nio.file.StandardCopyOption import scala.collection.mutable.ListBuffer -import com.sourcegraph.scip_java.Embedded -import com.sourcegraph.scip_java.commands.IndexCommand +import com.sourcegraph.internal.scip_java.Embedded +import com.sourcegraph.internal.scip_java.commands.IndexCommand /** * Metadata about the Java compiler that is used by a Gradle build. diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/GradleJavaToolchains.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/GradleJavaToolchains.scala similarity index 97% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/GradleJavaToolchains.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/GradleJavaToolchains.scala index f318687ed..a3b469f2e 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/GradleJavaToolchains.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/GradleJavaToolchains.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java.buildtools +package com.sourcegraph.internal.scip_java.buildtools import java.nio.charset.StandardCharsets import java.nio.file.Files @@ -7,8 +7,8 @@ import java.nio.file.Path import scala.annotation.tailrec import scala.jdk.CollectionConverters._ -import com.sourcegraph.scip_java.Embedded -import com.sourcegraph.scip_java.commands.IndexCommand +import com.sourcegraph.internal.scip_java.Embedded +import com.sourcegraph.internal.scip_java.commands.IndexCommand import org.intellij.lang.annotations.Language case class GradleJavaToolchains( diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/MavenBuildTool.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/MavenBuildTool.scala similarity index 93% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/MavenBuildTool.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/MavenBuildTool.scala index f03230904..8e87de567 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/MavenBuildTool.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/MavenBuildTool.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java.buildtools +package com.sourcegraph.internal.scip_java.buildtools import java.nio.file.Files import java.nio.file.Path @@ -6,8 +6,8 @@ import java.nio.file.Paths import scala.collection.mutable.ListBuffer -import com.sourcegraph.scip_java.Embedded -import com.sourcegraph.scip_java.commands.IndexCommand +import com.sourcegraph.internal.scip_java.Embedded +import com.sourcegraph.internal.scip_java.commands.IndexCommand import os.CommandResult class MavenBuildTool(index: IndexCommand) extends BuildTool("Maven", index) { diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/MillBuildTool.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/MillBuildTool.scala similarity index 95% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/MillBuildTool.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/MillBuildTool.scala index 03fc4f356..ff274d80e 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/MillBuildTool.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/MillBuildTool.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java.buildtools +package com.sourcegraph.internal.scip_java.buildtools import java.nio.file.Files import java.nio.file.Path @@ -7,8 +7,8 @@ import java.nio.file.StandardCopyOption import scala.jdk.CollectionConverters._ import scala.util.Properties -import com.sourcegraph.scip_java.BuildInfo -import com.sourcegraph.scip_java.commands.IndexCommand +import com.sourcegraph.internal.scip_java.BuildInfo +import com.sourcegraph.internal.scip_java.commands.IndexCommand class MillBuildTool(index: IndexCommand) extends BuildTool("mill", index) { diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/SbtBuildTool.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/SbtBuildTool.scala similarity index 92% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/SbtBuildTool.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/SbtBuildTool.scala index 8ac28d71a..1abd21f57 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/SbtBuildTool.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/SbtBuildTool.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java.buildtools +package com.sourcegraph.internal.scip_java.buildtools import java.nio.file.Files import java.nio.file.StandardCopyOption @@ -6,9 +6,9 @@ import java.util.Properties import scala.util.Using -import com.sourcegraph.io.AutoDeletedFile -import com.sourcegraph.scip_java.BuildInfo -import com.sourcegraph.scip_java.commands.IndexCommand +import com.sourcegraph.internal.io.AutoDeletedFile +import com.sourcegraph.internal.scip_java.BuildInfo +import com.sourcegraph.internal.scip_java.commands.IndexCommand class SbtBuildTool(index: IndexCommand) extends BuildTool("sbt", index) { override def usedInCurrentDirectory(): Boolean = { diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScalaCompilerClassLoader.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/ScalaCompilerClassLoader.scala similarity index 95% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScalaCompilerClassLoader.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/ScalaCompilerClassLoader.scala index 89c2118fd..5084453bd 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScalaCompilerClassLoader.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/ScalaCompilerClassLoader.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java.buildtools +package com.sourcegraph.internal.scip_java.buildtools // Copied from: https://github.com/scalameta/metals/blob/3c83447ec658f87fdccbfb3f0a39fca1cec4ef6e/metals/src/main/scala/scala/meta/internal/metals/PresentationCompilerClassLoader.scala /** diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScalaVersion.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/ScalaVersion.scala similarity index 94% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScalaVersion.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/ScalaVersion.scala index 9f49c1cf7..2037f2ddb 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScalaVersion.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/ScalaVersion.scala @@ -1,8 +1,8 @@ -package com.sourcegraph.scip_java.buildtools +package com.sourcegraph.internal.scip_java.buildtools import java.nio.file.Path -import com.sourcegraph.scip_java.BuildInfo +import com.sourcegraph.internal.scip_java.BuildInfo object ScalaVersion { diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScipBuildTool.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/ScipBuildTool.scala similarity index 98% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScipBuildTool.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/ScipBuildTool.scala index 19e32596c..b874212cf 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScipBuildTool.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/ScipBuildTool.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java.buildtools +package com.sourcegraph.internal.scip_java.buildtools import java.io.File import java.io.FileOutputStream @@ -32,14 +32,14 @@ import scala.util.control.NonFatal import scala.meta.pc.PresentationCompiler import scala.meta.pc.PresentationCompilerConfig -import com.sourcegraph.io.AbsolutePath -import com.sourcegraph.io.DeleteVisitor -import com.sourcegraph.scip_java.BuildInfo -import com.sourcegraph.scip_java.Dependencies -import com.sourcegraph.scip_java.Embedded -import com.sourcegraph.scip_java.commands.IndexCommand -import com.sourcegraph.semanticdb_javac.Semanticdb.TextDocument -import com.sourcegraph.semanticdb_javac.Semanticdb.TextDocuments +import com.sourcegraph.internal.io.AbsolutePath +import com.sourcegraph.internal.io.DeleteVisitor +import com.sourcegraph.internal.scip_java.BuildInfo +import com.sourcegraph.internal.scip_java.Dependencies +import com.sourcegraph.internal.scip_java.Embedded +import com.sourcegraph.internal.scip_java.commands.IndexCommand +import com.sourcegraph.internal.semanticdb_javac.Semanticdb.TextDocument +import com.sourcegraph.internal.semanticdb_javac.Semanticdb.TextDocuments import moped.json.DecodingContext import moped.json.ErrorResult import moped.json.JsonCodec diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/SystemJavaVersion.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/SystemJavaVersion.scala similarity index 87% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/SystemJavaVersion.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/SystemJavaVersion.scala index e3a62dbb1..0d6f79709 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/SystemJavaVersion.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/SystemJavaVersion.scala @@ -1,8 +1,8 @@ -package com.sourcegraph.scip_java.buildtools +package com.sourcegraph.internal.scip_java.buildtools import java.nio.file.Files -import com.sourcegraph.scip_java.Embedded +import com.sourcegraph.internal.scip_java.Embedded object SystemJavaVersion { // Returns the output of `System.getProperty("java.version")` from a fresh JVM diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/TemporaryFiles.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/TemporaryFiles.scala similarity index 73% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/TemporaryFiles.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/TemporaryFiles.scala index 57e5dc08a..7ea0ad269 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/TemporaryFiles.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/buildtools/TemporaryFiles.scala @@ -1,10 +1,10 @@ -package com.sourcegraph.scip_java.buildtools +package com.sourcegraph.internal.scip_java.buildtools import java.nio.file.Files import java.nio.file.Path -import com.sourcegraph.io.DeleteVisitor -import com.sourcegraph.scip_java.commands.IndexCommand +import com.sourcegraph.internal.io.DeleteVisitor +import com.sourcegraph.internal.scip_java.commands.IndexCommand object TemporaryFiles { def withDirectory[T](index: IndexCommand)(fn: Path => T): T = { diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/CommentSyntax.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/commands/CommentSyntax.scala similarity index 89% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/commands/CommentSyntax.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/commands/CommentSyntax.scala index ca47368f7..e202cef54 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/CommentSyntax.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/commands/CommentSyntax.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java.commands +package com.sourcegraph.internal.scip_java.commands case class CommentSyntax(value: String) { private val map = diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexCommand.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/commands/IndexCommand.scala similarity index 97% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexCommand.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/commands/IndexCommand.scala index 770754a64..3b60a6c8e 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexCommand.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/commands/IndexCommand.scala @@ -1,12 +1,12 @@ -package com.sourcegraph.scip_java.commands +package com.sourcegraph.internal.scip_java.commands import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths -import com.sourcegraph.io.AbsolutePath -import com.sourcegraph.scip_java.buildtools.BuildTool -import com.sourcegraph.scip_java.buildtools.ScipBuildTool +import com.sourcegraph.internal.io.AbsolutePath +import com.sourcegraph.internal.scip_java.buildtools.BuildTool +import com.sourcegraph.internal.scip_java.buildtools.ScipBuildTool import fansi.Color import moped.annotations._ import moped.cli.Application diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexDependencyCommand.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/commands/IndexDependencyCommand.scala similarity index 94% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexDependencyCommand.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/commands/IndexDependencyCommand.scala index d6a8f710a..645deb2a2 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexDependencyCommand.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/commands/IndexDependencyCommand.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java.commands +package com.sourcegraph.internal.scip_java.commands import java.nio.charset.StandardCharsets import java.nio.file.Files @@ -8,10 +8,10 @@ import java.nio.file.StandardCopyOption import java.nio.file.StandardOpenOption import java.util.jar.JarFile -import com.sourcegraph.io.AbsolutePath -import com.sourcegraph.io.DeleteVisitor -import com.sourcegraph.scip_java.Dependencies -import com.sourcegraph.scip_semanticdb.JavaVersion +import com.sourcegraph.internal.io.AbsolutePath +import com.sourcegraph.internal.io.DeleteVisitor +import com.sourcegraph.internal.scip_java.Dependencies +import com.sourcegraph.internal.scip_semanticdb.JavaVersion import moped.annotations.DeprecatedName import moped.annotations.Description import moped.annotations.Hidden diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexSemanticdbCommand.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/commands/IndexSemanticdbCommand.scala similarity index 90% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexSemanticdbCommand.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/commands/IndexSemanticdbCommand.scala index 55e0e92ed..b69f02762 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexSemanticdbCommand.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/commands/IndexSemanticdbCommand.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java.commands +package com.sourcegraph.internal.scip_java.commands import java.nio.file.Path import java.nio.file.Paths @@ -6,14 +6,14 @@ import java.util.concurrent.TimeUnit import scala.jdk.CollectionConverters._ -import com.sourcegraph.io.AbsolutePath -import com.sourcegraph.lsif_protocol.LsifToolInfo -import com.sourcegraph.scip_java.BuildInfo -import com.sourcegraph.scip_java.buildtools.ClasspathEntry -import com.sourcegraph.scip_semanticdb.ConsoleScipSemanticdbReporter -import com.sourcegraph.scip_semanticdb.ScipOutputFormat -import com.sourcegraph.scip_semanticdb.ScipSemanticdb -import com.sourcegraph.scip_semanticdb.ScipSemanticdbOptions +import com.sourcegraph.internal.io.AbsolutePath +import com.sourcegraph.internal.lsif_protocol.LsifToolInfo +import com.sourcegraph.internal.scip_java.BuildInfo +import com.sourcegraph.internal.scip_java.buildtools.ClasspathEntry +import com.sourcegraph.internal.scip_semanticdb.ConsoleScipSemanticdbReporter +import com.sourcegraph.internal.scip_semanticdb.ScipOutputFormat +import com.sourcegraph.internal.scip_semanticdb.ScipSemanticdb +import com.sourcegraph.internal.scip_semanticdb.ScipSemanticdbOptions import moped.annotations._ import moped.cli.Application import moped.cli.Command diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/SnapshotCommand.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/commands/SnapshotCommand.scala similarity index 93% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/commands/SnapshotCommand.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/commands/SnapshotCommand.scala index 2f4ffcce3..ce8cead71 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/SnapshotCommand.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/commands/SnapshotCommand.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java.commands +package com.sourcegraph.internal.scip_java.commands import java.net.URI import java.nio.charset.StandardCharsets @@ -7,9 +7,9 @@ import java.nio.file.attribute.BasicFileAttributes import scala.jdk.CollectionConverters._ -import com.sourcegraph.Scip -import com.sourcegraph.io.DeleteVisitor -import com.sourcegraph.scip_java.ScipPrinters +import com.sourcegraph.internal.Scip +import com.sourcegraph.internal.io.DeleteVisitor +import com.sourcegraph.internal.scip_java.ScipPrinters import moped.annotations._ import moped.cli.Application import moped.cli.Command diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/SnapshotLsifCommand.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/commands/SnapshotLsifCommand.scala similarity index 93% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/commands/SnapshotLsifCommand.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_java/commands/SnapshotLsifCommand.scala index a497c7c1a..0d73dfd29 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/SnapshotLsifCommand.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_java/commands/SnapshotLsifCommand.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java.commands +package com.sourcegraph.internal.scip_java.commands import java.nio.file.Path import java.nio.file.Paths diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_semanticdb/ConsolescipSemanticdbReporter.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_semanticdb/ConsolescipSemanticdbReporter.scala similarity index 95% rename from scip-java/src/main/scala/com/sourcegraph/scip_semanticdb/ConsolescipSemanticdbReporter.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_semanticdb/ConsolescipSemanticdbReporter.scala index af6ef07d7..2048e5089 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_semanticdb/ConsolescipSemanticdbReporter.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_semanticdb/ConsolescipSemanticdbReporter.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb +package com.sourcegraph.internal.scip_semanticdb import java.io.PrintWriter import java.nio.file.NoSuchFileException diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_semanticdb/ScipSemanticdbProgressRenderer.scala b/scip-java/src/main/scala/com/sourcegraph/internal/scip_semanticdb/ScipSemanticdbProgressRenderer.scala similarity index 94% rename from scip-java/src/main/scala/com/sourcegraph/scip_semanticdb/ScipSemanticdbProgressRenderer.scala rename to scip-java/src/main/scala/com/sourcegraph/internal/scip_semanticdb/ScipSemanticdbProgressRenderer.scala index a06ee9d60..f328b9efa 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_semanticdb/ScipSemanticdbProgressRenderer.scala +++ b/scip-java/src/main/scala/com/sourcegraph/internal/scip_semanticdb/ScipSemanticdbProgressRenderer.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb +package com.sourcegraph.internal.scip_semanticdb import java.util.concurrent.atomic.AtomicInteger diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipJava.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipJava.scala index 92b1d111e..35e938aba 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipJava.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipJava.scala @@ -1,12 +1,13 @@ package com.sourcegraph.scip_java -import java.io.PrintStream +import com.sourcegraph.internal.scip_java.BuildInfo -import com.sourcegraph.scip_java.commands.IndexCommand -import com.sourcegraph.scip_java.commands.IndexDependencyCommand -import com.sourcegraph.scip_java.commands.IndexSemanticdbCommand -import com.sourcegraph.scip_java.commands.SnapshotCommand -import com.sourcegraph.scip_java.commands.SnapshotLsifCommand +import java.io.PrintStream +import com.sourcegraph.internal.scip_java.commands.IndexCommand +import com.sourcegraph.internal.scip_java.commands.IndexDependencyCommand +import com.sourcegraph.internal.scip_java.commands.IndexSemanticdbCommand +import com.sourcegraph.internal.scip_java.commands.SnapshotCommand +import com.sourcegraph.internal.scip_java.commands.SnapshotLsifCommand import moped.cli.Application import moped.cli.CommandParser import moped.commands.HelpCommand diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/BazelBuildTool.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/BazelBuildTool.java similarity index 91% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/BazelBuildTool.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/BazelBuildTool.java index 55ffc757e..9a153a317 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/BazelBuildTool.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/BazelBuildTool.java @@ -1,7 +1,7 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; -import com.sourcegraph.scip_java.Bazelbuild; -import com.sourcegraph.lsif_protocol.LsifToolInfo; +import com.sourcegraph.internal.scip_java.Bazelbuild; +import com.sourcegraph.internal.lsif_protocol.LsifToolInfo; import java.io.*; import java.nio.file.FileSystems; @@ -62,11 +62,17 @@ public boolean hasErrors() { "java", ScipOutputFormat.TYPED_PROTOBUF, options.parallel, - mavenPackages, - /* buildKind */ "", - /* emitInverseRelationships */ true, - /* allowEmptyIndex */ true, - /* indexDirectoryEntries */ false // because Bazel only compiles to jar files. + mavenPackages, /* buildKind */ + "", + /* emitInverseRelationships */ true, /* allowEmptyIndex */ + true, /* indexDirectoryEntries */ + false // because + // Bazel + // only + // compiles + // to + // jar + // files. ); ScipSemanticdb.run(scipOptions); diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/BazelOptions.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/BazelOptions.java similarity index 97% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/BazelOptions.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/BazelOptions.java index 3321f750e..dd0790e4e 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/BazelOptions.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/BazelOptions.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; import java.io.IOException; import java.nio.file.*; @@ -100,7 +100,8 @@ public static Optional parse(String[] args) throws IOException { errors.add("missing required flag --sourceroot "); } } else if (!options.sourceroot.isAbsolute()) { - // result.sourceroot must be an absolute path because `System.getProperty("user.dir")` is a + // result.sourceroot must be an absolute path because + // `System.getProperty("user.dir")` is a // temporary directory that's generated by Bazel. errors.add( String.format( diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/InputStreamBytes.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/InputStreamBytes.java similarity index 91% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/InputStreamBytes.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/InputStreamBytes.java index 868eca59e..b433fc8bd 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/InputStreamBytes.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/InputStreamBytes.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/JavaVersion.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/JavaVersion.java similarity index 98% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/JavaVersion.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/JavaVersion.java index 9bedd24bd..b1f8f268e 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/JavaVersion.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/JavaVersion.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; import java.io.DataInputStream; import java.io.IOException; diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/JdkPackage.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/JdkPackage.java similarity index 88% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/JdkPackage.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/JdkPackage.java index 23b4f28b6..3f645bf9a 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/JdkPackage.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/JdkPackage.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; public class JdkPackage extends Package { public final String version; diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/MarkupContent.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/MarkupContent.java similarity index 65% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/MarkupContent.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/MarkupContent.java index 47614bc4d..12a733ad8 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/MarkupContent.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/MarkupContent.java @@ -1,6 +1,6 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; -import com.sourcegraph.lsif_protocol.MarkupKind; +import com.sourcegraph.internal.lsif_protocol.MarkupKind; public class MarkupContent { public final String value; diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/MavenPackage.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/MavenPackage.java similarity index 95% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/MavenPackage.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/MavenPackage.java index 6a528f5d1..d2574af8a 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/MavenPackage.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/MavenPackage.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; import java.nio.file.Path; diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/MessageOnlyException.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/MessageOnlyException.java similarity index 88% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/MessageOnlyException.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/MessageOnlyException.java index 89e63fc4b..279589533 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/MessageOnlyException.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/MessageOnlyException.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; /** * Exception that doesn't fill out the stack trace, it only prints out the message. diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/OperatingSystem.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/OperatingSystem.java similarity index 73% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/OperatingSystem.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/OperatingSystem.java index a04d82c82..a37310e04 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/OperatingSystem.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/OperatingSystem.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; public class OperatingSystem { public static boolean isWindows() { diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/Package.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/Package.java similarity index 92% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/Package.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/Package.java index e4b5ef1f9..ded58c52d 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/Package.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/Package.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; public abstract class Package { public static final Package EMPTY = diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/PackageTable.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/PackageTable.java similarity index 97% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/PackageTable.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/PackageTable.java index 9f3f6b40b..a9d7ea62a 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/PackageTable.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/PackageTable.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; import java.io.File; import java.io.IOException; @@ -36,9 +36,12 @@ public PackageTable(ScipSemanticdbOptions options, ScipWriter writer) throws IOE this.writer = writer; this.javaVersion = new JavaVersion(); this.indexDirectoryEntries = options.allowExportingGlobalSymbolsFromDirectoryEntries; - // NOTE: it's important that we index the JDK before maven packages. Some maven packages - // redefine classes from the JDK and we want those maven packages to take precedence over - // the JDK. The motivation to prioritize maven packages over the JDK is that we only want + // NOTE: it's important that we index the JDK before maven packages. Some maven + // packages + // redefine classes from the JDK and we want those maven packages to take + // precedence over + // the JDK. The motivation to prioritize maven packages over the JDK is that we + // only want // to exports monikers against the JDK when indexing the JDK repo. indexJdk(); for (MavenPackage pkg : options.packages) { diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/RangeComparator.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/RangeComparator.java similarity index 87% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/RangeComparator.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/RangeComparator.java index aa16a5af2..7d8014de7 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/RangeComparator.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/RangeComparator.java @@ -1,6 +1,6 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; -import com.sourcegraph.semanticdb_javac.Semanticdb.Range; +import com.sourcegraph.internal.semanticdb_javac.Semanticdb.Range; /** * Comparator that sorts SemanticDB ranges by appearance in the document. diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ResultIds.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ResultIds.java similarity index 91% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ResultIds.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ResultIds.java index 6a3d6a2ff..8c661d035 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ResultIds.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ResultIds.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; /** Utility to deal with a group of IDs for a result set, definition result and reference result. */ public class ResultIds { diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ResultSets.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ResultSets.java similarity index 92% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ResultSets.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ResultSets.java index 1afdfca29..c21cc792d 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ResultSets.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ResultSets.java @@ -1,6 +1,6 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; -import com.sourcegraph.semanticdb_javac.SemanticdbSymbols; +import com.sourcegraph.internal.semanticdb_javac.SemanticdbSymbols; import java.util.HashMap; import java.util.Map; import java.util.Optional; @@ -50,8 +50,10 @@ public ResultIds apply(String symbol) { Optional pkg = packages.packageForSymbol(symbol); if (pkg.isPresent() && pkg.get() instanceof JdkPackage && !isJdkRepo) { // Never export monikers for the JDK repo unless we're indexing the JDK repo. - // Some Maven packages contain sources that redefine symbols like `java/lang/String#` - // even if the the jar files don't contain `java/lang/String.class`. For example, + // Some Maven packages contain sources that redefine symbols like + // `java/lang/String#` + // even if the the jar files don't contain `java/lang/String.class`. For + // example, // see the package com.google.gwt:gwt-user:2.9.0. // Related issue: https://github.com/sourcegraph/sourcegraph/issues/21058 isExportedSymbol = false; diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipByteOutputStream.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipByteOutputStream.java similarity index 89% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipByteOutputStream.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipByteOutputStream.java index 60dc97c11..d85b750db 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipByteOutputStream.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipByteOutputStream.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; import java.io.ByteArrayOutputStream; import java.io.OutputStreamWriter; diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipOutputFormat.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipOutputFormat.java similarity index 94% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipOutputFormat.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipOutputFormat.java index 52b7faa34..fff18814e 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipOutputFormat.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipOutputFormat.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; /** * Whether to generate index.scip (JSON) or index.scip-protobuf (Protobuf). diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipOutputStream.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipOutputStream.java similarity index 93% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipOutputStream.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipOutputStream.java index 3eaf6af56..847a1482c 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipOutputStream.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipOutputStream.java @@ -1,10 +1,10 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; import com.google.protobuf.Descriptors.FieldDescriptor; import com.google.protobuf.util.JsonFormat; import com.google.protobuf.util.JsonFormat.Printer; -import com.sourcegraph.lsif_protocol.LsifObject; -import com.sourcegraph.lsif_protocol.LsifPosition; +import com.sourcegraph.internal.lsif_protocol.LsifObject; +import com.sourcegraph.internal.lsif_protocol.LsifPosition; import java.io.IOException; import java.io.OutputStream; import java.nio.charset.StandardCharsets; diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipProcessingException.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipProcessingException.java similarity index 83% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipProcessingException.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipProcessingException.java index 79ceb717e..6841f635b 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipProcessingException.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipProcessingException.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; public class ScipProcessingException extends Throwable { diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipSemanticdb.java similarity index 96% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipSemanticdb.java index 1cb494a09..0483bb735 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipSemanticdb.java @@ -1,13 +1,13 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; import com.google.protobuf.CodedInputStream; -import com.sourcegraph.lsif_protocol.MarkupKind; -import com.sourcegraph.semanticdb_javac.Semanticdb; -import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolInformation; -import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolOccurrence; -import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolOccurrence.Role; -import com.sourcegraph.semanticdb_javac.SemanticdbSymbols; -import com.sourcegraph.Scip; +import com.sourcegraph.internal.lsif_protocol.MarkupKind; +import com.sourcegraph.internal.semanticdb_javac.Semanticdb; +import com.sourcegraph.internal.semanticdb_javac.Semanticdb.SymbolInformation; +import com.sourcegraph.internal.semanticdb_javac.Semanticdb.SymbolOccurrence; +import com.sourcegraph.internal.semanticdb_javac.Semanticdb.SymbolOccurrence.Role; +import com.sourcegraph.internal.semanticdb_javac.SemanticdbSymbols; +import com.sourcegraph.internal.Scip; import javax.annotation.Nullable; import java.io.IOException; @@ -132,7 +132,8 @@ private void processTypedDocument( Scip.SymbolInformation.Builder scipInfo = Scip.SymbolInformation.newBuilder().setSymbol(typedSymbol(info.getSymbol(), pkg)); - // TODO: this can be removed once https://github.com/sourcegraph/sourcegraph/issues/50927 is + // TODO: this can be removed once + // https://github.com/sourcegraph/sourcegraph/issues/50927 is // fixed. ArrayList inverseReferences = references.map.get(info.getSymbol()); if (inverseReferences != null) { diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbOptions.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipSemanticdbOptions.java similarity index 93% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbOptions.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipSemanticdbOptions.java index 515502d08..61dc31159 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbOptions.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipSemanticdbOptions.java @@ -1,6 +1,6 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; -import com.sourcegraph.lsif_protocol.LsifToolInfo; +import com.sourcegraph.internal.lsif_protocol.LsifToolInfo; import java.nio.file.Path; import java.util.List; diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbReporter.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipSemanticdbReporter.java similarity index 92% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbReporter.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipSemanticdbReporter.java index 1887b083d..5560a99a2 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbReporter.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipSemanticdbReporter.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; /** * API to hook into the event stream of the scip-semanticdb command. diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipTextDocument.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipTextDocument.java similarity index 95% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipTextDocument.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipTextDocument.java index 3b53723b2..4b52da30c 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipTextDocument.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipTextDocument.java @@ -1,7 +1,7 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; -import com.sourcegraph.semanticdb_javac.Semanticdb; -import com.sourcegraph.semanticdb_javac.SemanticdbSymbols; +import com.sourcegraph.internal.semanticdb_javac.Semanticdb; +import com.sourcegraph.internal.semanticdb_javac.SemanticdbSymbols; import java.nio.file.Path; import java.util.*; @@ -13,11 +13,14 @@ public class ScipTextDocument { public int id; public final Map symbols; public final Map localSymbols; - // Map from symbols that have a definition occurrence to the list of symbols that have + // Map from symbols that have a definition occurrence to the list of symbols + // that have // `is_definition` relationships to that symbol. - // This map is used to add `is_reference` relationships between all symbols in the list so that + // This map is used to add `is_reference` relationships between all symbols in + // the list so that // doing "Find references" - // on any of those symbols returns occurrences for all of the symbols in the "clique" (per + // on any of those symbols returns occurrences for all of the symbols in the + // "clique" (per // https://en.wikipedia.org/wiki/Clique_(graph_theory)). // See https://github.com/sourcegraph/sourcegraph/issues/50927 for more details. public final Map> definitionCliques = new HashMap<>(); @@ -90,7 +93,8 @@ private void setSemanticdb(Semanticdb.TextDocument semanticdb) { public Semanticdb.TextDocument manifestOccurrencesForSyntheticSymbols( Semanticdb.TextDocument semanticdb) { if (semanticdb.getLanguage() != Semanticdb.Language.SCALA) { - // It's only semanticdb-scalac that emits SymbolInformation for symbols that have no + // It's only semanticdb-scalac that emits SymbolInformation for symbols that + // have no // definition occurrences. return semanticdb; } @@ -106,7 +110,8 @@ public Semanticdb.TextDocument manifestOccurrencesForSyntheticSymbols( Semanticdb.SymbolInformation.Builder newInfo = Semanticdb.SymbolInformation.newBuilder(info); Semanticdb.SymbolOccurrence definition = definitionOccurrences.get(info.getSymbol()); if (definition != null) { - // This symbol has a definition so it doesn't need an is_definition relationship. + // This symbol has a definition so it doesn't need an is_definition + // relationship. builder.addSymbols(newInfo); continue; } diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipWriter.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipWriter.java similarity index 92% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipWriter.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipWriter.java index 2136de7b6..071cb6077 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipWriter.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/ScipWriter.java @@ -1,12 +1,12 @@ -package com.sourcegraph.scip_semanticdb; - -import com.sourcegraph.lsif_protocol.LsifHover; -import com.sourcegraph.lsif_protocol.LsifHover.Content; -import com.sourcegraph.lsif_protocol.LsifObject; -import com.sourcegraph.lsif_protocol.LsifPosition; -import com.sourcegraph.semanticdb_javac.Semanticdb; -import com.sourcegraph.semanticdb_javac.SemanticdbSymbols; -import com.sourcegraph.Scip; +package com.sourcegraph.internal.scip_semanticdb; + +import com.sourcegraph.internal.lsif_protocol.LsifHover; +import com.sourcegraph.internal.lsif_protocol.LsifHover.Content; +import com.sourcegraph.internal.lsif_protocol.LsifObject; +import com.sourcegraph.internal.lsif_protocol.LsifPosition; +import com.sourcegraph.internal.semanticdb_javac.Semanticdb; +import com.sourcegraph.internal.semanticdb_javac.SemanticdbSymbols; +import com.sourcegraph.internal.Scip; import java.io.BufferedOutputStream; import java.io.IOException; diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SemanticdbTreeVisitor.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SemanticdbTreeVisitor.java similarity index 95% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SemanticdbTreeVisitor.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SemanticdbTreeVisitor.java index 3ecd82a48..7f799a18e 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SemanticdbTreeVisitor.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SemanticdbTreeVisitor.java @@ -1,6 +1,6 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; -import com.sourcegraph.semanticdb_javac.Semanticdb.*; +import com.sourcegraph.internal.semanticdb_javac.Semanticdb.*; public abstract class SemanticdbTreeVisitor { public void visitTree(Tree tree) { diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SemanticdbWalker.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SemanticdbWalker.java similarity index 97% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SemanticdbWalker.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SemanticdbWalker.java index c0cd0a717..731bce476 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SemanticdbWalker.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SemanticdbWalker.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; import java.io.IOException; import java.nio.file.FileSystems; diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SignatureFormatter.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SignatureFormatter.java similarity index 95% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SignatureFormatter.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SignatureFormatter.java index ce1133918..a0aaa69cd 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SignatureFormatter.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SignatureFormatter.java @@ -1,15 +1,15 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; -import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolInformation.Property; -import com.sourcegraph.semanticdb_javac.Semanticdb.*; +import com.sourcegraph.internal.semanticdb_javac.Semanticdb.SymbolInformation.Property; +import com.sourcegraph.internal.semanticdb_javac.Semanticdb.*; -import com.sourcegraph.semanticdb_javac.SemanticdbSymbols; +import com.sourcegraph.internal.semanticdb_javac.SemanticdbSymbols; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import static com.sourcegraph.semanticdb_javac.SemanticdbBuilders.typeRef; +import static com.sourcegraph.internal.semanticdb_javac.SemanticdbBuilders.typeRef; public class SignatureFormatter { private static final Type OBJECT_TYPE_REF = typeRef("java/lang/Object#"); @@ -157,21 +157,29 @@ private void formatClassSignature(ClassSignature classSignature) { return; } - // Determine which parents from ClassSignature.parents are classes or interfaces so we know to + // Determine which parents from ClassSignature.parents are classes or interfaces + // so we know to // use // 'extends' or 'implements'. // The logic is as follows: - // 1. If the symbol has type CLASS, there will always be at least 1 parent. For enums, this is - // java/lang/Enum#, otherwise it is java/lang/Object# if no superclass is specified. - // Therefore, if the parents list contains java/lang/Object# type or the symbol is an enum, - // then no superclass was defined and all parents are interfaces and we must print + // 1. If the symbol has type CLASS, there will always be at least 1 parent. For + // enums, this is + // java/lang/Enum#, otherwise it is java/lang/Object# if no superclass is + // specified. + // Therefore, if the parents list contains java/lang/Object# type or the symbol + // is an enum, + // then no superclass was defined and all parents are interfaces and we must + // print // 'implements' - // followed by all superinterfaces. - // Else if it is not an enum and the list of non-synthetic parents is non empty, a superclass - // was specified and we must print it with the 'extends' keyword prefixed, followed by - // 'implements' and all superinterfaces, if any. - // 2. If the symbol has type INTERFACE, then any defined parents must also be interfaces, so if - // the list of non-synthetic parents is not empty, print 'implements' and all + // followed by all superinterfaces. + // Else if it is not an enum and the list of non-synthetic parents is non empty, + // a superclass + // was specified and we must print it with the 'extends' keyword prefixed, + // followed by + // 'implements' and all superinterfaces, if any. + // 2. If the symbol has type INTERFACE, then any defined parents must also be + // interfaces, so if + // the list of non-synthetic parents is not empty, print 'implements' and all // superinterfaces. switch (symbolInformation.getKind()) { case CLASS: @@ -565,7 +573,8 @@ private String formatType(Type type) { && !typeRef.getSymbol().startsWith(FUNCTION_OBJECT)) { int n = typeRef.getTypeArgumentsCount() - 1; if (n == 0) { - // Special-case for Function1[A, B]: don't wrap `A` in parenthesis like this `(A) => B` + // Special-case for Function1[A, B]: don't wrap `A` in parenthesis like this + // `(A) => B` s.append(formatType(typeRef.getTypeArguments(0))); } else { b.append( diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SignatureFormatterException.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SignatureFormatterException.java similarity index 83% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SignatureFormatterException.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SignatureFormatterException.java index 5c094aebc..171801f2b 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SignatureFormatterException.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SignatureFormatterException.java @@ -1,6 +1,6 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; -import com.sourcegraph.semanticdb_javac.Semanticdb; +import com.sourcegraph.internal.semanticdb_javac.Semanticdb; public class SignatureFormatterException extends RuntimeException { public SignatureFormatterException( diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolDescriptor.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SymbolDescriptor.java similarity index 93% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolDescriptor.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SymbolDescriptor.java index 77bfb32a5..24535558b 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolDescriptor.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SymbolDescriptor.java @@ -1,8 +1,8 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; -import com.sourcegraph.semanticdb_javac.SemanticdbSymbols; -import com.sourcegraph.semanticdb_javac.SemanticdbSymbols.Descriptor; -import com.sourcegraph.semanticdb_javac.SemanticdbSymbols.Descriptor.Kind; +import com.sourcegraph.internal.semanticdb_javac.SemanticdbSymbols; +import com.sourcegraph.internal.semanticdb_javac.SemanticdbSymbols.Descriptor; +import com.sourcegraph.internal.semanticdb_javac.SemanticdbSymbols.Descriptor.Kind; import java.util.Optional; public class SymbolDescriptor { diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolOccurrences.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SymbolOccurrences.java similarity index 85% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolOccurrences.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SymbolOccurrences.java index b4d309491..d443eb273 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolOccurrences.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SymbolOccurrences.java @@ -1,6 +1,6 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; -import com.sourcegraph.semanticdb_javac.Semanticdb; +import com.sourcegraph.internal.semanticdb_javac.Semanticdb; import java.util.ArrayList; import java.util.List; diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolRelationship.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SymbolRelationship.java similarity index 85% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolRelationship.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SymbolRelationship.java index 66eb1ae47..b7540cd0b 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolRelationship.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/SymbolRelationship.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; public class SymbolRelationship { public final String from; diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/Symtab.java b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/Symtab.java similarity index 87% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/Symtab.java rename to scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/Symtab.java index 5324df0e5..24e10d7ee 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/Symtab.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/internal/scip_semanticdb/Symtab.java @@ -1,6 +1,6 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.internal.scip_semanticdb; -import com.sourcegraph.semanticdb_javac.Semanticdb; +import com.sourcegraph.internal.semanticdb_javac.Semanticdb; import java.util.HashMap; diff --git a/scip-semanticdb/src/main/protobuf/bazelbuild.proto b/scip-semanticdb/src/main/protobuf/bazelbuild.proto index f95dbc705..7330880a8 100644 --- a/scip-semanticdb/src/main/protobuf/bazelbuild.proto +++ b/scip-semanticdb/src/main/protobuf/bazelbuild.proto @@ -21,7 +21,7 @@ package bazel_query; // option cc_api_version = 2; // option java_api_version = 1; -option java_package = "com.sourcegraph.scip_java"; +option java_package = "com.sourcegraph.internal.scip_java"; message License { repeated string license_type = 1; diff --git a/scip-semanticdb/src/main/protobuf/lsif.proto b/scip-semanticdb/src/main/protobuf/lsif.proto index 706542796..1660fbfe9 100644 --- a/scip-semanticdb/src/main/protobuf/lsif.proto +++ b/scip-semanticdb/src/main/protobuf/lsif.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_multiple_files = true; -package com.sourcegraph.lsif_protocol; +package com.sourcegraph.internal.lsif_protocol; message LsifObject { int32 id = 1; diff --git a/semanticdb-agent/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbAgent.java b/semanticdb-agent/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbAgent.java similarity index 92% rename from semanticdb-agent/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbAgent.java rename to semanticdb-agent/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbAgent.java index 5b1bb1870..e0415ab2f 100644 --- a/semanticdb-agent/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbAgent.java +++ b/semanticdb-agent/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbAgent.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; import static net.bytebuddy.implementation.bytecode.assign.Assigner.Typing.DYNAMIC; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -24,20 +24,20 @@ public class SemanticdbAgent { public static void premain(String agentArgs, Instrumentation inst) { // NOTE(olafur): Uncoment below if you want see all the loaded classes. - // PrintStream logger = newLogger(); - // inst.addTransformer( - // new ClassFileTransformer() { - // @Override - // public byte[] transform( - // ClassLoader loader, - // String className, - // Class classBeingRedefined, - // ProtectionDomain protectionDomain, - // byte[] classfileBuffer) { - // logger.println(className); - // return classfileBuffer; - // } - // }); + // PrintStream logger = newLogger(); + // inst.addTransformer( + // new ClassFileTransformer() { + // @Override + // public byte[] transform( + // ClassLoader loader, + // String className, + // Class classBeingRedefined, + // ProtectionDomain protectionDomain, + // byte[] classfileBuffer) { + // logger.println(className); + // return classfileBuffer; + // } + // }); new AgentBuilder.Default() .disableClassFormatChanges() .type( diff --git a/semanticdb-gradle-plugin/src/main/scala/SemanticdbGradlePlugin.scala b/semanticdb-gradle-plugin/src/main/scala/SemanticdbGradlePlugin.scala index 10659c0ab..635433f4f 100644 --- a/semanticdb-gradle-plugin/src/main/scala/SemanticdbGradlePlugin.scala +++ b/semanticdb-gradle-plugin/src/main/scala/SemanticdbGradlePlugin.scala @@ -7,7 +7,7 @@ import java.{util => ju} import scala.jdk.CollectionConverters._ import scala.util.control.NonFatal -import com.sourcegraph.scip_java.BuildInfo +import com.sourcegraph.internal.scip_java.BuildInfo import org.gradle.api.DefaultTask import org.gradle.api.Plugin import org.gradle.api.Project diff --git a/semanticdb-java/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbBuilders.java b/semanticdb-java/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbBuilders.java similarity index 99% rename from semanticdb-java/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbBuilders.java rename to semanticdb-java/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbBuilders.java index 492572a1a..33be2725c 100644 --- a/semanticdb-java/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbBuilders.java +++ b/semanticdb-java/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbBuilders.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; import java.util.List; diff --git a/semanticdb-java/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbSymbols.java b/semanticdb-java/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbSymbols.java similarity index 98% rename from semanticdb-java/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbSymbols.java rename to semanticdb-java/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbSymbols.java index 94ca1695e..3ac33a2b1 100644 --- a/semanticdb-java/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbSymbols.java +++ b/semanticdb-java/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbSymbols.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; import java.util.Objects; diff --git a/semanticdb-java/src/main/protobuf/semanticdb.proto b/semanticdb-java/src/main/protobuf/semanticdb.proto index 4fefea160..be7f36b3b 100644 --- a/semanticdb-java/src/main/protobuf/semanticdb.proto +++ b/semanticdb-java/src/main/protobuf/semanticdb.proto @@ -5,7 +5,7 @@ syntax = "proto3"; -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; enum Schema { LEGACY = 0; diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/CompilationUnitException.java b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/CompilationUnitException.java similarity index 83% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/CompilationUnitException.java rename to semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/CompilationUnitException.java index e6d6d376b..1ddd691ed 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/CompilationUnitException.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/CompilationUnitException.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; public class CompilationUnitException extends Throwable { public CompilationUnitException(String compilationUnit, Throwable cause) { diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/CompilerRange.java b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/CompilerRange.java similarity index 97% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/CompilerRange.java rename to semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/CompilerRange.java index 54fb9d0b7..017fbd4e1 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/CompilerRange.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/CompilerRange.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; /** * Describes how to convert a compiler position into SemanticDB Range. diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/Debugging.java b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/Debugging.java similarity index 87% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/Debugging.java rename to semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/Debugging.java index 18f68b16c..b0c33b195 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/Debugging.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/Debugging.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; /** Utility methods for debugging purposes. */ public final class Debugging { diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/EmptyEndPosTable.java b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/EmptyEndPosTable.java similarity index 91% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/EmptyEndPosTable.java rename to semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/EmptyEndPosTable.java index 4eb4a137b..0a2794dbc 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/EmptyEndPosTable.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/EmptyEndPosTable.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; import com.sun.tools.javac.tree.EndPosTable; import com.sun.tools.javac.tree.JCTree; diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/GlobalSymbolsCache.java b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/GlobalSymbolsCache.java similarity index 93% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/GlobalSymbolsCache.java rename to semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/GlobalSymbolsCache.java index 2e6985e31..35d2c541b 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/GlobalSymbolsCache.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/GlobalSymbolsCache.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; import com.sun.tools.javac.code.Symbol; @@ -7,7 +7,7 @@ import javax.lang.model.element.ExecutableElement; import java.util.*; -import static com.sourcegraph.semanticdb_javac.Debugging.pprint; +import static com.sourcegraph.internal.semanticdb_javac.Debugging.pprint; /** Cache of SemanticDB symbols that can be referenced between files. */ public final class GlobalSymbolsCache { @@ -110,7 +110,7 @@ private SemanticdbSymbols.Descriptor semanticdbDescriptor(Symbol sym) { * * * - *

Link to + *

Link to * SemanticDB spec. */ private String methodDisambiguator(Symbol.MethodSymbol sym) { @@ -121,13 +121,17 @@ private String methodDisambiguator(Symbol.MethodSymbol sym) { methods.add((ExecutableElement) e); } } - // NOTE(olafur): sort static methods last, according to the spec. Historical note: this + // NOTE(olafur): sort static methods last, according to the spec. Historical + // note: this // requirement is - // part of the SemanticDB spec because static methods and non-static methods have a different + // part of the SemanticDB spec because static methods and non-static methods + // have a different // "owner" symbol. - // There is no way to recover the definition order for a mix of static nnon-static method + // There is no way to recover the definition order for a mix of static + // nnon-static method // definitions. - // In practice, it's unusual to mix static and non-static methods so this shouldn't be a big + // In practice, it's unusual to mix static and non-static methods so this + // shouldn't be a big // issue. methods.sort( (a, b) -> Boolean.compare(a.getReceiverType() == null, b.getReceiverType() == null)); diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/LocalSymbolsCache.java b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/LocalSymbolsCache.java similarity index 91% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/LocalSymbolsCache.java rename to semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/LocalSymbolsCache.java index d72be8e72..dcf40fa15 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/LocalSymbolsCache.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/LocalSymbolsCache.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; import com.sun.tools.javac.code.Symbol; diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/MD5.java b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/MD5.java similarity index 94% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/MD5.java rename to semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/MD5.java index 3d5be0659..ef8549c90 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/MD5.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/MD5.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; import java.nio.CharBuffer; import java.nio.charset.StandardCharsets; diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/NoRelativePathMode.java b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/NoRelativePathMode.java similarity index 96% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/NoRelativePathMode.java rename to semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/NoRelativePathMode.java index da4d8dfd1..566d932a5 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/NoRelativePathMode.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/NoRelativePathMode.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; import java.util.Arrays; import java.util.stream.Collectors; diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/RangeFinder.java similarity index 93% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java rename to semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/RangeFinder.java index 96ef535de..b242424cf 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/RangeFinder.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; import com.sun.source.tree.CompilationUnitTree; import com.sun.source.tree.LineMap; @@ -13,7 +13,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import static com.sourcegraph.semanticdb_javac.Debugging.pprint; +import static com.sourcegraph.internal.semanticdb_javac.Debugging.pprint; public class RangeFinder { public static Optional findRange( diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/Result.java b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/Result.java similarity index 98% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/Result.java rename to semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/Result.java index 75ec4b144..5a474bcfe 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/Result.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/Result.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; import java.util.NoSuchElementException; import java.util.Objects; diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbJavacOptions.java b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbJavacOptions.java similarity index 99% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbJavacOptions.java rename to semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbJavacOptions.java index 334024f16..00fcae0ea 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbJavacOptions.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbJavacOptions.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; import java.io.ByteArrayOutputStream; import java.io.PrintStream; diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbOptionBuilder.java b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbOptionBuilder.java similarity index 98% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbOptionBuilder.java rename to semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbOptionBuilder.java index 9a2b15988..d085f7658 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbOptionBuilder.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbOptionBuilder.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; import java.io.File; import java.io.IOException; diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbReporter.java b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbReporter.java similarity index 97% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbReporter.java rename to semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbReporter.java index e083b2ee5..05e55e756 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbReporter.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbReporter.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; import com.sun.source.tree.CompilationUnitTree; import com.sun.source.tree.Tree; diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbSignatures.java b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbSignatures.java similarity index 92% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbSignatures.java rename to semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbSignatures.java index 1a0c6a074..0331f4607 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbSignatures.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbSignatures.java @@ -1,16 +1,16 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; import com.sun.tools.javac.code.Symbol; import com.sun.tools.javac.code.Type; -import com.sourcegraph.semanticdb_javac.Semanticdb.*; +import com.sourcegraph.internal.semanticdb_javac.Semanticdb.*; import javax.lang.model.element.Element; import javax.lang.model.type.*; import java.util.List; import java.util.stream.Collectors; -import static com.sourcegraph.semanticdb_javac.SemanticdbBuilders.*; -import static com.sourcegraph.semanticdb_javac.SemanticdbTypeVisitor.UNRESOLVED_TYPE_REF; +import static com.sourcegraph.internal.semanticdb_javac.SemanticdbBuilders.*; +import static com.sourcegraph.internal.semanticdb_javac.SemanticdbTypeVisitor.UNRESOLVED_TYPE_REF; public final class SemanticdbSignatures { private final GlobalSymbolsCache cache; diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTaskListener.java b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbTaskListener.java similarity index 97% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTaskListener.java rename to semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbTaskListener.java index 827e2b064..717efd5d1 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTaskListener.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbTaskListener.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; import com.sun.source.util.JavacTask; import com.sun.source.util.TaskEvent; @@ -78,8 +78,10 @@ public void finished(TaskEvent e) { } } - // Uses reporter.error with the full stack trace of the exception instead of reporter.exception - // because reporter.exception doesn't seem to print any meaningful information about the + // Uses reporter.error with the full stack trace of the exception instead of + // reporter.exception + // because reporter.exception doesn't seem to print any meaningful information + // about the // exception, it just prints the location with an empty message. private void reportException(Throwable exception, TaskEvent e) { ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -208,10 +210,13 @@ private Result semanticdbOutputPath(SemanticdbJavacOptions options switch (options.noRelativePath) { case INDEX_ANYWAY: - // Come up with a unique relative path for this file even if it's not under the sourceroot. - // By indexing auto-generated files, we collect SymbolInformation for auto-generated symbol, + // Come up with a unique relative path for this file even if it's not under the + // sourceroot. + // By indexing auto-generated files, we collect SymbolInformation for + // auto-generated symbol, // which results in more useful hover tooltips in the editor. - // In the future, we may want to additionally embed the full text contents of these files + // In the future, we may want to additionally embed the full text contents of + // these files // so that it's possible to browse generated files with precise code navigation. String uniqueFilename = String.format("%d.%s.semanticdb", ++noRelativePathCounter, absolutePath.getFileName()); diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTrees.java b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbTrees.java similarity index 96% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTrees.java rename to semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbTrees.java index 26c5e5d1e..b7232674a 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTrees.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbTrees.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; import com.sun.source.tree.Tree; import com.sun.tools.javac.code.Type; @@ -8,8 +8,8 @@ import java.util.List; import java.util.stream.Collectors; -import static com.sourcegraph.semanticdb_javac.SemanticdbBuilders.*; -import static com.sourcegraph.semanticdb_javac.SemanticdbTypeVisitor.ARRAY_SYMBOL; +import static com.sourcegraph.internal.semanticdb_javac.SemanticdbBuilders.*; +import static com.sourcegraph.internal.semanticdb_javac.SemanticdbTypeVisitor.ARRAY_SYMBOL; public class SemanticdbTrees { public SemanticdbTrees( @@ -50,7 +50,8 @@ private Semanticdb.AnnotationTree annotationBuilder(JCTree.JCAnnotation annotati ArrayList params = new ArrayList<>(annotation.args.size()); for (JCTree.JCExpression param : annotation.args) { - // anecdotally not always JCAssign in some situations when a compilation unit can't resolve + // anecdotally not always JCAssign in some situations when a compilation unit + // can't resolve // symbols fully if (param instanceof JCTree.JCAssign) { JCTree.JCAssign assign = (JCTree.JCAssign) param; diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTypeVisitor.java b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbTypeVisitor.java similarity index 95% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTypeVisitor.java rename to semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbTypeVisitor.java index aba2cba33..ec6d18083 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTypeVisitor.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbTypeVisitor.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; import com.sun.tools.javac.code.Type; import com.sun.tools.javac.util.List; @@ -7,7 +7,7 @@ import javax.lang.model.util.SimpleTypeVisitor8; import java.util.ArrayList; -import static com.sourcegraph.semanticdb_javac.SemanticdbBuilders.*; +import static com.sourcegraph.internal.semanticdb_javac.SemanticdbBuilders.*; /** A TypeMirror tree visitor that constructs a recursive SemanticDB Type structure. */ class SemanticdbTypeVisitor extends SimpleTypeVisitor8 { @@ -42,7 +42,7 @@ public Semanticdb.Type visitDeclared(DeclaredType t, Void unused) { Semanticdb.TypeSignature.Builder typeSig = Semanticdb.TypeSignature.newBuilder(); WildcardType wildcardType = (WildcardType) type; - // semanticdb spec asks for List() not None for type_parameters field + // semanticdb spec asks for List() not None for type_parameters field typeSig.setTypeParameters(Semanticdb.Scope.newBuilder()); if (wildcardType.getExtendsBound() != null) { diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbVisitor.java similarity index 94% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java rename to semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbVisitor.java index efbdf3feb..136876cdc 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/SemanticdbVisitor.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; import com.sun.source.tree.*; import com.sun.source.util.*; @@ -10,9 +10,9 @@ import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.util.JCDiagnostic; import com.sun.tools.javac.util.Position; -import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolInformation.Kind; -import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolInformation.Property; -import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolOccurrence.Role; +import com.sourcegraph.internal.semanticdb_javac.Semanticdb.SymbolInformation.Kind; +import com.sourcegraph.internal.semanticdb_javac.Semanticdb.SymbolInformation.Property; +import com.sourcegraph.internal.semanticdb_javac.Semanticdb.SymbolOccurrence.Role; import javax.lang.model.element.ElementKind; import javax.lang.model.util.Elements; @@ -23,8 +23,8 @@ import java.util.*; import java.util.stream.Collectors; -import static com.sourcegraph.semanticdb_javac.SemanticdbBuilders.*; -import static com.sourcegraph.semanticdb_javac.SemanticdbTypeVisitor.ARRAY_SYMBOL; +import static com.sourcegraph.internal.semanticdb_javac.SemanticdbBuilders.*; +import static com.sourcegraph.internal.semanticdb_javac.SemanticdbTypeVisitor.ARRAY_SYMBOL; /** Walks the AST of a typechecked compilation unit and generates a SemanticDB TextDocument. */ public class SemanticdbVisitor extends TreePathScanner { @@ -84,7 +84,8 @@ private void emitSymbolOccu Optional occ = semanticdbOccurrence(sym, posTree, kind, role); occ.ifPresent(occurrences::add); if (role == Role.DEFINITION) { - // Only emit SymbolInformation for symbols that are defined in this compilation unit. + // Only emit SymbolInformation for symbols that are defined in this compilation + // unit. emitSymbolInformation(sym, posTree); } } @@ -158,7 +159,8 @@ public Void visitClass(ClassTree node, Void unused) { if (i >= typeParameters.size()) { // Happens in testcontainers/testcontainers-java, see // https://github.com/sourcegraph/scip-java/issues/319 - // Failed to reproduce with a minimal source file so we don't have a test case that hits + // Failed to reproduce with a minimal source file so we don't have a test case + // that hits // this branch. break; } @@ -249,7 +251,8 @@ public Void visitNewClass(NewClassTree node, Void unused) { } } - // to avoid emitting a reference to the class itself, we manually scan everything + // to avoid emitting a reference to the class itself, we manually scan + // everything // except the identifier scan(node.getTypeArguments(), unused); scan(node.getArguments(), unused); @@ -317,10 +320,13 @@ private Optional semanticdbRange( private Semanticdb.Range correctForTabs(Semanticdb.Range range, LineMap lineMap, int start) { int startLinePos = (int) lineMap.getPosition(lineMap.getLineNumber(start), 0); - // javac replaces every tab with 8 spaces in the linemap. As this is potentially inconsistent - // with the source file itself, we adjust for that here if the line is actually indented with + // javac replaces every tab with 8 spaces in the linemap. As this is potentially + // inconsistent + // with the source file itself, we adjust for that here if the line is actually + // indented with // tabs. - // As for every tab there are 8 spaces, we remove 7 spaces for every tab to get the correct + // As for every tab there are 8 spaces, we remove 7 spaces for every tab to get + // the correct // char offset (note: different to _column_ offset your editor shows) if (this.source.charAt(startLinePos) == '\t') { int count = 1; @@ -469,10 +475,12 @@ private Semanticdb.Documentation semanticdbDocumentation(Symbol sym) { } catch (NullPointerException e) { // Can happen in `getDocComment()` // Caused by: java.lang.NullPointerException - // at com.sun.tools.javac.model.JavacElements.cast(JavacElements.java:605) - // at com.sun.tools.javac.model.JavacElements.getTreeAndTopLevel(JavacElements.java:543) - // at com.sun.tools.javac.model.JavacElements.getDocComment(JavacElements.java:321) - // at + // at com.sun.tools.javac.model.JavacElements.cast(JavacElements.java:605) + // at + // com.sun.tools.javac.model.JavacElements.getTreeAndTopLevel(JavacElements.java:543) + // at + // com.sun.tools.javac.model.JavacElements.getDocComment(JavacElements.java:321) + // at // com.sourcegraph.semanticdb_javac.SemanticdbVisitor.semanticdbDocumentation(SemanticdbVisitor.java:233) return null; } diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/TargetPaths.java b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/TargetPaths.java similarity index 81% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/TargetPaths.java rename to semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/TargetPaths.java index c523e3534..cf9d48e5b 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/TargetPaths.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/TargetPaths.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; import java.nio.file.Path; diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/UriScheme.java b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/UriScheme.java similarity index 68% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/UriScheme.java rename to semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/UriScheme.java index b88bb6669..f436dca69 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/UriScheme.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/internal/semanticdb_javac/UriScheme.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.internal.semanticdb_javac; public enum UriScheme { DEFAULT, diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/InjectSemanticdbOptions.java b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/InjectSemanticdbOptions.java index c27c75343..ea734146a 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/InjectSemanticdbOptions.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/InjectSemanticdbOptions.java @@ -1,5 +1,7 @@ package com.sourcegraph.semanticdb_javac; +import com.sourcegraph.internal.semanticdb_javac.SemanticdbOptionBuilder; + import java.io.IOException; import java.io.OutputStream; import java.io.PrintStream; diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbPlugin.java b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbPlugin.java index 69408d612..e1b66f460 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbPlugin.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbPlugin.java @@ -1,5 +1,9 @@ package com.sourcegraph.semanticdb_javac; +import com.sourcegraph.internal.semanticdb_javac.GlobalSymbolsCache; +import com.sourcegraph.internal.semanticdb_javac.SemanticdbJavacOptions; +import com.sourcegraph.internal.semanticdb_javac.SemanticdbReporter; +import com.sourcegraph.internal.semanticdb_javac.SemanticdbTaskListener; import com.sun.source.util.*; import com.sun.tools.javac.api.BasicJavacTask; import com.sun.tools.javac.model.JavacTypes; diff --git a/tests/benchmarks/src/main/scala/benchmarks/CompileBench.scala b/tests/benchmarks/src/main/scala/benchmarks/CompileBench.scala index 00264ca0a..dd2820c9b 100644 --- a/tests/benchmarks/src/main/scala/benchmarks/CompileBench.scala +++ b/tests/benchmarks/src/main/scala/benchmarks/CompileBench.scala @@ -10,8 +10,8 @@ import scala.meta.inputs.Input import scala.meta.internal.io.FileIO import scala.meta.io.AbsolutePath -import com.sourcegraph.io.DeleteVisitor -import com.sourcegraph.scip_java.Dependencies +import com.sourcegraph.internal.io.DeleteVisitor +import com.sourcegraph.internal.scip_java.Dependencies import org.openjdk.jmh.annotations._ import tests.TestCompiler diff --git a/tests/benchmarks/src/main/scala/benchmarks/ScipSemanticdbBench.scala b/tests/benchmarks/src/main/scala/benchmarks/ScipSemanticdbBench.scala index df37874ab..100c1bc37 100644 --- a/tests/benchmarks/src/main/scala/benchmarks/ScipSemanticdbBench.scala +++ b/tests/benchmarks/src/main/scala/benchmarks/ScipSemanticdbBench.scala @@ -4,9 +4,9 @@ import java.nio.file.Files import java.nio.file.Path import java.util.concurrent.TimeUnit -import com.sourcegraph.io.DeleteVisitor -import com.sourcegraph.scip_java.Dependencies -import com.sourcegraph.scip_java.ScipJava +import com.sourcegraph.internal.io.DeleteVisitor +import com.sourcegraph.internal.scip_java.Dependencies +import com.sourcegraph.internal.scip_java.ScipJava import org.openjdk.jmh.annotations._ import tests.TestCompiler diff --git a/tests/buildTools/src/test/scala/tests/BaseBuildToolSuite.scala b/tests/buildTools/src/test/scala/tests/BaseBuildToolSuite.scala index 80fe64a9b..e2d687eec 100644 --- a/tests/buildTools/src/test/scala/tests/BaseBuildToolSuite.scala +++ b/tests/buildTools/src/test/scala/tests/BaseBuildToolSuite.scala @@ -9,8 +9,8 @@ import scala.util.Properties import scala.meta.internal.io.FileIO import scala.meta.io.AbsolutePath -import com.sourcegraph.scip_java.ScipJava -import com.sourcegraph.scip_java.buildtools.ClasspathEntry +import com.sourcegraph.internal.scip_java.ScipJava +import com.sourcegraph.internal.scip_java.buildtools.ClasspathEntry import moped.testkit.DeleteVisitor import moped.testkit.FileLayout import moped.testkit.MopedSuite diff --git a/tests/buildTools/src/test/scala/tests/ScipBuildToolSuite.scala b/tests/buildTools/src/test/scala/tests/ScipBuildToolSuite.scala index 8a2122228..d21fa5bd7 100644 --- a/tests/buildTools/src/test/scala/tests/ScipBuildToolSuite.scala +++ b/tests/buildTools/src/test/scala/tests/ScipBuildToolSuite.scala @@ -1,6 +1,6 @@ package tests -import com.sourcegraph.scip_java.{BuildInfo => V} +import com.sourcegraph.internal.scip_java.{BuildInfo => V} class ScipBuildToolSuite extends BaseBuildToolSuite { override def tags = List(SkipWindows) diff --git a/tests/snapshots/src/main/scala/tests/LibrarySnapshotGenerator.scala b/tests/snapshots/src/main/scala/tests/LibrarySnapshotGenerator.scala index d75b9498b..b50520acd 100644 --- a/tests/snapshots/src/main/scala/tests/LibrarySnapshotGenerator.scala +++ b/tests/snapshots/src/main/scala/tests/LibrarySnapshotGenerator.scala @@ -12,7 +12,7 @@ import java.nio.file.attribute.BasicFileAttributes import scala.util.Properties -import com.sourcegraph.scip_java.ScipJava +import com.sourcegraph.internal.scip_java.ScipJava import moped.reporters.ConsoleReporter class LibrarySnapshotGenerator extends SnapshotGenerator { diff --git a/tests/snapshots/src/main/scala/tests/MinimizedSnapshotScipGenerator.scala b/tests/snapshots/src/main/scala/tests/MinimizedSnapshotScipGenerator.scala index 9c8150b8b..346d7c7e7 100644 --- a/tests/snapshots/src/main/scala/tests/MinimizedSnapshotScipGenerator.scala +++ b/tests/snapshots/src/main/scala/tests/MinimizedSnapshotScipGenerator.scala @@ -10,10 +10,10 @@ import scala.jdk.CollectionConverters.CollectionHasAsScala import scala.meta.internal.io.FileIO import scala.meta.io.AbsolutePath -import com.sourcegraph.Scip.Index -import com.sourcegraph.io.DeleteVisitor -import com.sourcegraph.scip_java.ScipJava -import com.sourcegraph.scip_java.ScipPrinters +import com.sourcegraph.internal.Scip.Index +import com.sourcegraph.internal.io.DeleteVisitor +import com.sourcegraph.internal.scip_java.ScipJava +import com.sourcegraph.internal.scip_java.ScipPrinters class MinimizedSnapshotScipGenerator extends SnapshotGenerator { def run(args: List[String]): Unit = { diff --git a/tests/snapshots/src/main/scala/tests/SaveSnapshotHandler.scala b/tests/snapshots/src/main/scala/tests/SaveSnapshotHandler.scala index 5283d622b..c94f5f603 100644 --- a/tests/snapshots/src/main/scala/tests/SaveSnapshotHandler.scala +++ b/tests/snapshots/src/main/scala/tests/SaveSnapshotHandler.scala @@ -7,7 +7,7 @@ import java.util.concurrent.ConcurrentLinkedDeque import scala.jdk.CollectionConverters._ -import com.sourcegraph.io.DeleteVisitor +import com.sourcegraph.internal.io.DeleteVisitor class SaveSnapshotHandler extends SnapshotHandler { private val writtenTests = new ConcurrentLinkedDeque[Path]() diff --git a/tests/snapshots/src/main/scala/tests/SemanticdbFile.scala b/tests/snapshots/src/main/scala/tests/SemanticdbFile.scala index 678c46c4a..e1bc3d586 100644 --- a/tests/snapshots/src/main/scala/tests/SemanticdbFile.scala +++ b/tests/snapshots/src/main/scala/tests/SemanticdbFile.scala @@ -6,8 +6,8 @@ import scala.meta.internal.io.FileIO import scala.meta.io.AbsolutePath import scala.meta.io.RelativePath -import com.sourcegraph.semanticdb_javac.Semanticdb.TextDocument -import com.sourcegraph.semanticdb_javac.Semanticdb.TextDocuments +import com.sourcegraph.internal.semanticdb_javac.Semanticdb.TextDocument +import com.sourcegraph.internal.semanticdb_javac.Semanticdb.TextDocuments case class SemanticdbFile( sourceroot: AbsolutePath, diff --git a/tests/unit/src/main/scala/tests/CompileResult.scala b/tests/unit/src/main/scala/tests/CompileResult.scala index 108cbf130..4b789042e 100644 --- a/tests/unit/src/main/scala/tests/CompileResult.scala +++ b/tests/unit/src/main/scala/tests/CompileResult.scala @@ -1,6 +1,6 @@ package tests -import com.sourcegraph.semanticdb_javac.Semanticdb +import com.sourcegraph.internal.semanticdb_javac.Semanticdb case class CompileResult( byteCode: Array[Byte], diff --git a/tests/unit/src/main/scala/tests/SimpleFileManager.java b/tests/unit/src/main/scala/tests/SimpleFileManager.java index 49c41ea29..bb6f0a913 100644 --- a/tests/unit/src/main/scala/tests/SimpleFileManager.java +++ b/tests/unit/src/main/scala/tests/SimpleFileManager.java @@ -9,31 +9,29 @@ import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; -import com.sourcegraph.semanticdb_javac.SemanticdbJavacOptions; +import com.sourcegraph.internal.semanticdb_javac.SemanticdbJavacOptions; -public class SimpleFileManager - extends ForwardingJavaFileManager { +public class SimpleFileManager extends ForwardingJavaFileManager { - public final List compiled = new ArrayList<>(); - public final Path targetroot; + public final List compiled = new ArrayList<>(); + public final Path targetroot; - protected SimpleFileManager(StandardJavaFileManager fileManager, Path targetroot) { - super(fileManager); - this.targetroot = targetroot; - } + protected SimpleFileManager(StandardJavaFileManager fileManager, Path targetroot) { + super(fileManager); + this.targetroot = targetroot; + } - // standard constructors/getters + // standard constructors/getters - @Override - public JavaFileObject getJavaFileForOutput(Location location, - String className, JavaFileObject.Kind kind, FileObject sibling) { - URI uri = targetroot.resolve(className).toUri(); - SimpleClassFile result = new SimpleClassFile(uri); - if (!className.equals(SemanticdbJavacOptions.stubClassName)) { - compiled.add(result); - } - return result; - } + @Override + public JavaFileObject getJavaFileForOutput(Location location, String className, JavaFileObject.Kind kind, + FileObject sibling) { + URI uri = targetroot.resolve(className).toUri(); + SimpleClassFile result = new SimpleClassFile(uri); + if (!className.equals(SemanticdbJavacOptions.stubClassName)) { + compiled.add(result); + } + return result; + } } - diff --git a/tests/unit/src/main/scala/tests/TempDirectories.scala b/tests/unit/src/main/scala/tests/TempDirectories.scala index 86e6a5717..de6dee501 100644 --- a/tests/unit/src/main/scala/tests/TempDirectories.scala +++ b/tests/unit/src/main/scala/tests/TempDirectories.scala @@ -3,7 +3,7 @@ package tests import java.nio.file.Files import java.nio.file.Path -import com.sourcegraph.io.DeleteVisitor +import com.sourcegraph.internal.io.DeleteVisitor import munit.FunSuite trait TempDirectories { diff --git a/tests/unit/src/main/scala/tests/TestCompiler.scala b/tests/unit/src/main/scala/tests/TestCompiler.scala index 7e2db4348..cfbffef11 100644 --- a/tests/unit/src/main/scala/tests/TestCompiler.scala +++ b/tests/unit/src/main/scala/tests/TestCompiler.scala @@ -17,9 +17,9 @@ import scala.meta.io.AbsolutePath import scala.meta.io.Classpath import scala.meta.pc.PresentationCompiler -import com.sourcegraph.semanticdb_javac.Semanticdb -import com.sourcegraph.semanticdb_javac.Semanticdb.TextDocument -import com.sourcegraph.semanticdb_javac.Semanticdb.TextDocuments +import com.sourcegraph.internal.semanticdb_javac.Semanticdb +import com.sourcegraph.internal.semanticdb_javac.Semanticdb.TextDocument +import com.sourcegraph.internal.semanticdb_javac.Semanticdb.TextDocuments object TestCompiler { val PROCESSOR_PATH = System.getProperty("java.class.path") diff --git a/tests/unit/src/test/scala/tests/GeneratedConstructorSuite.scala b/tests/unit/src/test/scala/tests/GeneratedConstructorSuite.scala index 6862c7d56..606970745 100644 --- a/tests/unit/src/test/scala/tests/GeneratedConstructorSuite.scala +++ b/tests/unit/src/test/scala/tests/GeneratedConstructorSuite.scala @@ -2,7 +2,7 @@ package tests import scala.meta.inputs.Input -import com.sourcegraph.semanticdb_javac.Semanticdb.TextDocument +import com.sourcegraph.internal.semanticdb_javac.Semanticdb.TextDocument import munit.FunSuite import munit.TestOptions diff --git a/tests/unit/src/test/scala/tests/JavaVersionSuite.scala b/tests/unit/src/test/scala/tests/JavaVersionSuite.scala index 013cadccc..0c85a78db 100644 --- a/tests/unit/src/test/scala/tests/JavaVersionSuite.scala +++ b/tests/unit/src/test/scala/tests/JavaVersionSuite.scala @@ -1,6 +1,6 @@ package tests -import com.sourcegraph.scip_semanticdb.JavaVersion +import com.sourcegraph.internal.scip_semanticdb.JavaVersion import munit.FunSuite import munit.TestOptions diff --git a/tests/unit/src/test/scala/tests/OverridesSuite.scala b/tests/unit/src/test/scala/tests/OverridesSuite.scala index daa732eef..4e2fa6340 100644 --- a/tests/unit/src/test/scala/tests/OverridesSuite.scala +++ b/tests/unit/src/test/scala/tests/OverridesSuite.scala @@ -4,7 +4,7 @@ import java.util.stream.Collectors import scala.meta.Input -import com.sourcegraph.scip_semanticdb.Symtab +import com.sourcegraph.internal.scip_semanticdb.Symtab import munit.FunSuite import munit.TestOptions diff --git a/tests/unit/src/test/scala/tests/ScalaVersionSuite.scala b/tests/unit/src/test/scala/tests/ScalaVersionSuite.scala index a52e94155..2e234688a 100644 --- a/tests/unit/src/test/scala/tests/ScalaVersionSuite.scala +++ b/tests/unit/src/test/scala/tests/ScalaVersionSuite.scala @@ -2,8 +2,8 @@ package tests import java.nio.file.Paths -import com.sourcegraph.scip_java.buildtools.ScalaVersion -import com.sourcegraph.scip_java.{BuildInfo => V} +import com.sourcegraph.internal.scip_java.buildtools.ScalaVersion +import com.sourcegraph.internal.scip_java.{BuildInfo => V} import munit.FunSuite import munit.TestOptions diff --git a/tests/unit/src/test/scala/tests/SymbolDescriptorSuite.scala b/tests/unit/src/test/scala/tests/SymbolDescriptorSuite.scala index 9e07f8d99..034363674 100644 --- a/tests/unit/src/test/scala/tests/SymbolDescriptorSuite.scala +++ b/tests/unit/src/test/scala/tests/SymbolDescriptorSuite.scala @@ -2,8 +2,8 @@ package tests import scala.meta.internal.semanticdb.Scala._ -import com.sourcegraph.scip_semanticdb.SymbolDescriptor -import com.sourcegraph.semanticdb_javac.SemanticdbSymbols.Descriptor.Kind +import com.sourcegraph.internal.scip_semanticdb.SymbolDescriptor +import com.sourcegraph.internal.semanticdb_javac.SemanticdbSymbols.Descriptor.Kind import munit.FunSuite import munit.TestOptions diff --git a/tests/unit/src/test/scala/tests/TargetedSuite.scala b/tests/unit/src/test/scala/tests/TargetedSuite.scala index eb19edf70..983fa33ba 100644 --- a/tests/unit/src/test/scala/tests/TargetedSuite.scala +++ b/tests/unit/src/test/scala/tests/TargetedSuite.scala @@ -7,8 +7,8 @@ import scala.meta.Input import scala.meta.Position import scala.meta.internal.inputs._ -import com.sourcegraph.semanticdb_javac.Semanticdb -import com.sourcegraph.semanticdb_javac.Semanticdb.TextDocument +import com.sourcegraph.internal.semanticdb_javac.Semanticdb +import com.sourcegraph.internal.semanticdb_javac.Semanticdb.TextDocument import munit.FunSuite import munit.TestOptions