Skip to content

Fixed some compilation warnings. #7631

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fixed some compilation warnings. #7631

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
46 changes: 16 additions & 30 deletions plugin_dev/src/com/google/idea/blaze/plugin/run/BlazeIntellijPluginConfigurationType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.model.BlazeProjectData;
import com.google.idea.blaze.base.model.primitives.Label;
Expand All @@ -43,8 +40,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;

/**
Expand Down Expand Up @@ -91,11 +88,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();
}
};
Expand All @@ -105,7 +101,7 @@ private BlazeIntellijPluginConfigurationFactory(ConfigurationType type) {
}

@Override
public String getId() {
public @NotNull String getId() {
// must be left unchanged for backwards compatibility
return getName();
}
Expand All @@ -116,7 +112,7 @@ public boolean isApplicable(Project project) {
}

@Override
public RunConfiguration createTemplateConfiguration(Project project) {
public @NotNull RunConfiguration createTemplateConfiguration(@NotNull Project project) {

if (PORTABLE_DEPLOYER_ENABLED) {
// TODO
Expand Down Expand Up @@ -168,30 +164,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);
}
}

Expand All @@ -200,7 +186,7 @@ public static BlazeIntellijPluginConfigurationType getInstance() {
}

@Override
public String getDisplayName() {
public @NotNull String getDisplayName() {
return Blaze.defaultBuildSystemName() + " IntelliJ Plugin";
}

Expand All @@ -215,7 +201,7 @@ public Icon getIcon() {
}

@Override
public String getId() {
public @NotNull String getId() {
return "BlazeIntellijPluginConfigurationType";
}

Expand Down