Merge pull request #72 from likan999/master

Add a new option 'Generate Nano Protobuf'

Author: tcripps

resources/messages/PbBundle.properties

@@ -65,6 +65,7 @@ compiler.validate.error.title=Protocol Buffers compiler
 compiler.validate.error.unsupported.os=Plugin compiler does not support this OS.
 compiler.validate.error.path.to.protoc=Could not find 'protoc' at path "{0}". Check the compiler configuration.
 compiler.validate.error.protoc.not.executable=The 'protoc' compiler file is not executable.
+compiler.validate.error.protoc.javaout.nano.not.supported=Module {0} uses nano protobuf but the 'protoc' compiler doesn't support --javanano_out option.
 compiler.validate.error.output.source.directory.not.exists="{0}" does not exist.
 compiler.validate.error.output.source.directory.not.set=The output source directory for module "{0}" has not been set.
 compiler.validate.error.output.source.directory.not.created=Could not created the output source directory "{0}" for module "{1}". Please check your configuration and/or file permissions.

src/protobuf/compiler/PbCompiler.java

@@ -150,7 +150,12 @@ public void run(final Result<PsiDirectory> result) {
  for (String addtionalProtoPath : getModuleAdditionalProtoPaths(item)) {
  compilerCommand.append(" --proto_path=").append(addtionalProtoPath);
  }
- compilerCommand.append(" --java_out=").append(outputPath);
+ if (item.getFacet().getConfiguration().isGenerateNanoProto()) {
+ compilerCommand.append(" --javanano_out=");
+ } else {
+ compilerCommand.append(" --java_out=");
+ }
+ compilerCommand.append(outputPath);
  compilerCommand.append(" ").append(item.getPath());
  LOG.info("Invoking protoc: " + compilerCommand.toString());
  proc = Runtime.getRuntime().exec(compilerCommand.toString());
@@ -248,10 +253,21 @@ public boolean validateConfiguration(CompileScope compileScope) {
  return false;
  }
 
+ boolean compilerHasJavaNanoOutOption = hasJavaNanoOutOption(pathToCompiler);
+
  for (Module module : modules) {
  PbFacet facet = FacetManager.getInstance(module).getFacetByType(PbFacetType.ID);
  if (facet != null) {
- String outputPath = facet.getConfiguration().getCompilerOutputPath();
+ ProtobufFacetConfiguration configuration = facet.getConfiguration();
+
+ if (!compilerHasJavaNanoOutOption && configuration.isCompilationEnabled() && configuration.isGenerateNanoProto()) {
+ Messages.showErrorDialog(PbBundle.message(
+ "compiler.validate.error.protoc.javaout.nano.not.supported", module.getName()),
+ PbBundle.message("compiler.validate.error.title"));
+ return false;
+ }
+
+ String outputPath = configuration.getCompilerOutputPath();
 
  // Make sure the configuration has a value for the output source directory.
  if (outputPath == null) {
@@ -370,6 +386,21 @@ private void processLine(CompileContext context, String line, PbGenerationItem i
 
  }
 
+ private boolean hasJavaNanoOutOption(String pathToCompiler) {
+ try {
+ Process proc = Runtime.getRuntime().exec(new String[] { pathToCompiler, "--help" });
+ String[] helpLines = StreamUtil.readText(proc.getInputStream()).trim().split("\n");
+ for (String line : helpLines) {
+ if (line.contains("--javanano_out=")) {
+ return true;
+ }
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return false;
+ }
+
  public VirtualFile getPresentableFile(CompileContext context, Module module, VirtualFile outputRoot, VirtualFile generatedFile) {
  // TODO: Map the generated file back to the original file.
  return generatedFile;

src/protobuf/settings/facet/ProtobufDefaultFacetSettingsEditor.java

@@ -42,13 +42,14 @@ public JComponent createComponent() {
  @Override
  public boolean isModified() {
  return configuration.isCompilationEnabled() != commonSettingsEditor.getEnableCompilationCheckbox().isSelected() ||
- !configuration.getCompilerOutputPath().equals(commonSettingsEditor.getProtobufCompilerOutputPathField().getText());
+ configuration.isGenerateNanoProto() != commonSettingsEditor.getGenerateNanoProtoCheckBox().isSelected() ||
+ !configuration.getCompilerOutputPath().equals(commonSettingsEditor.getProtobufCompilerOutputPathField().getText()) ||
+ !configuration.getAdditionalProtoPaths().equals(commonSettingsEditor.getProtobufAdditionalProtoPaths().getText());
  }
 
  @Override
  public void apply() throws ConfigurationException {
  boolean isCompilationCheckboxEnabled = commonSettingsEditor.getEnableCompilationCheckbox().isSelected();
- configuration.setIsCompilationEnabled(isCompilationCheckboxEnabled);
  if (isCompilationCheckboxEnabled && !configuration.isCompilationEnabled()) {
  CompilerManager compilerManager = CompilerManager.getInstance(project);
  compilerManager.addCompilableFileType(PbFileType.PROTOBUF_FILE_TYPE);
@@ -61,13 +62,16 @@ public void apply() throws ConfigurationException {
  }
  }
 
+ configuration.setIsCompilationEnabled(isCompilationCheckboxEnabled);
+ configuration.setGenerateNanoProto(commonSettingsEditor.getGenerateNanoProtoCheckBox().isSelected());
  configuration.setCompilerOutputPath(commonSettingsEditor.getProtobufCompilerOutputPathField().getText().trim());
  configuration.setCompilerOutputPath(commonSettingsEditor.getProtobufAdditionalProtoPaths().getText().trim());
  }
 
  @Override
  public void reset() {
  commonSettingsEditor.getEnableCompilationCheckbox().setSelected(configuration.isCompilationEnabled());
+ commonSettingsEditor.getGenerateNanoProtoCheckBox().setSelected(configuration.isGenerateNanoProto());
  commonSettingsEditor.getProtobufCompilerOutputPathField().setText(configuration.getCompilerOutputPath());
  commonSettingsEditor.getProtobufAdditionalProtoPaths().setText(configuration.getAdditionalProtoPaths());
  }

src/protobuf/settings/facet/ProtobufFacetCommonSettingsEditor.form

@@ -8,7 +8,7 @@
  <properties/>
  <border type="none"/>
  <children>
- <grid id="bdbef" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+ <grid id="bdbef" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
  <margin top="5" left="5" bottom="5" right="5"/>
  <constraints>
  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -25,33 +25,42 @@
  <thirdStateEnabled value="false"/>
  </properties>
  </component>
+ <component id="39f9" class="com.intellij.util.ui.ThreeStateCheckBox" binding="generateNanoProtoCheckBox">
+ <constraints>
+ <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+ </constraints>
+ <properties>
+ <text value="Generate nano proto"/>
+ <thirdStateEnabled value="false"/>
+ </properties>
+ </component>
  <component id="81a1c" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="protobufCompilerOutputPath">
  <constraints>
- <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+ <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
  <preferred-size width="150" height="-1"/>
  </grid>
  </constraints>
  <properties/>
  </component>
  <component id="ed268" class="javax.swing.JLabel">
  <constraints>
- <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+ <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
  </constraints>
  <properties>
  <text resource-bundle="messages/PbBundle" key="compiler.configurable.source.directory"/>
  </properties>
  </component>
  <component id="a2f86" class="javax.swing.JLabel">
  <constraints>
- <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+ <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
  </constraints>
  <properties>
  <text resource-bundle="messages/PbBundle" key="facet.protobuf.additional.proto.paths.text"/>
  </properties>
  </component>
  <component id="c8a48" class="javax.swing.JTextField" binding="protobufAdditionalProtoPaths">
  <constraints>
- <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+ <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
  <preferred-size width="150" height="-1"/>
  </grid>
  </constraints>

src/protobuf/settings/facet/ProtobufFacetCommonSettingsEditor.java

@@ -13,6 +13,7 @@ public class ProtobufFacetCommonSettingsEditor extends JComponent {
 
  private JPanel mainPanel;
  private ThreeStateCheckBox enableCompilationCheckBox;
+ private ThreeStateCheckBox generateNanoProtoCheckBox;
  private TextFieldWithBrowseButton protobufCompilerOutputPath;
  private JTextField protobufAdditionalProtoPaths;
 
@@ -28,6 +29,10 @@ public ThreeStateCheckBox getEnableCompilationCheckbox() {
  return enableCompilationCheckBox;
  }
 
+ public ThreeStateCheckBox getGenerateNanoProtoCheckBox() {
+ return generateNanoProtoCheckBox;
+ }
+
  public TextFieldWithBrowseButton getProtobufCompilerOutputPathField() {
  return protobufCompilerOutputPath;
  }

src/protobuf/settings/facet/ProtobufFacetConfiguration.java

@@ -26,6 +26,7 @@
 public class ProtobufFacetConfiguration implements FacetConfiguration, PersistentStateComponent<ProtobufFacetSettings> {
 
  private boolean compilationEnabled = true;
+ private boolean generateNanoProto = false;
  private String compilerOutputPath = "";
  private String additionalProtoPaths = "";
 
@@ -48,6 +49,7 @@ public void writeExternal(Element element) throws WriteExternalException {
  public ProtobufFacetSettings getState() {
  ProtobufFacetSettings settings = new ProtobufFacetSettings();
  settings.COMPILE_PROTO = compilationEnabled;
+ settings.GENERATE_NANO_PROTO = generateNanoProto;
  settings.COMPILER_OUTPUT_SOURCE_DIRECTORY = compilerOutputPath;
  settings.COMPILER_ADDITIONAL_PROTO_PATHS = additionalProtoPaths;
  return settings;
@@ -56,6 +58,7 @@ public ProtobufFacetSettings getState() {
  @Override
  public void loadState(ProtobufFacetSettings settings) {
  compilationEnabled = settings.COMPILE_PROTO;
+ generateNanoProto = settings.GENERATE_NANO_PROTO;
  compilerOutputPath = settings.COMPILER_OUTPUT_SOURCE_DIRECTORY;
  additionalProtoPaths = settings.COMPILER_ADDITIONAL_PROTO_PATHS;
  }
@@ -68,6 +71,14 @@ public void setIsCompilationEnabled(boolean value) {
  compilationEnabled = value;
  }
 
+ public boolean isGenerateNanoProto() {
+ return generateNanoProto;
+ }
+
+ public void setGenerateNanoProto(boolean value) {
+ generateNanoProto = value;
+ }
+
  public String getCompilerOutputPath() {
  return compilerOutputPath;
  }

src/protobuf/settings/facet/ProtobufFacetEditor.java

@@ -35,6 +35,7 @@ public ProtobufFacetEditor(FacetEditorContext editorContext, FacetValidatorsMana
  final Module module = editorContext.getModule();
 
  commonSettingsEditor.getEnableCompilationCheckbox().setSelected(configuration.isCompilationEnabled());
+ commonSettingsEditor.getGenerateNanoProtoCheckBox().setSelected(configuration.isGenerateNanoProto());
  commonSettingsEditor.getProtobufCompilerOutputPathField().setText(configuration.getCompilerOutputPath());
  commonSettingsEditor.getProtobufCompilerOutputPathField().addBrowseFolderListener(project, new CompilerOutputBrowseFolderActionListener(project, module, commonSettingsEditor.getProtobufCompilerOutputPathField()));
  commonSettingsEditor.getProtobufAdditionalProtoPaths().setText(configuration.getAdditionalProtoPaths());
@@ -59,17 +60,20 @@ public void onFacetInitialized(@NotNull final Facet facet) {
  @Override
  public boolean isModified() {
  boolean compilationEnabled = commonSettingsEditor.getEnableCompilationCheckbox().isSelected();
+ boolean generateNanoProto = commonSettingsEditor.getGenerateNanoProtoCheckBox().isSelected();
  String outputPath = commonSettingsEditor.getProtobufCompilerOutputPathField().getText().trim();
  String additionalProtoPaths = commonSettingsEditor.getProtobufAdditionalProtoPaths().getText().trim();
 
  return ((configuration.isCompilationEnabled() != compilationEnabled) ||
+ (configuration.isGenerateNanoProto() != generateNanoProto) ||
  (!Comparing.equal(configuration.getCompilerOutputPath(), FileUtil.toSystemIndependentName(outputPath))) ||
  (!Comparing.equal(configuration.getAdditionalProtoPaths(), toSystemIndependentPaths(additionalProtoPaths))));
  }
 
  @Override
  public void apply() throws ConfigurationException {
  configuration.setIsCompilationEnabled(commonSettingsEditor.getEnableCompilationCheckbox().isSelected());
+ configuration.setGenerateNanoProto(commonSettingsEditor.getGenerateNanoProtoCheckBox().isSelected());
  configuration.setCompilerOutputPath(FileUtil.toSystemIndependentName(commonSettingsEditor.getProtobufCompilerOutputPathField().getText().trim()));
  configuration.setAdditionalProtoPaths(toSystemIndependentPaths(commonSettingsEditor.getProtobufAdditionalProtoPaths().getText()));
  }
@@ -96,6 +100,10 @@ public JCheckBox getEnableCompilationCheckbox() {
  return commonSettingsEditor.getEnableCompilationCheckbox();
  }
 
+ public JCheckBox getGenerateNanoProtoCheckbox() {
+ return commonSettingsEditor.getGenerateNanoProtoCheckBox();
+ }
+
  public TextFieldWithBrowseButton getProtobufCompilerOutputPathField() {
  return commonSettingsEditor.getProtobufCompilerOutputPathField();
  }

src/protobuf/settings/facet/ProtobufFacetSettings.java

@@ -9,6 +9,9 @@ public class ProtobufFacetSettings {
  // Is compilation of .proto files enabled?
  public boolean COMPILE_PROTO = true;
 
+ // Do we generate nano protobuf instead?
+ public boolean GENERATE_NANO_PROTO = false;
+
  // The directory where the files resulting from protoc invocation will be created.
  public String COMPILER_OUTPUT_SOURCE_DIRECTORY = "";
 

src/protobuf/settings/facet/ProtobufMultipleFacetSettingsEditor.java

@@ -33,6 +33,14 @@ public JCheckBox fun(final FacetEditor facetEditor) {
  }
  });
 
+ // Bind to the generate nano proto checkbox.
+ helper.bind(commonSettingsEditor.getGenerateNanoProtoCheckBox(), editors, new NotNullFunction<FacetEditor, JCheckBox>() {
+ @NotNull
+ public JCheckBox fun(final FacetEditor facetEditor) {
+ return (facetEditor.getEditorTab(ProtobufFacetEditor.class)).getGenerateNanoProtoCheckbox();
+ }
+ });
+
  // Bind to the output source directory text field.
  helper.bind(commonSettingsEditor.getProtobufCompilerOutputPathField().getTextField(), editors, new NotNullFunction<FacetEditor, JTextField>() {
  @NotNull