aboutsummaryrefslogtreecommitdiff
path: root/ktlint-ruleset-standard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/NoBlankLineBeforeRbraceRule.kt
diff options
context:
space:
mode:
Diffstat (limited to 'ktlint-ruleset-standard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/NoBlankLineBeforeRbraceRule.kt')
-rw-r--r--ktlint-ruleset-standard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/NoBlankLineBeforeRbraceRule.kt11
1 files changed, 7 insertions, 4 deletions
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/NoBlankLineBeforeRbraceRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/NoBlankLineBeforeRbraceRule.kt
index ce64489f..cd7649e1 100644
--- a/ktlint-ruleset-standard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/NoBlankLineBeforeRbraceRule.kt
+++ b/ktlint-ruleset-standard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/NoBlankLineBeforeRbraceRule.kt
@@ -9,17 +9,20 @@ import org.jetbrains.kotlin.lexer.KtTokens
class NoBlankLineBeforeRbraceRule : Rule("no-blank-line-before-rbrace") {
- override fun visit(node: ASTNode, autoCorrect: Boolean,
- emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit) {
+ override fun visit(
+ node: ASTNode,
+ autoCorrect: Boolean,
+ emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
+ ) {
if (node is PsiWhiteSpace &&
node.textContains('\n') &&
PsiTreeUtil.nextLeaf(node, true)?.node?.elementType == KtTokens.RBRACE) {
val split = node.getText().split("\n")
if (split.size > 2) {
emit(node.startOffset + split[0].length + split[1].length + 1,
- "Needless blank line(s)", true)
+ "Unexpected blank line(s) before \"}\"", true)
if (autoCorrect) {
- (node as LeafPsiElement).replaceWithText("${split.first()}\n${split.last()}")
+ (node as LeafPsiElement).rawReplaceWithText("${split.first()}\n${split.last()}")
}
}
}