Enable trailing comma (#1583)
* Enable trailing comma on declaration site
* Enable trailing comma on call site
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/AnnotationRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/AnnotationRule.kt
index 10f8b12..bce2bcc 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/AnnotationRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/AnnotationRule.kt
@@ -46,7 +46,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
when (node.elementType) {
FILE_ANNOTATION_LIST -> {
@@ -60,7 +60,7 @@
private fun visitAnnotationEntry(
node: ASTNode,
emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
- autoCorrect: Boolean
+ autoCorrect: Boolean,
) {
require(node.elementType == ANNOTATION_ENTRY)
@@ -87,13 +87,13 @@
private fun checkForAnnotationWithParameterToBePlacedOnSeparateLine(
node: ASTNode,
emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
- autoCorrect: Boolean
+ autoCorrect: Boolean,
) {
if (node.isPrecededByOtherAnnotationEntry() && node.isOnSameLineAsPreviousAnnotationEntry()) {
emit(
node.startOffset,
"Annotation with parameter(s) should be placed on a separate line prior to the annotated construct",
- true
+ true,
)
if (autoCorrect) {
node
@@ -107,7 +107,7 @@
emit(
node.startOffset,
"Annotation with parameter(s) should be placed on a separate line prior to the annotated construct",
- true
+ true,
)
if (autoCorrect) {
node
@@ -119,7 +119,7 @@
it.replaceWithText(getNewlineWithIndent(node.treeParent))
} else {
it.rawInsertBeforeMe(
- PsiWhiteSpaceImpl(getNewlineWithIndent(node.treeParent))
+ PsiWhiteSpaceImpl(getNewlineWithIndent(node.treeParent)),
)
}
}
@@ -130,7 +130,7 @@
private fun checkForMultipleAnnotationsOnSameLineAsAnnotatedConstruct(
node: ASTNode,
emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
- autoCorrect: Boolean
+ autoCorrect: Boolean,
) {
if (node.isLastAnnotationEntry()) {
val noAnnotationWithParameters =
@@ -141,7 +141,7 @@
emit(
node.treeParent.startOffset,
"Multiple annotations should not be placed on the same line as the annotated construct",
- true
+ true,
)
if (autoCorrect) {
node
@@ -157,7 +157,7 @@
private fun checkForAnnotationToBePlacedOnSeparateLine(
node: ASTNode,
emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
- autoCorrect: Boolean
+ autoCorrect: Boolean,
) {
val isFollowedWithAnnotationHavingValueArgumentList =
node
@@ -171,7 +171,7 @@
emit(
node.startOffset,
"Annotation must be placed on separate line",
- true
+ true,
)
if (autoCorrect) {
node
@@ -183,7 +183,7 @@
it.replaceWithText(getNewlineWithIndent(node.treeParent))
} else {
it.upsertWhitespaceBeforeMe(
- getNewlineWithIndent(node.treeParent)
+ getNewlineWithIndent(node.treeParent),
)
}
}
@@ -245,7 +245,7 @@
private fun visitFileAnnotationList(
node: ASTNode,
emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
- autoCorrect: Boolean
+ autoCorrect: Boolean,
) {
val lineNumber = node.lineNumber()
val next = node.nextSibling { it.textLength > 0 }?.let { next ->
@@ -262,7 +262,7 @@
emit(
psi.endOffset - 1,
"File annotations should be separated from file contents with a blank line",
- true
+ true,
)
if (autoCorrect) {
if (diff == 0) {
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/AnnotationSpacingRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/AnnotationSpacingRule.kt
index b0522a6..e055a9a 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/AnnotationSpacingRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/AnnotationSpacingRule.kt
@@ -33,7 +33,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.elementType != ElementType.MODIFIER_LIST && node.elementType != ElementType.FILE_ANNOTATION_LIST) {
return
@@ -76,7 +76,7 @@
} else {
it.isPartOfComment() && !it.isCommentOnSameLineAsPrevLeaf()
}
- }
+ },
)
if (next != null) {
if (node.elementType != ElementType.FILE_ANNOTATION_LIST) {
@@ -126,7 +126,7 @@
private inline fun ASTNode.nextSiblingWithAtLeastOneOf(
p: (ASTNode) -> Boolean,
- needsToOccur: (ASTNode) -> Boolean
+ needsToOccur: (ASTNode) -> Boolean,
): ASTNode? {
var n = this.treeNext
var occurrenceCount = 0
@@ -167,7 +167,7 @@
private fun removeIntraLineBreaks(
node: ASTNode,
- last: KtAnnotationEntry
+ last: KtAnnotationEntry,
) {
val txt = node.text
// Pull the next before raw replace or it will blow up
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/ArgumentListWrappingRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/ArgumentListWrappingRule.kt
index db14df8..fc16e43 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/ArgumentListWrappingRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/ArgumentListWrappingRule.kt
@@ -43,7 +43,7 @@
listOf(
indentSizeProperty,
indentStyleProperty,
- maxLineLengthProperty
+ maxLineLengthProperty,
)
private var editorConfigIndent = IndentConfig.DEFAULT_INDENT_CONFIG
@@ -53,7 +53,7 @@
override fun beforeFirstNode(editorConfigProperties: EditorConfigProperties) {
editorConfigIndent = IndentConfig(
indentStyle = editorConfigProperties.getEditorConfigValue(indentStyleProperty),
- tabWidth = editorConfigProperties.getEditorConfigValue(indentSizeProperty)
+ tabWidth = editorConfigProperties.getEditorConfigValue(indentSizeProperty),
)
maxLineLength = editorConfigProperties.getEditorConfigValue(maxLineLengthProperty)
}
@@ -61,7 +61,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (editorConfigIndent.disabled) {
return
@@ -144,7 +144,7 @@
newIndentLevel: Int,
child: ASTNode,
emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
- autoCorrect: Boolean
+ autoCorrect: Boolean,
) {
val indent = "\n" + editorConfigIndent.indent.repeat(newIndentLevel)
when (child.elementType) {
@@ -158,7 +158,8 @@
}
}
ElementType.VALUE_ARGUMENT,
- ElementType.RPAR -> {
+ ElementType.RPAR,
+ -> {
// aiming for
// ... LPAR
// <line indent + indentSize> VALUE_PARAMETER...
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/ChainWrappingRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/ChainWrappingRule.kt
index 4af34c1..e811e24 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/ChainWrappingRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/ChainWrappingRule.kt
@@ -43,7 +43,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
/*
org.jetbrains.kotlin.com.intellij.psi.impl.source.tree.LeafPsiElement (DOT) | "."
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/CommentSpacingRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/CommentSpacingRule.kt
index b69be2f..7cbf9cd 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/CommentSpacingRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/CommentSpacingRule.kt
@@ -13,7 +13,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node is PsiComment && node is LeafPsiElement && node.getText().startsWith("//")) {
val prevLeaf = node.prevLeaf()
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/EnumEntryNameCaseRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/EnumEntryNameCaseRule.kt
index 547bf9c..6fe1795 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/EnumEntryNameCaseRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/EnumEntryNameCaseRule.kt
@@ -17,7 +17,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node !is CompositeElement) {
return
@@ -29,7 +29,7 @@
emit(
node.startOffset,
"Enum entry name should be uppercase underscore-separated names like \"ENUM_ENTRY\" or upper camel-case like \"EnumEntry\"",
- false
+ false,
)
}
}
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/FilenameRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/FilenameRule.kt
index c1664f0..9cab0a2 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/FilenameRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/FilenameRule.kt
@@ -45,7 +45,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.isRoot()) {
node as FileASTNode? ?: error("node is not ${FileASTNode::class} but ${node::class}")
@@ -125,13 +125,13 @@
private fun String.shouldMatchClassName(
className: String,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (this != className) {
emit(
0,
"File '$this.kt' contains a single class and possibly also extension functions for that class and should be named same after that class '$className.kt'",
- false
+ false,
)
}
}
@@ -141,19 +141,19 @@
private fun String.shouldMatchFileName(
filename: String,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (this != filename) {
emit(
0,
"File '$this.kt' contains a single top level declaration and should be named '$filename.kt'",
- false
+ false,
)
}
}
private fun String.shouldMatchPascalCase(
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (!this.matches(pascalCaseRegEx)) {
emit(0, "File name '$this.kt' should conform PascalCase", false)
@@ -162,7 +162,7 @@
private data class TopLevelDeclaration(
val elementType: IElementType,
- val identifier: String
+ val identifier: String,
)
private fun ASTNode.toTopLevelDeclaration(): TopLevelDeclaration? =
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/FinalNewlineRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/FinalNewlineRule.kt
index 3723b74..4ae1eca 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/FinalNewlineRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/FinalNewlineRule.kt
@@ -15,7 +15,7 @@
UsesEditorConfigProperties {
override val editorConfigProperties: List<UsesEditorConfigProperties.EditorConfigProperty<*>> = listOf(
- insertNewLineProperty
+ insertNewLineProperty,
)
private var insertFinalNewline by Delegates.notNull<Boolean>()
@@ -27,7 +27,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.isRoot()) {
if (node.textLength == 0) {
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/ImportOrderingRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/ImportOrderingRule.kt
index 3875596..2338d1d 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/ImportOrderingRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/ImportOrderingRule.kt
@@ -41,7 +41,7 @@
UsesEditorConfigProperties {
override val editorConfigProperties: List<UsesEditorConfigProperties.EditorConfigProperty<*>> = listOf(
- ideaImportsLayoutProperty
+ ideaImportsLayoutProperty,
)
private lateinit var importsLayout: List<PatternEntry>
@@ -55,7 +55,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.elementType == ElementType.IMPORT_LIST) {
val children = node.getChildren(null)
@@ -99,7 +99,7 @@
node.startOffset,
errorMessages.getOrDefault(importsLayout, CUSTOM_ERROR_MESSAGE) +
" -- no autocorrection due to comments in the import list",
- false
+ false,
)
} else {
val autoCorrectWhitespace = hasTooMuchWhitespace(children) && !isCustomLayout()
@@ -108,7 +108,7 @@
emit(
node.startOffset,
errorMessages.getOrDefault(importsLayout, CUSTOM_ERROR_MESSAGE),
- true
+ true,
)
}
if (autoCorrect && (autoCorrectDuplicateImports || autoCorrectSortOrder || autoCorrectWhitespace)) {
@@ -129,7 +129,7 @@
private fun getUniqueImportsAndBlankLines(
children: Array<ASTNode>,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
): Pair<Boolean, List<ASTNode>> {
var autoCorrectDuplicateImports = false
val imports = mutableListOf<ASTNode>()
@@ -147,7 +147,7 @@
emit(
current.startOffset,
"Duplicate '${current.text}' found",
- true
+ true,
)
autoCorrectDuplicateImports = true
}
@@ -205,7 +205,7 @@
private val errorMessages = mapOf(
IDEA_PATTERN to IDEA_ERROR_MESSAGE,
- ASCII_PATTERN to ASCII_ERROR_MESSAGE
+ ASCII_PATTERN to ASCII_ERROR_MESSAGE,
)
private val editorConfigPropertyParser: (String, String?) -> PropertyType.PropertyValue<List<PatternEntry>> =
@@ -213,31 +213,31 @@
when {
value.isNullOrBlank() -> PropertyType.PropertyValue.invalid(
value,
- "Import layout must contain at least one entry of a wildcard symbol (*)"
+ "Import layout must contain at least one entry of a wildcard symbol (*)",
)
value == "idea" -> {
logger.warn { "`idea` is deprecated! Please use `*,java.**,javax.**,kotlin.**,^` instead to ensure that the Kotlin IDE plugin recognizes the value" }
PropertyType.PropertyValue.valid(
value,
- IDEA_PATTERN
+ IDEA_PATTERN,
)
}
value == "ascii" -> {
logger.warn { "`ascii` is deprecated! Please use `*` instead to ensure that the Kotlin IDE plugin recognizes the value" }
PropertyType.PropertyValue.valid(
value,
- ASCII_PATTERN
+ ASCII_PATTERN,
)
}
else -> try {
PropertyType.PropertyValue.valid(
value,
- parseImportsLayout(value)
+ parseImportsLayout(value),
)
} catch (e: IllegalArgumentException) {
PropertyType.PropertyValue.invalid(
value,
- "Unexpected imports layout: $value"
+ "Unexpected imports layout: $value",
)
}
}
@@ -248,11 +248,11 @@
type = PropertyType(
IDEA_IMPORTS_LAYOUT_PROPERTY_NAME,
PROPERTY_DESCRIPTION,
- editorConfigPropertyParser
+ editorConfigPropertyParser,
),
defaultValue = IDEA_PATTERN,
defaultAndroidValue = ASCII_PATTERN,
- propertyWriter = { it.joinToString(separator = ",") }
+ propertyWriter = { it.joinToString(separator = ",") },
)
}
}
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRule.kt
index 1b35a11..fc3f43f 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRule.kt
@@ -104,15 +104,15 @@
VisitorModifier.RunAfterRule(
ruleId = "experimental:function-signature",
loadOnlyWhenOtherRuleIsLoaded = false,
- runOnlyWhenOtherRuleIsEnabled = false
- )
- )
+ runOnlyWhenOtherRuleIsEnabled = false,
+ ),
+ ),
),
UsesEditorConfigProperties {
override val editorConfigProperties: List<UsesEditorConfigProperties.EditorConfigProperty<*>> =
listOf(
indentSizeProperty,
- indentStyleProperty
+ indentStyleProperty,
)
private var indentConfig = IndentConfig.DEFAULT_INDENT_CONFIG
@@ -124,7 +124,7 @@
override fun beforeFirstNode(editorConfigProperties: EditorConfigProperties) {
indentConfig = IndentConfig(
indentStyle = editorConfigProperties.getEditorConfigValue(indentStyleProperty),
- tabWidth = editorConfigProperties.getEditorConfigValue(indentSizeProperty)
+ tabWidth = editorConfigProperties.getEditorConfigValue(indentSizeProperty),
)
if (indentConfig.disabled) {
stopTraversalOfAST()
@@ -134,7 +134,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.isRoot()) {
val firstNotEmptyLeaf = node.nextLeaf()
@@ -154,7 +154,7 @@
"expected indent is kept unchanged -> $expectedIndent"
}
ctx.blockStack.push(
- Block(node.elementType, line, SAME_AS_PREVIOUS_BLOCK)
+ Block(node.elementType, line, SAME_AS_PREVIOUS_BLOCK),
)
}
node.isAfterValueParameterOnSameLine() -> {
@@ -163,7 +163,7 @@
"parameter value ended, expected indent is kept unchanged -> $expectedIndent"
}
ctx.blockStack.push(
- Block(node.elementType, line, SAME_AS_PREVIOUS_BLOCK)
+ Block(node.elementType, line, SAME_AS_PREVIOUS_BLOCK),
)
}
prevBlock != null && line == prevBlock.line -> {
@@ -172,20 +172,20 @@
"expected indent is kept unchanged -> $expectedIndent"
}
ctx.blockStack.push(
- Block(node.elementType, line, SAME_AS_PREVIOUS_BLOCK)
+ Block(node.elementType, line, SAME_AS_PREVIOUS_BLOCK),
)
}
else -> {
if (node.isPartOfForLoopConditionWithMultilineExpression()) {
logger.trace { "$line: block starting with ${node.text} -> Keep at $expectedIndent" }
ctx.blockStack.push(
- Block(node.elementType, line, SAME_AS_PREVIOUS_BLOCK)
+ Block(node.elementType, line, SAME_AS_PREVIOUS_BLOCK),
)
} else {
expectedIndent++
logger.trace { "$line: block starting with ${node.text} -> Increase to $expectedIndent" }
ctx.blockStack.push(
- Block(node.elementType, line, REGULAR)
+ Block(node.elementType, line, REGULAR),
)
}
}
@@ -194,7 +194,7 @@
ctx.blockStack.iterator().asSequence().toList()
.joinToString(
separator = "\n\t",
- prefix = "Stack (newest first) after pushing new element:\n\t"
+ prefix = "Stack (newest first) after pushing new element:\n\t",
)
}
}
@@ -204,7 +204,7 @@
ctx.blockStack.iterator().asSequence().toList()
.joinToString(
separator = "\n\t",
- prefix = "Stack before popping newest element from top of stack:\n\t"
+ prefix = "Stack before popping newest element from top of stack:\n\t",
)
}
val block = ctx.blockStack.pop()
@@ -361,7 +361,7 @@
override fun afterVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
when (node.elementType) {
SUPER_TYPE_LIST ->
@@ -386,7 +386,7 @@
private fun adjustExpectedIndentInsideQualifiedExpression(n: ASTNode, ctx: IndentContext) {
val p = n.parent({
it.treeParent.elementType != DOT_QUALIFIED_EXPRESSION && it.treeParent.elementType != SAFE_ACCESS_EXPRESSION
- }) ?: return
+ },) ?: return
val nextSibling = n.treeNext
if (!ctx.ignored.contains(p) && nextSibling != null) {
if (p.treeParent.elementType == PROPERTY_DELEGATE &&
@@ -561,7 +561,7 @@
private fun indentStringTemplate(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
node
.let { it.psi as KtStringTemplateExpression }
@@ -575,7 +575,7 @@
emit(
node.startOffset,
"Indentation of multiline string should not contain both tab(s) and space(s)",
- false
+ false,
)
return
}
@@ -629,11 +629,11 @@
emit(
it.startOffset + offsetFirstWrongIndentChar,
"Unexpected '${indentConfig.unexpectedIndentCharDescription}' character(s) in margin of multiline string",
- true
+ true,
)
if (autoCorrect) {
(it.firstChildNode as LeafPsiElement).rawReplaceWithText(
- expectedIndentation + actualContent
+ expectedIndentation + actualContent,
)
}
} else if (actualIndent != expectedIndentation && it.isIndentBeforeClosingQuote()) {
@@ -642,16 +642,16 @@
emit(
it.startOffset,
"Unexpected indent of multiline string closing quotes",
- true
+ true,
)
if (autoCorrect) {
if (it.firstChildNode == null) {
(it as LeafPsiElement).rawInsertBeforeMe(
- LeafPsiElement(REGULAR_STRING_PART, expectedIndentation)
+ LeafPsiElement(REGULAR_STRING_PART, expectedIndentation),
)
} else {
(it.firstChildNode as LeafPsiElement).rawReplaceWithText(
- expectedIndentation + actualContent
+ expectedIndentation + actualContent,
)
}
}
@@ -680,7 +680,7 @@
node: ASTNode,
autoCorrect: Boolean,
emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
- ctx: IndentContext
+ ctx: IndentContext,
) {
val text = node.text
val nodeIndent = text.substringAfterLast("\n")
@@ -800,7 +800,7 @@
emit(
node.startOffset + text.length - nodeIndent.length,
"Unexpected tab character(s)",
- true
+ true,
)
indentConfig.toNormalizedIndent(nodeIndent)
} else {
@@ -819,7 +819,7 @@
emit(
node.startOffset + text.length - nodeIndent.length,
"Unexpected space character(s)",
- true
+ true,
)
indentConfig.toNormalizedIndent(indentWithoutKdocIndent) +
// Re-add the kdoc indent when it was present before
@@ -840,7 +840,7 @@
emit(
node.startOffset + text.length - nodeIndent.length,
"Unexpected indentation (${normalizedNodeIndent.length}) (should be ${expectedIndent.length})",
- true
+ true,
)
logger.trace {
"$line: " + (if (!autoCorrect) "would have " else "") + "changed indentation to ${expectedIndent.length} (from ${normalizedNodeIndent.length})"
@@ -849,7 +849,7 @@
if (autoCorrect) {
if (nodeIndent != normalizedNodeIndent || normalizedNodeIndent != expectedIndent) {
(node as LeafPsiElement).rawReplaceWithText(
- text.substringBeforeLast("\n") + "\n" + expectedIndent
+ text.substringBeforeLast("\n") + "\n" + expectedIndent,
)
}
}
@@ -971,7 +971,7 @@
// Line at which the block is opened
val line: Int,
// Type of indentation to be used for the block
- val blockIndentationType: BlockIndentationType
+ val blockIndentationType: BlockIndentationType,
) {
enum class BlockIndentationType {
/**
@@ -985,7 +985,7 @@
* the expected indentation level. The indentation of the closing element has to be decreased one level
* without altering the expected indentation level.
*/
- SAME_AS_PREVIOUS_BLOCK
+ SAME_AS_PREVIOUS_BLOCK,
}
}
}
@@ -995,7 +995,7 @@
private val rTokenSet = TokenSet.create(RPAR, RBRACE, RBRACKET, GT)
private val matchingRToken =
lTokenSet.types.zip(
- rTokenSet.types
+ rTokenSet.types,
).toMap()
}
}
@@ -1059,7 +1059,7 @@
val safeIndex = kotlin.math.min(firstNonWhitespaceIndex, index)
return Pair(
first = this.take(safeIndex),
- second = this.substring(safeIndex)
+ second = this.substring(safeIndex),
)
}
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/MaxLineLengthRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/MaxLineLengthRule.kt
index da47291..9c1f936 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/MaxLineLengthRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/MaxLineLengthRule.kt
@@ -30,7 +30,7 @@
// won't be affected by that rule.
ruleId = "trailing-comma-on-call-site",
loadOnlyWhenOtherRuleIsLoaded = false,
- runOnlyWhenOtherRuleIsEnabled = false
+ runOnlyWhenOtherRuleIsEnabled = false,
),
VisitorModifier.RunAfterRule(
// This rule should run after all other rules. Each time a rule visitor is modified with
@@ -38,16 +38,16 @@
// won't be affected by that rule.
ruleId = "trailing-comma-on-declaration-site",
loadOnlyWhenOtherRuleIsLoaded = false,
- runOnlyWhenOtherRuleIsEnabled = false
+ runOnlyWhenOtherRuleIsEnabled = false,
),
- VisitorModifier.RunAsLateAsPossible
- )
+ VisitorModifier.RunAsLateAsPossible,
+ ),
),
UsesEditorConfigProperties {
override val editorConfigProperties: List<UsesEditorConfigProperties.EditorConfigProperty<*>> = listOf(
maxLineLengthProperty,
- ignoreBackTickedIdentifierProperty
+ ignoreBackTickedIdentifierProperty,
)
private var maxLineLength: Int = maxLineLengthProperty.defaultValue
@@ -62,7 +62,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (maxLineLength <= 0) {
return
@@ -125,9 +125,9 @@
KTLINT_IGNORE_BACKTICKED_IDENTIFIER_NAME,
PROPERTY_DESCRIPTION,
PropertyType.PropertyValueParser.BOOLEAN_VALUE_PARSER,
- setOf(true.toString(), false.toString())
+ setOf(true.toString(), false.toString()),
),
- defaultValue = false
+ defaultValue = false,
)
}
}
@@ -152,7 +152,7 @@
private data class ParsedLine(
val line: String,
val offset: Int,
- val elements: List<ASTNode>
+ val elements: List<ASTNode>,
) {
fun lineLength(ignoreBackTickedIdentifier: Boolean): Int {
return if (ignoreBackTickedIdentifier) {
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/ModifierOrderRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/ModifierOrderRule.kt
index 9f9be17..b47aa57 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/ModifierOrderRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/ModifierOrderRule.kt
@@ -53,7 +53,7 @@
INLINE_KEYWORD,
INFIX_KEYWORD,
OPERATOR_KEYWORD,
- DATA_KEYWORD
+ DATA_KEYWORD,
// NOINLINE_KEYWORD, CROSSINLINE_KEYWORD, OUT_KEYWORD, IN_KEYWORD, REIFIED_KEYWORD
// HEADER_KEYWORD, IMPL_KEYWORD
)
@@ -62,7 +62,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.psi is KtDeclarationModifierList) {
val modifierArr = node.getChildren(tokenSet)
@@ -75,7 +75,7 @@
"Incorrect modifier order (should be \"${
squashAnnotations(sorted).joinToString(" ")
}\")",
- true
+ true,
)
if (autoCorrect) {
modifierArr.forEachIndexed { i, n ->
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/MultiLineIfElseRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/MultiLineIfElseRule.kt
index 64c8330..f09eea7 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/MultiLineIfElseRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/MultiLineIfElseRule.kt
@@ -35,21 +35,21 @@
override val editorConfigProperties: List<UsesEditorConfigProperties.EditorConfigProperty<*>> =
listOf(
DefaultEditorConfigProperties.indentSizeProperty,
- DefaultEditorConfigProperties.indentStyleProperty
+ DefaultEditorConfigProperties.indentStyleProperty,
)
private var indentConfig = IndentConfig.DEFAULT_INDENT_CONFIG
override fun beforeFirstNode(editorConfigProperties: EditorConfigProperties) {
indentConfig = IndentConfig(
indentStyle = editorConfigProperties.getEditorConfigValue(DefaultEditorConfigProperties.indentStyleProperty),
- tabWidth = editorConfigProperties.getEditorConfigValue(DefaultEditorConfigProperties.indentSizeProperty)
+ tabWidth = editorConfigProperties.getEditorConfigValue(DefaultEditorConfigProperties.indentSizeProperty),
)
}
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.elementType == THEN || node.elementType == ELSE) {
if (node.firstChildNode?.elementType == BLOCK) {
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoBlankLineBeforeRbraceRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoBlankLineBeforeRbraceRule.kt
index 3900fd9..5f63e21 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoBlankLineBeforeRbraceRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoBlankLineBeforeRbraceRule.kt
@@ -12,7 +12,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node is PsiWhiteSpace &&
node.textContains('\n') &&
@@ -23,7 +23,7 @@
emit(
node.startOffset + split[0].length + split[1].length + 1,
"Unexpected blank line(s) before \"}\"",
- true
+ true,
)
if (autoCorrect) {
(node as LeafPsiElement).rawReplaceWithText("${split.first()}\n${split.last()}")
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoBlankLinesInChainedMethodCallsRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoBlankLinesInChainedMethodCallsRule.kt
index 253a2fb..74c5ea1 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoBlankLinesInChainedMethodCallsRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoBlankLinesInChainedMethodCallsRule.kt
@@ -10,7 +10,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
val isBlankLine = node is PsiWhiteSpace && node.getText().contains("\n\n")
if (isBlankLine && node.treeParent.elementType == DOT_QUALIFIED_EXPRESSION) {
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoConsecutiveBlankLinesRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoConsecutiveBlankLinesRule.kt
index a075327..e26ca22 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoConsecutiveBlankLinesRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoConsecutiveBlankLinesRule.kt
@@ -14,7 +14,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node is PsiWhiteSpace &&
node.prevSibling != null
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoEmptyClassBodyRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoEmptyClassBodyRule.kt
index 1b637e2..3961337 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoEmptyClassBodyRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoEmptyClassBodyRule.kt
@@ -16,7 +16,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.elementType == CLASS_BODY &&
node.firstChildNode?.let { n ->
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoEmptyFirstLineInMethodBlockRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoEmptyFirstLineInMethodBlockRule.kt
index 73d0895..8df2698 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoEmptyFirstLineInMethodBlockRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoEmptyFirstLineInMethodBlockRule.kt
@@ -14,7 +14,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node is PsiWhiteSpace && node.textContains('\n') &&
node.prevLeaf()?.elementType == ElementType.LBRACE && node.isPartOf(FUN) &&
@@ -25,7 +25,7 @@
emit(
node.startOffset + 1,
"First line in a method block should not be empty",
- true
+ true,
)
if (autoCorrect) {
(node as LeafPsiElement).rawReplaceWithText("${split.first()}\n${split.last()}")
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoLineBreakAfterElseRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoLineBreakAfterElseRule.kt
index f7e5b13..88d305a 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoLineBreakAfterElseRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoLineBreakAfterElseRule.kt
@@ -15,7 +15,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node is PsiWhiteSpace &&
node.textContains('\n')
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoMultipleSpacesRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoMultipleSpacesRule.kt
index 1c49f27..0b49c95 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoMultipleSpacesRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoMultipleSpacesRule.kt
@@ -11,7 +11,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
node
.takeIf { node is PsiWhiteSpace }
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoSemicolonsRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoSemicolonsRule.kt
index 21135b4..786f686 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoSemicolonsRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoSemicolonsRule.kt
@@ -32,7 +32,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.elementType == KDOC_TEXT) {
return
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoTrailingSpacesRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoTrailingSpacesRule.kt
index 7e0de85..2a31779 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoTrailingSpacesRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoTrailingSpacesRule.kt
@@ -14,7 +14,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.isPartOfKDoc()) {
if (node.elementType == WHITE_SPACE && node.hasTrailingSpacesBeforeNewline()) {
@@ -69,7 +69,7 @@
private fun ASTNode.removeTrailingSpacesBeforeNewline() {
val newText = text.replace(
regex = SPACE_OR_TAB_BEFORE_NEWLINE_REGEX,
- replacement = "\n"
+ replacement = "\n",
)
(this as LeafPsiElement).replaceWithText(newText)
}
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoUnitReturnRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoUnitReturnRule.kt
index 864495b..b582c44 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoUnitReturnRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoUnitReturnRule.kt
@@ -13,7 +13,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.elementType == TYPE_REFERENCE &&
node.treeParent.elementType == FUN &&
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoUnusedImportsRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoUnusedImportsRule.kt
index 23efe23..595e389 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoUnusedImportsRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoUnusedImportsRule.kt
@@ -29,7 +29,7 @@
public class NoUnusedImportsRule : Rule("no-unused-imports") {
private val ref = mutableSetOf(
- Reference("*", false)
+ Reference("*", false),
)
private val parentExpressions = mutableSetOf<String>()
private val imports = mutableMapOf<ImportPath, ASTNode>()
@@ -40,7 +40,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.isRoot()) {
rootNode = node
@@ -91,8 +91,8 @@
ref.add(
Reference(
it.removeBackticksAndTrim(),
- node.psi.parentDotQualifiedExpression() != null
- )
+ node.psi.parentDotQualifiedExpression() != null,
+ ),
)
}
}
@@ -104,7 +104,7 @@
override fun afterVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.elementType == FILE) {
val directCalls = ref.filter { !it.inDotQualifiedExpression }.map { it.text }
@@ -184,7 +184,7 @@
}
val methodCallExpression = text.substringBeforeLast(
- "("
+ "(",
)
// Only check static imports; identified if they start with a capital letter indicating a
@@ -198,7 +198,7 @@
.forEach { import ->
val count = imports.count {
it.key.pathStr.removeBackticksAndTrim().startsWith(
- import.key.pathStr.removeBackticksAndTrim().substringBefore(methodCallExpression)
+ import.key.pathStr.removeBackticksAndTrim().substringBefore(methodCallExpression),
)
}
// Parent import and static import both are present
@@ -253,7 +253,7 @@
// iteration (https://github.com/shyiko/ktlint/issues/40)
"iterator",
// by (https://github.com/shyiko/ktlint/issues/54)
- "getValue", "setValue"
+ "getValue", "setValue",
)
}
}
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoWildcardImportsRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoWildcardImportsRule.kt
index 9975695..fc84d16 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoWildcardImportsRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoWildcardImportsRule.kt
@@ -13,7 +13,7 @@
Rule("no-wildcard-imports"),
UsesEditorConfigProperties {
override val editorConfigProperties: List<UsesEditorConfigProperties.EditorConfigProperty<*>> = listOf(
- packagesToUseImportOnDemandProperty
+ packagesToUseImportOnDemandProperty,
)
private lateinit var allowedWildcardImports: List<PatternEntry>
@@ -25,7 +25,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.elementType == IMPORT_DIRECTIVE) {
val importDirective = node.psi as KtImportDirective
@@ -49,13 +49,13 @@
PatternEntry(
packageName = import.removeSuffix(WILDCARD_WITH_SUBPACKAGES).plus(WILDCARD_WITHOUT_SUBPACKAGES),
withSubpackages = true,
- hasAlias = false
+ hasAlias = false,
)
} else {
PatternEntry(
packageName = import,
withSubpackages = false,
- hasAlias = false
+ hasAlias = false,
)
}
}
@@ -67,12 +67,12 @@
else -> try {
PropertyType.PropertyValue.valid(
value,
- value?.let(::parseAllowedWildcardImports) ?: emptyList()
+ value?.let(::parseAllowedWildcardImports) ?: emptyList(),
)
} catch (e: IllegalArgumentException) {
PropertyType.PropertyValue.invalid(
value,
- "Unexpected imports layout: $value"
+ "Unexpected imports layout: $value",
)
}
}
@@ -83,7 +83,7 @@
type = PropertyType(
"ij_kotlin_packages_to_use_import_on_demand",
"Defines allowed wildcard imports",
- packagesToUseImportOnDemandPropertyParser
+ packagesToUseImportOnDemandPropertyParser,
),
/**
* Default IntelliJ IDEA style: Use wildcard imports for packages in "java.util", "kotlin.android.synthetic" and
@@ -92,7 +92,7 @@
* https://github.com/JetBrains/kotlin/blob/ffdab473e28d0d872136b910eb2e0f4beea2e19c/idea/formatter/src/org/jetbrains/kotlin/idea/core/formatter/KotlinCodeStyleSettings.java#L81-L82
*/
defaultValue = parseAllowedWildcardImports("java.util.*,kotlinx.android.synthetic.**"),
- propertyWriter = { it.joinToString(separator = ",") }
+ propertyWriter = { it.joinToString(separator = ",") },
)
}
}
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/PackageNameRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/PackageNameRule.kt
index 9170677..36f8181 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/PackageNameRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/PackageNameRule.kt
@@ -12,7 +12,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.elementType == PACKAGE_DIRECTIVE) {
val qualifiedName = (node.psi as KtPackageDirective).qualifiedName
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/ParameterListWrappingRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/ParameterListWrappingRule.kt
index 8e38d9b..3e42f70 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/ParameterListWrappingRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/ParameterListWrappingRule.kt
@@ -39,7 +39,7 @@
listOf(
indentSizeProperty,
indentStyleProperty,
- maxLineLengthProperty
+ maxLineLengthProperty,
)
private var indentConfig = IndentConfig.DEFAULT_INDENT_CONFIG
@@ -49,7 +49,7 @@
maxLineLength = editorConfigProperties.getEditorConfigValue(maxLineLengthProperty)
indentConfig = IndentConfig(
indentStyle = editorConfigProperties.getEditorConfigValue(indentStyleProperty),
- tabWidth = editorConfigProperties.getEditorConfigValue(indentSizeProperty)
+ tabWidth = editorConfigProperties.getEditorConfigValue(indentSizeProperty),
)
if (indentConfig.disabled) {
stopTraversalOfAST()
@@ -59,7 +59,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
when (node.elementType) {
NULLABLE_TYPE -> wrapNullableType(node, emit, autoCorrect)
@@ -74,7 +74,7 @@
private fun wrapNullableType(
node: ASTNode,
emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
- autoCorrect: Boolean
+ autoCorrect: Boolean,
) {
require(node.elementType == NULLABLE_TYPE)
node
@@ -94,7 +94,7 @@
emit(
it.startOffset,
"Parameter of nullable type should be on a separate line (unless the type fits on a single line)",
- true
+ true,
)
if (autoCorrect) {
(it as LeafElement).upsertWhitespaceAfterMe("\n${indentConfig.indent}")
@@ -132,7 +132,7 @@
private fun wrapParameterList(
node: ASTNode,
emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
- autoCorrect: Boolean
+ autoCorrect: Boolean,
) {
val newIndentLevel = getNewIndentLevel(node)
node
@@ -167,7 +167,7 @@
newIndentLevel: Int,
child: ASTNode,
emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
- autoCorrect: Boolean
+ autoCorrect: Boolean,
) {
val indent = "\n" + indentConfig.indent.repeat(newIndentLevel)
when (child.elementType) {
@@ -181,7 +181,8 @@
}
}
VALUE_PARAMETER,
- RPAR -> {
+ RPAR,
+ -> {
// aiming for
// ... LPAR
// <line indent + indentSize> VALUE_PARAMETER...
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundAngleBracketsRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundAngleBracketsRule.kt
index 59c62fe..11bc836 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundAngleBracketsRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundAngleBracketsRule.kt
@@ -19,7 +19,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.elementType.let { it == TYPE_PARAMETER_LIST || it == TYPE_ARGUMENT_LIST }) {
val openingBracket = node.firstChildNode
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundColonRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundColonRule.kt
index 52bd770..fc55594 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundColonRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundColonRule.kt
@@ -31,7 +31,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node is LeafPsiElement && node.textMatches(":") && !node.isPartOfString() && !node.isPartOfComment()) {
if (node.isPartOf(ANNOTATION) || node.isPartOf(ANNOTATION_ENTRY)) {
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundCommaRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundCommaRule.kt
index 87ecda9..a720f9f 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundCommaRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundCommaRule.kt
@@ -24,7 +24,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node is LeafPsiElement && node.textMatches(",") && !node.isPartOfString()) {
val prevLeaf = node.prevLeaf()
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundCurlyRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundCurlyRule.kt
index d7fb1e0..6597219 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundCurlyRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundCurlyRule.kt
@@ -36,7 +36,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node is LeafPsiElement && !node.isPartOfString()) {
val prevLeaf = node.prevLeaf()
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundDotRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundDotRule.kt
index d9e36e4..98dc301 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundDotRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundDotRule.kt
@@ -14,7 +14,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node is LeafPsiElement && node.textMatches(".") && !node.isPartOfString() && !node.isPartOfComment()) {
val prevLeaf = node.prevLeaf()
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundDoubleColonRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundDoubleColonRule.kt
index ec45a5b..ff1a569 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundDoubleColonRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundDoubleColonRule.kt
@@ -15,7 +15,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.elementType == COLONCOLON) {
val prevLeaf = node.prevLeaf()
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundKeywordRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundKeywordRule.kt
index 1643146..44c3c5e 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundKeywordRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundKeywordRule.kt
@@ -32,7 +32,7 @@
private val noLFBeforeSet = create(ELSE_KEYWORD, CATCH_KEYWORD, FINALLY_KEYWORD)
private val tokenSet = create(
FOR_KEYWORD, IF_KEYWORD, ELSE_KEYWORD, WHILE_KEYWORD, DO_KEYWORD,
- TRY_KEYWORD, CATCH_KEYWORD, FINALLY_KEYWORD, WHEN_KEYWORD
+ TRY_KEYWORD, CATCH_KEYWORD, FINALLY_KEYWORD, WHEN_KEYWORD,
)
private val keywordsWithoutSpaces = create(GET_KEYWORD, SET_KEYWORD)
@@ -40,7 +40,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node is LeafPsiElement) {
if (tokenSet.contains(node.elementType) && node.parent !is KDocName && node.nextLeaf() !is PsiWhiteSpace) {
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundOperatorsRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundOperatorsRule.kt
index b0fbf8c..c408ca7 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundOperatorsRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundOperatorsRule.kt
@@ -42,13 +42,13 @@
private val tokenSet = TokenSet.create(
MUL, PLUS, MINUS, DIV, PERC, LT, GT, LTEQ, GTEQ, EQEQEQ, EXCLEQEQEQ, EQEQ,
- EXCLEQ, ANDAND, OROR, ELVIS, EQ, MULTEQ, DIVEQ, PERCEQ, PLUSEQ, MINUSEQ, ARROW
+ EXCLEQ, ANDAND, OROR, ELVIS, EQ, MULTEQ, DIVEQ, PERCEQ, PLUSEQ, MINUSEQ, ARROW,
)
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (tokenSet.contains(node.elementType) &&
node is LeafElement &&
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundParensRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundParensRule.kt
index 231f81b..d5209e5 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundParensRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundParensRule.kt
@@ -27,7 +27,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.elementType == LPAR || node.elementType == RPAR) {
val prevLeaf = node.prevLeaf()
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundRangeOperatorRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundRangeOperatorRule.kt
index 883ea89..4e22e4d 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundRangeOperatorRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundRangeOperatorRule.kt
@@ -12,7 +12,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.elementType == RANGE) {
val prevLeaf = node.prevLeaf()
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundUnaryOperatorRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundUnaryOperatorRule.kt
index a525352..f426c32 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundUnaryOperatorRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundUnaryOperatorRule.kt
@@ -16,7 +16,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.elementType == ElementType.PREFIX_EXPRESSION ||
node.elementType == ElementType.POSTFIX_EXPRESSION
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingBetweenDeclarationsWithAnnotationsRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingBetweenDeclarationsWithAnnotationsRule.kt
index 7ef3af1..b8bc411 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingBetweenDeclarationsWithAnnotationsRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingBetweenDeclarationsWithAnnotationsRule.kt
@@ -21,7 +21,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.elementType == MODIFIER_LIST && node.hasAnnotationsAsChildren()) {
val declaration = node.psi.parent as? KtDeclaration
@@ -35,7 +35,7 @@
emit(
node.startOffset,
"Declarations and declarations with annotations should have an empty space between.",
- true
+ true,
)
if (autoCorrect) {
val indent = whiteSpaceAfterPreviousDeclaration.text.substringAfter('\n')
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingBetweenDeclarationsWithCommentsRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingBetweenDeclarationsWithCommentsRule.kt
index dd5c253..b5b1697 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingBetweenDeclarationsWithCommentsRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingBetweenDeclarationsWithCommentsRule.kt
@@ -20,7 +20,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node is PsiComment) {
val declaration = node.parent as? KtDeclaration ?: return
@@ -36,7 +36,7 @@
emit(
node.startOffset,
"Declarations and declarations with comments should have an empty space between.",
- true
+ true,
)
if (autoCorrect) {
val indent = node.prevLeaf()?.text?.trim('\n') ?: ""
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/StandardRuleSetProvider.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/StandardRuleSetProvider.kt
index 562383b..4211aae 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/StandardRuleSetProvider.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/StandardRuleSetProvider.kt
@@ -11,8 +11,8 @@
description = "Standard rules based on the Kotlin coding conventions (https://kotlinlang.org/docs/coding-conventions.html) and Android Kotlin styleguide (https://developer.android.com/kotlin/style-guide)",
license = "https://github.com/pinterest/ktlint/blob/master/LICENSE",
repositoryUrl = "https://github.com/pinterest/ktlint",
- issueTrackerUrl = "https://github.com/pinterest/ktlint/issues"
- )
+ issueTrackerUrl = "https://github.com/pinterest/ktlint/issues",
+ ),
) {
override fun getRuleProviders(): Set<RuleProvider> =
setOf(
@@ -60,6 +60,6 @@
RuleProvider { StringTemplateRule() },
RuleProvider { TrailingCommaOnCallSiteRule() },
RuleProvider { TrailingCommaOnDeclarationSiteRule() },
- RuleProvider { WrappingRule() }
+ RuleProvider { WrappingRule() },
)
}
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/StringTemplateRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/StringTemplateRule.kt
index b1bf1b1..449ec22 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/StringTemplateRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/StringTemplateRule.kt
@@ -21,7 +21,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
val elementType = node.elementType
// code below is commented out because (setting aside potentially dangerous replaceChild part)
@@ -43,7 +43,7 @@
emit(
entryExpression.operationTokenNode.startOffset,
"Redundant \"toString()\" call in string template",
- true
+ true,
)
if (autoCorrect) {
entryExpression.replace(receiver)
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/TrailingCommaOnCallSiteRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/TrailingCommaOnCallSiteRule.kt
index f1b963b..067f849 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/TrailingCommaOnCallSiteRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/TrailingCommaOnCallSiteRule.kt
@@ -36,15 +36,15 @@
VisitorModifier.RunAfterRule(
ruleId = "standard:indent",
loadOnlyWhenOtherRuleIsLoaded = true,
- runOnlyWhenOtherRuleIsEnabled = true
+ runOnlyWhenOtherRuleIsEnabled = true,
),
- VisitorModifier.RunAsLateAsPossible
- )
+ VisitorModifier.RunAsLateAsPossible,
+ ),
),
UsesEditorConfigProperties {
override val editorConfigProperties: List<UsesEditorConfigProperties.EditorConfigProperty<*>> = listOf(
- allowTrailingCommaOnCallSiteProperty
+ allowTrailingCommaOnCallSiteProperty,
)
private var allowTrailingCommaOnCallSite by Delegates.notNull<Boolean>()
@@ -59,7 +59,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
// Keep processing of element types in sync with Intellij Kotlin formatting settings.
// https://github.com/JetBrains/intellij-kotlin/blob/master/formatter/src/org/jetbrains/kotlin/idea/formatter/trailingComma/util.kt
@@ -75,7 +75,7 @@
private fun visitCollectionLiteralExpression(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
val inspectNode = node
.children()
@@ -84,14 +84,14 @@
inspectNode = inspectNode,
emit = emit,
isTrailingCommaAllowed = node.isTrailingCommaAllowed(),
- autoCorrect = autoCorrect
+ autoCorrect = autoCorrect,
)
}
private fun visitIndices(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
val inspectNode = node
.children()
@@ -100,14 +100,14 @@
inspectNode = inspectNode,
emit = emit,
isTrailingCommaAllowed = node.isTrailingCommaAllowed(),
- autoCorrect = autoCorrect
+ autoCorrect = autoCorrect,
)
}
private fun visitValueList(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.treeParent.elementType != ElementType.FUNCTION_LITERAL) {
node
@@ -118,7 +118,7 @@
inspectNode = inspectNode,
emit = emit,
isTrailingCommaAllowed = node.isTrailingCommaAllowed(),
- autoCorrect = autoCorrect
+ autoCorrect = autoCorrect,
)
}
}
@@ -127,7 +127,7 @@
private fun visitTypeList(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
val inspectNode = node
.children()
@@ -136,7 +136,7 @@
inspectNode = inspectNode,
emit = emit,
isTrailingCommaAllowed = node.isTrailingCommaAllowed(),
- autoCorrect = autoCorrect
+ autoCorrect = autoCorrect,
)
}
@@ -144,7 +144,7 @@
inspectNode: ASTNode,
isTrailingCommaAllowed: Boolean,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
val prevLeaf = inspectNode.prevLeaf()
val trailingCommaNode = prevLeaf.findPreviousTrailingCommaNodeOrNull()
@@ -157,7 +157,7 @@
emit(
trailingCommaNode!!.startOffset,
"Unnecessary trailing comma before \"${inspectNode.text}\"",
- true
+ true,
)
if (autoCorrect) {
this.removeChild(trailingCommaNode)
@@ -168,7 +168,7 @@
emit(
prevNode.startOffset + prevNode.textLength,
"Missing trailing comma before \"${inspectNode.text}\"",
- true
+ true,
)
if (autoCorrect) {
val comma = KtPsiFactory(prevNode.psi).createComma()
@@ -179,7 +179,7 @@
emit(
trailingCommaNode!!.startOffset,
"Unnecessary trailing comma before \"${inspectNode.text}\"",
- true
+ true,
)
if (autoCorrect) {
this.removeChild(trailingCommaNode)
@@ -252,8 +252,7 @@
/**
* The trailing comma isn't needed, but exists
*/
- REDUNDANT
- ;
+ REDUNDANT,
}
public companion object {
@@ -271,16 +270,16 @@
ALLOW_TRAILING_COMMA_ON_CALL_SITE_NAME,
ALLOW_TRAILING_COMMA_ON_CALL_SITE_DESCRIPTION,
PropertyValueParser.BOOLEAN_VALUE_PARSER,
- BOOLEAN_VALUES_SET
+ BOOLEAN_VALUES_SET,
),
- defaultValue = false
+ defaultValue = false,
)
private val TYPES_ON_CALL_SITE = TokenSet.create(
ElementType.COLLECTION_LITERAL_EXPRESSION,
ElementType.INDICES,
ElementType.TYPE_ARGUMENT_LIST,
- ElementType.VALUE_ARGUMENT_LIST
+ ElementType.VALUE_ARGUMENT_LIST,
)
}
}
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/TrailingCommaOnDeclarationSiteRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/TrailingCommaOnDeclarationSiteRule.kt
index e4d6702..92760ed 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/TrailingCommaOnDeclarationSiteRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/TrailingCommaOnDeclarationSiteRule.kt
@@ -50,15 +50,15 @@
VisitorModifier.RunAfterRule(
ruleId = "standard:indent",
loadOnlyWhenOtherRuleIsLoaded = true,
- runOnlyWhenOtherRuleIsEnabled = true
+ runOnlyWhenOtherRuleIsEnabled = true,
),
- VisitorModifier.RunAsLateAsPossible
- )
+ VisitorModifier.RunAsLateAsPossible,
+ ),
),
UsesEditorConfigProperties {
override val editorConfigProperties: List<UsesEditorConfigProperties.EditorConfigProperty<*>> = listOf(
- allowTrailingCommaProperty
+ allowTrailingCommaProperty,
)
private var allowTrailingComma by Delegates.notNull<Boolean>()
@@ -73,7 +73,7 @@
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
// Keep processing of element types in sync with Intellij Kotlin formatting settings.
// https://github.com/JetBrains/intellij-kotlin/blob/master/formatter/src/org/jetbrains/kotlin/idea/formatter/trailingComma/util.kt
@@ -91,7 +91,7 @@
private fun visitDestructuringDeclaration(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
val inspectNode = node
.children()
@@ -100,14 +100,14 @@
inspectNode = inspectNode,
isTrailingCommaAllowed = node.isTrailingCommaAllowed(),
autoCorrect = autoCorrect,
- emit = emit
+ emit = emit,
)
}
private fun visitFunctionLiteral(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
val inspectNode = node
.children()
@@ -118,14 +118,14 @@
inspectNode = inspectNode,
isTrailingCommaAllowed = node.isTrailingCommaAllowed(),
autoCorrect = autoCorrect,
- emit = emit
+ emit = emit,
)
}
private fun visitValueList(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
if (node.treeParent.elementType != ElementType.FUNCTION_LITERAL) {
node
@@ -136,7 +136,7 @@
inspectNode = inspectNode,
isTrailingCommaAllowed = node.isTrailingCommaAllowed(),
autoCorrect = autoCorrect,
- emit = emit
+ emit = emit,
)
}
}
@@ -145,7 +145,7 @@
private fun visitTypeList(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
val inspectNode = node
.children()
@@ -154,14 +154,14 @@
inspectNode = inspectNode,
isTrailingCommaAllowed = node.isTrailingCommaAllowed(),
autoCorrect = autoCorrect,
- emit = emit
+ emit = emit,
)
}
private fun visitWhenEntry(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
val psi = node.psi
require(psi is KtWhenEntry)
@@ -177,13 +177,13 @@
inspectNode = inspectNode,
isTrailingCommaAllowed = node.isTrailingCommaAllowed(),
autoCorrect = autoCorrect,
- emit = emit
+ emit = emit,
)
}
private fun visitClass(
node: ASTNode,
emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
- autoCorrect: Boolean
+ autoCorrect: Boolean,
) {
val psi = node.psi
require(psi is KtClass)
@@ -200,7 +200,7 @@
inspectNode = nodeAfterTrailingCommaPosition,
isTrailingCommaAllowed = node.isTrailingCommaAllowed(),
autoCorrect = autoCorrect,
- emit = emit
+ emit = emit,
)
}
}
@@ -235,7 +235,7 @@
inspectNode: ASTNode,
isTrailingCommaAllowed: Boolean,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
val prevLeaf = inspectNode.prevLeaf()
val trailingCommaNode = prevLeaf.findPreviousTrailingCommaNodeOrNull()
@@ -256,7 +256,7 @@
emit(
trailingCommaNode!!.startOffset,
"Expected a newline between the trailing comma and \"${inspectNode.text}\"",
- true
+ true,
)
if (autoCorrect) {
val parentIndent = "\n" + inspectNode.getWhenEntryIndent()
@@ -272,7 +272,7 @@
emit(
trailingCommaNode!!.startOffset,
"Unnecessary trailing comma before \"${inspectNode.text}\"",
- true
+ true,
)
if (autoCorrect) {
this.removeChild(trailingCommaNode)
@@ -286,13 +286,13 @@
emit(
prevNode.startOffset + prevNode.textLength,
"Missing trailing comma and newline before \"${inspectNode.text}\"",
- true
+ true,
)
} else {
emit(
prevNode.startOffset + prevNode.textLength,
"Missing trailing comma before \"${inspectNode.text}\"",
- true
+ true,
)
}
if (autoCorrect) {
@@ -329,7 +329,7 @@
emit(
trailingCommaNode!!.startOffset,
"Unnecessary trailing comma before \"${inspectNode.text}\"",
- true
+ true,
)
if (autoCorrect) {
this.removeChild(trailingCommaNode)
@@ -416,8 +416,7 @@
/**
* The trailing comma isn't needed, but exists
*/
- REDUNDANT
- ;
+ REDUNDANT,
}
public companion object {
@@ -437,9 +436,9 @@
ALLOW_TRAILING_COMMA_NAME,
ALLOW_TRAILING_COMMA_DESCRIPTION,
PropertyValueParser.BOOLEAN_VALUE_PARSER,
- BOOLEAN_VALUES_SET
+ BOOLEAN_VALUES_SET,
),
- defaultValue = false
+ defaultValue = false,
)
private val TYPES_ON_DECLARATION_SITE = TokenSet.create(
@@ -449,7 +448,7 @@
ElementType.FUNCTION_TYPE,
ElementType.TYPE_PARAMETER_LIST,
ElementType.VALUE_PARAMETER_LIST,
- ElementType.WHEN_ENTRY
+ ElementType.WHEN_ENTRY,
)
}
}
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/WrappingRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/WrappingRule.kt
index 92eb2fe..efa17d6 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/WrappingRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/WrappingRule.kt
@@ -79,7 +79,7 @@
override val editorConfigProperties: List<UsesEditorConfigProperties.EditorConfigProperty<*>> =
listOf(
DefaultEditorConfigProperties.indentSizeProperty,
- DefaultEditorConfigProperties.indentStyleProperty
+ DefaultEditorConfigProperties.indentStyleProperty,
)
private var line = 1
@@ -89,14 +89,14 @@
line = 1
indentConfig = IndentConfig(
indentStyle = editorConfigProperties.getEditorConfigValue(DefaultEditorConfigProperties.indentStyleProperty),
- tabWidth = editorConfigProperties.getEditorConfigValue(DefaultEditorConfigProperties.indentSizeProperty)
+ tabWidth = editorConfigProperties.getEditorConfigValue(DefaultEditorConfigProperties.indentSizeProperty),
)
}
override fun beforeVisitChildNodes(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
when (node.elementType) {
LPAR, LBRACE, LBRACKET -> rearrangeBlock(node, autoCorrect, emit) // TODO: LT
@@ -111,7 +111,7 @@
private fun rearrangeBlock(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
val rElementType = matchingRToken[node.elementType]
var newlineInBetween = false
@@ -190,7 +190,7 @@
private fun rearrangeSuperTypeList(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
val entries = (node.psi as KtSuperTypeList).entries
if (
@@ -234,7 +234,7 @@
nodeAfterWhichNewlineIsRequired = c,
autoCorrect = autoCorrect,
emit = emit,
- indent = node.lineIndent()
+ indent = node.lineIndent(),
)
}
}
@@ -248,7 +248,7 @@
private fun rearrangeValueList(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
for (c in node.children()) {
val hasLineBreak = when (c.elementType) {
@@ -303,7 +303,7 @@
private fun rearrangeClosingQuote(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
node
.treeParent
@@ -325,7 +325,7 @@
emit(
node.startOffset,
"Missing newline before \"\"\"",
- true
+ true,
)
if (autoCorrect) {
node as LeafPsiElement
@@ -365,7 +365,7 @@
private fun rearrangeArrow(
node: ASTNode,
autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
) {
val p = node.treeParent
if (
@@ -406,12 +406,12 @@
node: ASTNode,
autoCorrect: Boolean,
emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
- indent: String
+ indent: String,
) {
emit(
node.startOffset - 1,
"""Missing newline before "${node.text}"""",
- true
+ true,
)
logger.trace { "$line: " + ((if (!autoCorrect) "would have " else "") + "inserted newline before ${node.text}") }
if (autoCorrect) {
@@ -424,12 +424,12 @@
autoCorrect: Boolean,
emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
indent: String? = null,
- nodeToFix: ASTNode = nodeAfterWhichNewlineIsRequired
+ nodeToFix: ASTNode = nodeAfterWhichNewlineIsRequired,
) {
emit(
nodeAfterWhichNewlineIsRequired.startOffset + 1,
"""Missing newline after "${nodeAfterWhichNewlineIsRequired.text}"""",
- true
+ true,
)
logger.trace { "$line: " + (if (!autoCorrect) "would have " else "") + "inserted newline after ${nodeAfterWhichNewlineIsRequired.text}" }
if (autoCorrect) {
@@ -508,7 +508,7 @@
private val rTokenSet = TokenSet.create(RPAR, RBRACE, RBRACKET, GT)
private val matchingRToken =
lTokenSet.types.zip(
- rTokenSet.types
+ rTokenSet.types,
).toMap()
}
}
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/internal/importordering/ImportSorter.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/internal/importordering/ImportSorter.kt
index cc92311..53e959e 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/internal/importordering/ImportSorter.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/internal/importordering/ImportSorter.kt
@@ -9,7 +9,7 @@
* Adopted from https://github.com/JetBrains/kotlin/blob/a270ee094c4d7b9520e0898a242bb6ce4dfcad7b/idea/src/org/jetbrains/kotlin/idea/util/ImportPathComparator.kt#L15
*/
internal class ImportSorter(
- val patterns: List<PatternEntry>
+ val patterns: List<PatternEntry>,
) : Comparator<KtImportDirective> {
override fun compare(import1: KtImportDirective, import2: KtImportDirective): Int {
@@ -20,7 +20,7 @@
importPath1,
importPath2,
{ import -> findImportIndex(import) },
- { import -> import.toString().replace("`", "") }
+ { import -> import.toString().replace("`", "") },
)
}
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/internal/importordering/PatternEntry.kt b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/internal/importordering/PatternEntry.kt
index dddd8f0..4249c89 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/internal/importordering/PatternEntry.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/internal/importordering/PatternEntry.kt
@@ -10,7 +10,7 @@
public class PatternEntry(
packageName: String,
public val withSubpackages: Boolean,
- public val hasAlias: Boolean
+ public val hasAlias: Boolean,
) {
private val packageName = packageName.removeSuffix(".*")
@@ -79,21 +79,21 @@
PatternEntry(
BLANK_LINE_CHAR,
withSubpackages = true,
- hasAlias = false
+ hasAlias = false,
)
public val ALL_OTHER_IMPORTS_ENTRY: PatternEntry =
PatternEntry(
WILDCARD_CHAR,
withSubpackages = true,
- hasAlias = false
+ hasAlias = false,
)
public val ALL_OTHER_ALIAS_IMPORTS_ENTRY: PatternEntry =
PatternEntry(
ALIAS_CHAR,
withSubpackages = true,
- hasAlias = true
+ hasAlias = true,
)
}
}
