Add src/main/proto to proto_paths by default

If the $MODULE_DIR$/src/main/proto directory exists, then this is automatically added as a proto_path while invoking the protoc compiler. This enables grouping of .proto files within src/main/proto into different packages or directories, while being able to import .proto files from other packages in the same src/main/proto source root directory.

Author: sivasankariit

src/protobuf/compiler/PbCompiler.java

@@ -58,6 +58,7 @@ public class PbCompiler implements SourceGeneratingCompiler {
  private static final String PROTOC_LINUX = "protoc";
  private static final String PROTOC_MAC = "protoc";
 
+ private static final String DEFAULT_PROTO_SOURCE_ROOT = "src/main/proto";
 
  private static final Matcher ERROR_IN_LINE_MATCHER = Pattern.compile("[^:]*:[0-9]*:[0-9]*:.*").matcher("");
  private static final Matcher ERROR_IN_FILE_MATCHER = Pattern.compile("[^:]*:[^:]*").matcher("");
@@ -150,6 +151,14 @@ public void run(final Result<PsiDirectory> result) {
  for (String addtionalProtoPath : getModuleAdditionalProtoPaths(item)) {
  compilerCommand.append(" --proto_path=").append(addtionalProtoPath);
  }
+ // Add the default proto source root for the module if the directory exists.
+ VirtualFile moduleFile = item.getModule().getModuleFile();
+ if (moduleFile != null) {
+ VirtualFile protoSourceRoot = moduleFile.getParent().findFileByRelativePath(DEFAULT_PROTO_SOURCE_ROOT);
+ if ((protoSourceRoot != null) && protoSourceRoot.isDirectory()) {
+ compilerCommand.append(" --proto_path=").append(protoSourceRoot.getPath());
+ }
+ }
  compilerCommand.append(" --java_out=").append(outputPath);
  compilerCommand.append(" ").append(item.getPath());
  LOG.info("Invoking protoc: " + compilerCommand.toString());