Fixed node removal

pinterest · Jul 24, 2017 · e538e53 · e538e53
1 parent a120164
commit e538e53
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/...et-standard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/NoSemicolonsRule.kt b/...et-standard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/NoSemicolonsRule.kt
@@ -21,7 +21,7 @@ class NoSemicolonsRule : Rule("no-semi") {
                 ) {
                 emit(node.startOffset, "Unnecessary semicolon", true)
                 if (autoCorrect) {
-                    node.delete()
+                    node.treeParent.removeChild(node)
                 }
             } else if (nextLeaf !is PsiWhiteSpace) {
                 // todo: move to a separate rule

diff --git a/...ndard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/SpacingAroundCurlyRule.kt b/...ndard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/SpacingAroundCurlyRule.kt
@@ -31,7 +31,7 @@ class SpacingAroundCurlyRule : Rule("curly-spacing") {
                         shouldNotToBeSeparatedBySpace(PsiTreeUtil.nextLeaf(nextLeaf, true))) {
                     emit(node.startOffset, "Unexpected space after \"${node.text}\"", true)
                     if (autoCorrect) {
-                        nextLeaf.delete()
+                        nextLeaf.node.treeParent.removeChild(nextLeaf.node)
                     }
                 }
             } else {

diff --git a/...ard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/SpacingAroundKeywordRule.kt b/...ard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/SpacingAroundKeywordRule.kt
@@ -40,10 +40,11 @@ class SpacingAroundKeywordRule : Rule("keyword-spacing") {
                 }
             } else if (keywordsWithoutSpaces.contains(node.elementType) && node.nextLeaf() is PsiWhiteSpace) {
                 val parent = node.parent
-                if (parent is KtPropertyAccessor && parent.hasBody()) {
+                val nextLeaf = node.nextLeaf()
+                if (parent is KtPropertyAccessor && parent.hasBody() && nextLeaf != null) {
                     emit(node.startOffset, "Unexpected spacing after \"${node.text}\"", true)
                     if (autoCorrect) {
-                        node.nextLeaf()?.delete()
+                        nextLeaf.node.treeParent.removeChild(nextLeaf.node)
                     }
                 }
             }