Merge remote-tracking branch 'origin/master'

This commit is contained in:
Viktor Shatrov
2018-12-17 23:45:50 +03:00
2 changed files with 5 additions and 1 deletions
@@ -4,6 +4,10 @@ package com.intellij.ide.macro;
import com.intellij.openapi.extensions.ExtensionPointName;
import org.jetbrains.annotations.NotNull;
/**
* This filter allows to hide some macro irrelevant or invalid in certain IDE-related context
* (e.g. "JDKPath" macro is useless when IDE doesn't support Java at all)
*/
public abstract class MacroFilter {
public static final ExtensionPointName<MacroFilter> EP_NAME = ExtensionPointName.create("com.intellij.macroFilter");
@@ -40,7 +40,7 @@ public class AbstractNewProjectStep<T> extends DefaultActionGroup implements Dum
private static final Logger LOG = Logger.getInstance(AbstractNewProjectStep.class);
protected AbstractNewProjectStep(@NotNull Customization<T> customization) {
super("Select Project Type", true);
super(null, true);
AbstractCallback<T> callback = customization.createCallback();
ProjectSpecificAction projectSpecificAction = customization.createProjectSpecificAction(callback);