-
Notifications
You must be signed in to change notification settings - Fork 463
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bump KtLint default to 0.47.1 and restore support back to 0.31.0 (#1303)
- Loading branch information
Showing
16 changed files
with
800 additions
and
105 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
...ot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /* | ||
| * Copyright 2022 DiffPlug | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.diffplug.spotless.glue.ktlint.compat; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import com.github.shyiko.ktlint.core.KtLint; | ||
| import com.github.shyiko.ktlint.core.LintError; | ||
| import com.github.shyiko.ktlint.core.RuleSet; | ||
| import com.github.shyiko.ktlint.ruleset.experimental.ExperimentalRuleSetProvider; | ||
| import com.github.shyiko.ktlint.ruleset.standard.StandardRuleSetProvider; | ||
|
|
||
| import kotlin.Unit; | ||
| import kotlin.jvm.functions.Function2; | ||
|
|
||
| public class KtLintCompat0Dot31Dot0Adapter implements KtLintCompatAdapter { | ||
|
|
||
| static class FormatterCallback implements Function2<LintError, Boolean, Unit> { | ||
| @Override | ||
| public Unit invoke(LintError lint, Boolean corrected) { | ||
| if (!corrected) { | ||
| KtLintCompatReporting.report(lint.getLine(), lint.getCol(), lint.getRuleId(), lint.getDetail()); | ||
| } | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public String format(final String text, final String name, final boolean isScript, | ||
| final boolean useExperimental, | ||
| final Map<String, String> userData, | ||
| final Map<String, Object> editorConfigOverrideMap) { | ||
| final FormatterCallback formatterCallback = new FormatterCallback(); | ||
|
|
||
| final List<RuleSet> rulesets = new ArrayList<>(); | ||
| rulesets.add(new StandardRuleSetProvider().get()); | ||
|
|
||
| if (useExperimental) { | ||
| rulesets.add(new ExperimentalRuleSetProvider().get()); | ||
| } | ||
|
|
||
| return KtLint.INSTANCE.format( | ||
| text, | ||
| rulesets, | ||
| userData, | ||
| formatterCallback); | ||
| } | ||
| } |
63 changes: 63 additions & 0 deletions
63
...ot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /* | ||
| * Copyright 2022 DiffPlug | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.diffplug.spotless.glue.ktlint.compat; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import com.pinterest.ktlint.core.KtLint; | ||
| import com.pinterest.ktlint.core.LintError; | ||
| import com.pinterest.ktlint.core.RuleSet; | ||
| import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider; | ||
| import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider; | ||
|
|
||
| import kotlin.Unit; | ||
| import kotlin.jvm.functions.Function2; | ||
|
|
||
| public class KtLintCompat0Dot32Dot0Adapter implements KtLintCompatAdapter { | ||
|
|
||
| static class FormatterCallback implements Function2<LintError, Boolean, Unit> { | ||
| @Override | ||
| public Unit invoke(LintError lint, Boolean corrected) { | ||
| if (!corrected) { | ||
| KtLintCompatReporting.report(lint.getLine(), lint.getCol(), lint.getRuleId(), lint.getDetail()); | ||
| } | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public String format(final String text, final String name, final boolean isScript, | ||
| final boolean useExperimental, | ||
| final Map<String, String> userData, | ||
| final Map<String, Object> editorConfigOverrideMap) { | ||
| final FormatterCallback formatterCallback = new FormatterCallback(); | ||
|
|
||
| final List<RuleSet> rulesets = new ArrayList<>(); | ||
| rulesets.add(new StandardRuleSetProvider().get()); | ||
|
|
||
| if (useExperimental) { | ||
| rulesets.add(new ExperimentalRuleSetProvider().get()); | ||
| } | ||
|
|
||
| return KtLint.INSTANCE.format( | ||
| text, | ||
| rulesets, | ||
| userData, | ||
| formatterCallback); | ||
| } | ||
| } |
67 changes: 67 additions & 0 deletions
67
...ot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * Copyright 2022 DiffPlug | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.diffplug.spotless.glue.ktlint.compat; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import com.pinterest.ktlint.core.KtLint; | ||
| import com.pinterest.ktlint.core.LintError; | ||
| import com.pinterest.ktlint.core.RuleSet; | ||
| import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider; | ||
| import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider; | ||
|
|
||
| import kotlin.Unit; | ||
| import kotlin.jvm.functions.Function2; | ||
|
|
||
| public class KtLintCompat0Dot34Dot2Adapter implements KtLintCompatAdapter { | ||
|
|
||
| static class FormatterCallback implements Function2<LintError, Boolean, Unit> { | ||
| @Override | ||
| public Unit invoke(LintError lint, Boolean corrected) { | ||
| if (!corrected) { | ||
| KtLintCompatReporting.report(lint.getLine(), lint.getCol(), lint.getRuleId(), lint.getDetail()); | ||
| } | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public String format(final String text, final String name, final boolean isScript, | ||
| final boolean useExperimental, | ||
| final Map<String, String> userData, | ||
| final Map<String, Object> editorConfigOverrideMap) { | ||
| final FormatterCallback formatterCallback = new FormatterCallback(); | ||
|
|
||
| final List<RuleSet> rulesets = new ArrayList<>(); | ||
| rulesets.add(new StandardRuleSetProvider().get()); | ||
|
|
||
| if (useExperimental) { | ||
| rulesets.add(new ExperimentalRuleSetProvider().get()); | ||
| } | ||
|
|
||
| return KtLint.INSTANCE.format(new KtLint.Params( | ||
| name, | ||
| text, | ||
| rulesets, | ||
| userData, | ||
| formatterCallback, | ||
| isScript, | ||
| null, | ||
| false)); | ||
| } | ||
| } |
118 changes: 118 additions & 0 deletions
118
...ot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| /* | ||
| * Copyright 2022 DiffPlug | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.diffplug.spotless.glue.ktlint.compat; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
| import java.util.stream.Collectors; | ||
| import java.util.stream.Stream; | ||
|
|
||
| import com.pinterest.ktlint.core.KtLint; | ||
| import com.pinterest.ktlint.core.LintError; | ||
| import com.pinterest.ktlint.core.RuleSet; | ||
| import com.pinterest.ktlint.core.api.DefaultEditorConfigProperties; | ||
| import com.pinterest.ktlint.core.api.EditorConfigOverride; | ||
| import com.pinterest.ktlint.core.api.UsesEditorConfigProperties; | ||
| import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider; | ||
| import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider; | ||
|
|
||
| import kotlin.Pair; | ||
| import kotlin.Unit; | ||
| import kotlin.jvm.functions.Function2; | ||
|
|
||
| public class KtLintCompat0Dot45Dot2Adapter implements KtLintCompatAdapter { | ||
|
|
||
| static class FormatterCallback implements Function2<LintError, Boolean, Unit> { | ||
| @Override | ||
| public Unit invoke(LintError lint, Boolean corrected) { | ||
| if (!corrected) { | ||
| KtLintCompatReporting.report(lint.getLine(), lint.getCol(), lint.getRuleId(), lint.getDetail()); | ||
| } | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public String format(final String text, final String name, final boolean isScript, | ||
| final boolean useExperimental, | ||
| final Map<String, String> userData, | ||
| final Map<String, Object> editorConfigOverrideMap) { | ||
| final FormatterCallback formatterCallback = new FormatterCallback(); | ||
|
|
||
| final List<RuleSet> rulesets = new ArrayList<>(); | ||
| rulesets.add(new StandardRuleSetProvider().get()); | ||
|
|
||
| if (useExperimental) { | ||
| rulesets.add(new ExperimentalRuleSetProvider().get()); | ||
| } | ||
|
|
||
| EditorConfigOverride editorConfigOverride; | ||
| if (editorConfigOverrideMap.isEmpty()) { | ||
| editorConfigOverride = EditorConfigOverride.Companion.getEmptyEditorConfigOverride(); | ||
| } else { | ||
| editorConfigOverride = createEditorConfigOverride(rulesets, editorConfigOverrideMap); | ||
| } | ||
|
|
||
| return KtLint.INSTANCE.format(new KtLint.ExperimentalParams( | ||
| name, | ||
| text, | ||
| rulesets, | ||
| userData, | ||
| formatterCallback, | ||
| isScript, | ||
| null, | ||
| false, | ||
| editorConfigOverride, | ||
| false)); | ||
| } | ||
|
|
||
| /** | ||
| * Create EditorConfigOverride from user provided parameters. | ||
| * Calling this method requires KtLint 0.45.2. | ||
| */ | ||
| private static EditorConfigOverride createEditorConfigOverride(final List<RuleSet> rulesets, Map<String, Object> editorConfigOverrideMap) { | ||
| // Get properties from rules in the rule sets | ||
| Stream<UsesEditorConfigProperties.EditorConfigProperty<?>> ruleProperties = rulesets.stream() | ||
| .flatMap(ruleSet -> Arrays.stream(ruleSet.getRules())) | ||
| .filter(rule -> rule instanceof UsesEditorConfigProperties) | ||
| .flatMap(rule -> ((UsesEditorConfigProperties) rule).getEditorConfigProperties().stream()); | ||
|
|
||
| // Create a mapping of properties to their names based on rule properties and default properties | ||
| Map<String, UsesEditorConfigProperties.EditorConfigProperty<?>> supportedProperties = Stream | ||
| .concat(ruleProperties, DefaultEditorConfigProperties.INSTANCE.getDefaultEditorConfigProperties().stream()) | ||
| .distinct() | ||
| .collect(Collectors.toMap(property -> property.getType().getName(), property -> property)); | ||
|
|
||
| // Create config properties based on provided property names and values | ||
| @SuppressWarnings("unchecked") | ||
| Pair<UsesEditorConfigProperties.EditorConfigProperty<?>, ?>[] properties = editorConfigOverrideMap.entrySet().stream() | ||
| .map(entry -> { | ||
| UsesEditorConfigProperties.EditorConfigProperty<?> property = supportedProperties.get(entry.getKey()); | ||
| if (property != null) { | ||
| return new Pair<>(property, entry.getValue()); | ||
| } else { | ||
| return null; | ||
| } | ||
| }) | ||
| .filter(Objects::nonNull) | ||
| .toArray(Pair[]::new); | ||
|
|
||
| return EditorConfigOverride.Companion.from(properties); | ||
| } | ||
| } |
Oops, something went wrong.