Skip to content

Use a better Java package name for generated Protobuf classes #458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 9, 2022
Merged

Use a better Java package name for generated Protobuf classes #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BazelBuildTool.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
Expand Down
2 changes: 1 addition & 1 deletion scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions scip-semanticdb/src/main/protobuf/scip.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down