Fixed some compilation warnings.

Author: odisseus

plugin_dev/src/com/google/idea/blaze/plugin/run/BlazeIntellijPluginConfigurationType.java

@@ -15,9 +15,6 @@
  */
 package com.google.idea.blaze.plugin.run;
 
-import static java.util.stream.Collectors.toCollection;
-
-import com.google.common.base.Splitter;
 import com.google.idea.blaze.base.dependencies.TargetInfo;
 import com.google.idea.blaze.base.ideinfo.TargetIdeInfo;
 import com.google.idea.blaze.base.model.BlazeProjectData;
@@ -44,8 +41,8 @@
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.NullableLazyValue;
 import com.intellij.util.execution.ParametersListUtil;
-import java.util.ArrayList;
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
+
 import javax.swing.Icon;
 
 /**
@@ -92,11 +89,10 @@ public void setupConfiguration(RunConfiguration configuration, Label target) {
 
   static class BlazeIntellijPluginConfigurationFactory extends ConfigurationFactory {
 
-    private static NullableLazyValue<String> currentVmOptions =
+    private static final NullableLazyValue<String> currentVmOptions =
         new NullableLazyValue<String>() {
-          @Nullable
           @Override
-          protected String compute() {
+          protected @NotNull String compute() {
             return defaultVmOptions();
           }
         };
@@ -106,7 +102,7 @@ private BlazeIntellijPluginConfigurationFactory(ConfigurationType type) {
     }
 
     @Override
-    public String getId() {
+    public @NotNull String getId() {
       // must be left unchanged for backwards compatibility
       return getName();
     }
@@ -117,7 +113,7 @@ public boolean isApplicable(Project project) {
     }
 
     @Override
-    public RunConfiguration createTemplateConfiguration(Project project) {
+    public @NotNull RunConfiguration createTemplateConfiguration(@NotNull Project project) {
 
       if (PORTABLE_DEPLOYER_ENABLED) {
         // TODO
@@ -169,30 +165,20 @@ void setupConfigurationForRule(BlazeIntellijPluginConfiguration configuration, L
     }
 
     @Override
-    public RunConfigurationSingletonPolicy getSingletonPolicy() {
+    public @NotNull RunConfigurationSingletonPolicy getSingletonPolicy() {
       return RunConfigurationSingletonPolicy.SINGLE_INSTANCE_ONLY;
     }
 
     private static String defaultVmOptions() {
-      String vmoptionsText = VMOptions.read();
-      if (vmoptionsText == null) {
-        return null;
-      }
-      ArrayList<String> vmoptions =
-          Splitter.on("\n")
-              .trimResults()
-              .omitEmptyStrings()
-              .splitToStream(vmoptionsText)
-              .filter(opt -> !opt.startsWith("#"))
-              .collect(toCollection(ArrayList::new));
-
-      String vmoptionsFile = System.getProperty("jb.vmOptionsFile");
-      if (vmoptionsFile != null) {
-        vmoptions.add("-Djb.vmOptionsFile=" + vmoptionsFile);
+      var vmOptions = VMOptions.readOptions("", false);
+
+      String vmOptionsFile = System.getProperty("jb.vmOptionsFile");
+      if (vmOptionsFile != null) {
+        vmOptions.add("-Djb.vmOptionsFile=" + vmOptionsFile);
       }
-      vmoptions.add("-Didea.is.internal=true");
+      vmOptions.add("-Didea.is.internal=true");
 
-      return ParametersListUtil.join(vmoptions);
+      return ParametersListUtil.join(vmOptions);
     }
   }
 
@@ -201,7 +187,7 @@ public static BlazeIntellijPluginConfigurationType getInstance() {
   }
 
   @Override
-  public String getDisplayName() {
+  public @NotNull String getDisplayName() {
     return Blaze.defaultBuildSystemName() + " IntelliJ Plugin";
   }
 
@@ -216,7 +202,7 @@ public Icon getIcon() {
   }
 
   @Override
-  public String getId() {
+  public @NotNull String getId() {
     return "BlazeIntellijPluginConfigurationType";
   }