falsepattern/ZigBrains
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

chore: ZigConfigEditor flattened imports

Browse source
This commit is contained in:
FalsePattern 2024-05-15 18:09:11 +02:00
parent 695fe43c28
commit bd6eec8da1
Signed by: falsepattern
GPG key ID: E930CDEC50C50E23
4 changed files with 42 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/execution/binary/ZigExecConfigBinary.java
View file

@ -17,7 +17,9 @@
package com.falsepattern.zigbrains.debugger.execution.binary; package com.falsepattern.zigbrains.debugger.execution.binary;
import com.falsepattern.zigbrains.common.util.CollectionUtil; import com.falsepattern.zigbrains.common.util.CollectionUtil;
import com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor; import com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor.ArgsConfigurable;
import com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor.FilePathConfigurable;
import com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor.ZigConfigurable;
import com.falsepattern.zigbrains.project.execution.base.ZigExecConfigBase; import com.falsepattern.zigbrains.project.execution.base.ZigExecConfigBase;
import com.intellij.execution.Executor; import com.intellij.execution.Executor;
import com.intellij.execution.configurations.ConfigurationFactory; import com.intellij.execution.configurations.ConfigurationFactory;
@ -32,8 +34,8 @@ import java.util.List;
@Getter @Getter
public class ZigExecConfigBinary extends ZigExecConfigBase<ZigExecConfigBinary> { public class ZigExecConfigBinary extends ZigExecConfigBase<ZigExecConfigBinary> {
private ZigConfigEditor.FilePathConfigurable exePath = new ZigConfigEditor.FilePathConfigurable("exePath", "Executable program path (not the zig compiler)"); private FilePathConfigurable exePath = new FilePathConfigurable("exePath", "Executable program path (not the zig compiler)");
private ZigConfigEditor.ArgsConfigurable args = new ZigConfigEditor.ArgsConfigurable("args", "Command line arguments"); private ArgsConfigurable args = new ArgsConfigurable("args", "Command line arguments");
public ZigExecConfigBinary(@NotNull Project project, @NotNull ConfigurationFactory factory) { public ZigExecConfigBinary(@NotNull Project project, @NotNull ConfigurationFactory factory) {
super(project, factory, "Zig-compiled native executable"); super(project, factory, "Zig-compiled native executable");
@ -59,7 +61,7 @@ public class ZigExecConfigBinary extends ZigExecConfigBase<ZigExecConfigBinary>
} }
@Override @Override
public @NotNull List<ZigConfigEditor.ZigConfigurable<?>> getConfigurables() { public @NotNull List<ZigConfigurable<?>> getConfigurables() {
return CollectionUtil.concat(super.getConfigurables(), exePath, args); return CollectionUtil.concat(super.getConfigurables(), exePath, args);
} }

18
modules/project/src/main/java/com/falsepattern/zigbrains/project/execution/build/ZigExecConfigBuild.java
View file

@ -18,7 +18,9 @@ package com.falsepattern.zigbrains.project.execution.build;
import com.falsepattern.zigbrains.common.ZBFeatures; import com.falsepattern.zigbrains.common.ZBFeatures;
import com.falsepattern.zigbrains.common.util.CollectionUtil; import com.falsepattern.zigbrains.common.util.CollectionUtil;
import com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor; import com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor.ArgsConfigurable;
import com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor.CheckboxConfigurable;
import com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor.FilePathConfigurable;
import com.falsepattern.zigbrains.project.execution.base.ZigExecConfigBase; import com.falsepattern.zigbrains.project.execution.base.ZigExecConfigBase;
import com.falsepattern.zigbrains.project.util.CLIUtil; import com.falsepattern.zigbrains.project.util.CLIUtil;
import com.intellij.execution.ExecutionException; import com.intellij.execution.ExecutionException;
@ -34,13 +36,15 @@ import org.jetbrains.annotations.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import static com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor.*;
@Getter @Getter
public class ZigExecConfigBuild extends ZigExecConfigBase<ZigExecConfigBuild> { public class ZigExecConfigBuild extends ZigExecConfigBase<ZigExecConfigBuild> {
private ZigConfigEditor.ArgsConfigurable buildSteps = new ZigConfigEditor.ArgsConfigurable("buildSteps", "Build steps"); private ArgsConfigurable buildSteps = new ArgsConfigurable("buildSteps", "Build steps");
private ZigConfigEditor.ArgsConfigurable extraArgs = new ZigConfigEditor.ArgsConfigurable("extraArgs", "Extra command line arguments"); private ArgsConfigurable extraArgs = new ArgsConfigurable("extraArgs", "Extra command line arguments");
private ZigConfigEditor.CheckboxConfigurable colored = ZigConfigEditor.coloredConfigurable("colored"); private CheckboxConfigurable colored = coloredConfigurable("colored");
private ZigConfigEditor.FilePathConfigurable exePath = new ZigConfigEditor.FilePathConfigurable("exePath", "Output executable created by the build (debugging, autodetect if empty)"); private FilePathConfigurable exePath = new FilePathConfigurable("exePath", "Output executable created by the build (debugging, autodetect if empty)");
private ZigConfigEditor.ArgsConfigurable exeArgs = new ZigConfigEditor.ArgsConfigurable("exeArgs", "Command line arguments for executable (debugging)"); private ArgsConfigurable exeArgs = new ArgsConfigurable("exeArgs", "Command line arguments for executable (debugging)");
public ZigExecConfigBuild(@NotNull Project project, @NotNull ConfigurationFactory factory) { public ZigExecConfigBuild(@NotNull Project project, @NotNull ConfigurationFactory factory) {
super(project, factory, "Zig Build"); super(project, factory, "Zig Build");
} }
@ -75,7 +79,7 @@ public class ZigExecConfigBuild extends ZigExecConfigBase<ZigExecConfigBuild> {
} }
@Override @Override
public @NotNull List<ZigConfigEditor.ZigConfigurable<?>> getConfigurables() { public @NotNull List<ZigConfigurable<?>> getConfigurables() {
val baseCfg = CollectionUtil.concat(super.getConfigurables(), buildSteps, extraArgs, colored); val baseCfg = CollectionUtil.concat(super.getConfigurables(), buildSteps, extraArgs, colored);
if (ZBFeatures.debug()) { if (ZBFeatures.debug()) {
return CollectionUtil.concat(baseCfg, exePath, exeArgs); return CollectionUtil.concat(baseCfg, exePath, exeArgs);

20
modules/project/src/main/java/com/falsepattern/zigbrains/project/execution/run/ZigExecConfigRun.java
View file

@ -17,7 +17,11 @@
package com.falsepattern.zigbrains.project.execution.run; package com.falsepattern.zigbrains.project.execution.run;
import com.falsepattern.zigbrains.common.util.CollectionUtil; import com.falsepattern.zigbrains.common.util.CollectionUtil;
import com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor; import com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor.ArgsConfigurable;
import com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor.CheckboxConfigurable;
import com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor.FilePathConfigurable;
import com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor.OptimizationConfigurable;
import com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor.ZigConfigurable;
import com.falsepattern.zigbrains.project.execution.base.ZigExecConfigBase; import com.falsepattern.zigbrains.project.execution.base.ZigExecConfigBase;
import com.falsepattern.zigbrains.project.util.CLIUtil; import com.falsepattern.zigbrains.project.util.CLIUtil;
import com.intellij.execution.Executor; import com.intellij.execution.Executor;
@ -32,13 +36,15 @@ import org.jetbrains.annotations.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import static com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor.coloredConfigurable;
@Getter @Getter
public class ZigExecConfigRun extends ZigExecConfigBase<ZigExecConfigRun> { public class ZigExecConfigRun extends ZigExecConfigBase<ZigExecConfigRun> {
private ZigConfigEditor.FilePathConfigurable filePath = new ZigConfigEditor.FilePathConfigurable("filePath", "File Path"); private FilePathConfigurable filePath = new FilePathConfigurable("filePath", "File Path");
private ZigConfigEditor.CheckboxConfigurable colored = ZigConfigEditor.coloredConfigurable("colored"); private CheckboxConfigurable colored = coloredConfigurable("colored");
private ZigConfigEditor.OptimizationConfigurable optimization = new ZigConfigEditor.OptimizationConfigurable("optimization"); private OptimizationConfigurable optimization = new OptimizationConfigurable("optimization");
private ZigConfigEditor.ArgsConfigurable compilerArgs = new ZigConfigEditor.ArgsConfigurable("compilerArgs", "Extra compiler command line arguments"); private ArgsConfigurable compilerArgs = new ArgsConfigurable("compilerArgs", "Extra compiler command line arguments");
private ZigConfigEditor.ArgsConfigurable exeArgs = new ZigConfigEditor.ArgsConfigurable("exeArgs", "Output program command line arguments"); private ArgsConfigurable exeArgs = new ArgsConfigurable("exeArgs", "Output program command line arguments");
public ZigExecConfigRun(@NotNull Project project, @NotNull ConfigurationFactory factory) { public ZigExecConfigRun(@NotNull Project project, @NotNull ConfigurationFactory factory) {
super(project, factory, "Zig Run"); super(project, factory, "Zig Run");
} }
@ -77,7 +83,7 @@ public class ZigExecConfigRun extends ZigExecConfigBase<ZigExecConfigRun> {
} }
@Override @Override
public @NotNull List<ZigConfigEditor.ZigConfigurable<?>> getConfigurables() { public @NotNull List<ZigConfigurable<?>> getConfigurables() {
return CollectionUtil.concat(super.getConfigurables(), filePath, optimization, colored, compilerArgs, exeArgs); return CollectionUtil.concat(super.getConfigurables(), filePath, optimization, colored, compilerArgs, exeArgs);
} }

18
modules/project/src/main/java/com/falsepattern/zigbrains/project/execution/test/ZigExecConfigTest.java
View file

@ -18,7 +18,11 @@ package com.falsepattern.zigbrains.project.execution.test;
import com.falsepattern.zigbrains.common.util.CollectionUtil; import com.falsepattern.zigbrains.common.util.CollectionUtil;
import com.falsepattern.zigbrains.project.execution.base.ProfileStateBase; import com.falsepattern.zigbrains.project.execution.base.ProfileStateBase;
import com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor; import com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor.ArgsConfigurable;
import com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor.CheckboxConfigurable;
import com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor.FilePathConfigurable;
import com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor.OptimizationConfigurable;
import com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor.ZigConfigurable;
import com.falsepattern.zigbrains.project.execution.base.ZigExecConfigBase; import com.falsepattern.zigbrains.project.execution.base.ZigExecConfigBase;
import com.falsepattern.zigbrains.project.util.CLIUtil; import com.falsepattern.zigbrains.project.util.CLIUtil;
import com.intellij.execution.Executor; import com.intellij.execution.Executor;
@ -33,12 +37,14 @@ import org.jetbrains.annotations.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import static com.falsepattern.zigbrains.project.execution.base.ZigConfigEditor.coloredConfigurable;
@Getter @Getter
public class ZigExecConfigTest extends ZigExecConfigBase<ZigExecConfigTest> { public class ZigExecConfigTest extends ZigExecConfigBase<ZigExecConfigTest> {
private ZigConfigEditor.FilePathConfigurable filePath = new ZigConfigEditor.FilePathConfigurable("filePath", "File path"); private FilePathConfigurable filePath = new FilePathConfigurable("filePath", "File path");
private ZigConfigEditor.CheckboxConfigurable colored = ZigConfigEditor.coloredConfigurable("colored"); private CheckboxConfigurable colored = coloredConfigurable("colored");
private ZigConfigEditor.OptimizationConfigurable optimization = new ZigConfigEditor.OptimizationConfigurable("optimization"); private OptimizationConfigurable optimization = new OptimizationConfigurable("optimization");
private ZigConfigEditor.ArgsConfigurable compilerArgs = new ZigConfigEditor.ArgsConfigurable("compilerArgs", "Extra compiler command line arguments"); private ArgsConfigurable compilerArgs = new ArgsConfigurable("compilerArgs", "Extra compiler command line arguments");
public ZigExecConfigTest(@NotNull Project project, @NotNull ConfigurationFactory factory) { public ZigExecConfigTest(@NotNull Project project, @NotNull ConfigurationFactory factory) {
super(project, factory, "Zig Test"); super(project, factory, "Zig Test");
} }
@ -80,7 +86,7 @@ public class ZigExecConfigTest extends ZigExecConfigBase<ZigExecConfigTest> {
} }
@Override @Override
public @NotNull List<ZigConfigEditor.ZigConfigurable<?>> getConfigurables() { public @NotNull List<ZigConfigurable<?>> getConfigurables() {
return CollectionUtil.concat(super.getConfigurables(), filePath, optimization, colored, compilerArgs); return CollectionUtil.concat(super.getConfigurables(), filePath, optimization, colored, compilerArgs);
} }
} }