Skip to content

Commit 3000ad8

Browse files
committed
style: reformat with spotless
1 parent 50e2589 commit 3000ad8

File tree

2 files changed

+10
-21
lines changed

2 files changed

+10
-21
lines changed

lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ public static final class IdeaStepBuilder {
8484
private boolean useDefaults = true;
8585
@Nonnull
8686
private String binaryPath = IDEA_EXECUTABLE_DEFAULT;
87-
@Nullable
88-
private String codeStyleSettingsPath;
87+
@Nullable private String codeStyleSettingsPath;
8988
private final Map<String, String> ideaProperties = new HashMap<>();
9089

9190
@Nonnull
@@ -140,8 +139,7 @@ private static class State implements Serializable {
140139

141140
private final File uniqueBuildFolder;
142141
private final String binaryPath;
143-
@Nullable
144-
private final String codeStyleSettingsPath;
142+
@Nullable private final String codeStyleSettingsPath;
145143
private final boolean withDefaults;
146144
private final TreeMap<String, String> ideaProperties;
147145

@@ -190,7 +188,6 @@ private static String pathToExe(String binaryPath) {
190188
}
191189

192190
private static String macOsFix(String binaryPath) {
193-
194191
// on macOS, the binary is located in the .app bundle which might be invisible to the user
195192
// we try need to append the path to the binary
196193
File binary = new File(binaryPath);

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,7 @@ public void encoding(String charset) {
218218
protected FileCollection target, targetExclude;
219219

220220
/** The value from which files will be excluded if their content contain it. */
221-
@Nullable
222-
protected String targetExcludeContentPattern = null;
221+
@Nullable protected String targetExcludeContentPattern = null;
223222

224223
protected boolean isLicenseHeaderStep(FormatterStep formatterStep) {
225224
String formatterStepName = formatterStep.getName();
@@ -687,17 +686,13 @@ public abstract static class NpmStepConfig<T extends NpmStepConfig<?>> {
687686

688687
public static final String SPOTLESS_NPM_INSTALL_CACHE_DEFAULT_NAME = "spotless-npm-install-cache";
689688

690-
@Nullable
691-
protected Object npmFile;
689+
@Nullable protected Object npmFile;
692690

693-
@Nullable
694-
protected Object nodeFile;
691+
@Nullable protected Object nodeFile;
695692

696-
@Nullable
697-
protected Object npmInstallCache;
693+
@Nullable protected Object npmInstallCache;
698694

699-
@Nullable
700-
protected Object npmrcFile;
695+
@Nullable protected Object npmrcFile;
701696

702697
protected Project project;
703698

@@ -771,11 +766,9 @@ protected void replaceStep() {
771766

772767
public class PrettierConfig extends NpmStepConfig<PrettierConfig> {
773768

774-
@Nullable
775-
Object prettierConfigFile;
769+
@Nullable Object prettierConfigFile;
776770

777-
@Nullable
778-
Map<String, Object> prettierConfig;
771+
@Nullable Map<String, Object> prettierConfig;
779772

780773
final Map<String, String> devDependencies;
781774

@@ -815,8 +808,7 @@ protected FormatterStep createStep() {
815808
* <code>format{ ... }</code>.
816809
*/
817810
public class BiomeGeneric extends BiomeStepConfig<BiomeGeneric> {
818-
@Nullable
819-
String language;
811+
@Nullable String language;
820812

821813
/**
822814
* Creates a new Biome config that downloads the Biome executable for the given

0 commit comments

Comments
 (0)