From e14f6299d8800e2e54c1a930ea989bc8b9b2c4b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93lafur=20P=C3=A1ll=20Geirsson?= Date: Thu, 9 Jun 2022 17:48:33 +0200 Subject: [PATCH] Use a better Java package name for generated Protobuf classes --- .../com/sourcegraph/scip_java/buildtools/BazelBuildTool.scala | 2 ++ .../java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java | 2 +- .../main/java/com/sourcegraph/scip_semanticdb/ScipWriter.java | 2 +- scip-semanticdb/src/main/protobuf/scip.proto | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BazelBuildTool.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BazelBuildTool.scala index db568b09..696a186c 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BazelBuildTool.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BazelBuildTool.scala @@ -6,6 +6,8 @@ import com.sourcegraph.scip_java.commands.IndexCommand class BazelBuildTool(index: IndexCommand) extends BuildTool("Bazel", index) { + override def isHidden: Boolean = true + override def usedInCurrentDirectory(): Boolean = { Files.isRegularFile(index.workingDirectory.resolve("WORKSPACE")) } diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java index 62e6402c..db813fd6 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java @@ -7,7 +7,7 @@ import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolOccurrence; import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolOccurrence.Role; import com.sourcegraph.semanticdb_javac.SemanticdbSymbols; -import lib.codeintel.scip.Scip; +import com.sourcegraph.Scip; import java.io.IOException; import java.io.InputStream; diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipWriter.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipWriter.java index 8ec8237c..2136de7b 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipWriter.java +++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipWriter.java @@ -6,7 +6,7 @@ import com.sourcegraph.lsif_protocol.LsifPosition; import com.sourcegraph.semanticdb_javac.Semanticdb; import com.sourcegraph.semanticdb_javac.SemanticdbSymbols; -import lib.codeintel.scip.Scip; +import com.sourcegraph.Scip; import java.io.BufferedOutputStream; import java.io.IOException; diff --git a/scip-semanticdb/src/main/protobuf/scip.proto b/scip-semanticdb/src/main/protobuf/scip.proto index 6e0b8cc6..09f510ba 100644 --- a/scip-semanticdb/src/main/protobuf/scip.proto +++ b/scip-semanticdb/src/main/protobuf/scip.proto @@ -13,6 +13,7 @@ syntax = "proto3"; package lib.codeintel.scip; option go_package = "github.com/sourcegraph/sourcegraph/lib/codeintel/scip/"; +option java_package = "com.sourcegraph"; // 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