Merge branch 'master' into bugfix/overriden-kdoc-not-mandatory(#551)

saveourtool · Nov 30, 2020 · 1387770 · 1387770
2 parents 040949b + 2349037
commit 1387770
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/indentation/Checkers.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/indentation/Checkers.kt
@@ -178,11 +178,11 @@ internal class DotCallChecker(config: IndentationConfig) : CustomIndentationChec
 
     private fun ASTNode.isCommentBeforeDot() : Boolean {
         if (elementType == EOL_COMMENT || elementType == BLOCK_COMMENT) {
-            var nextNode = treeNext
+            var nextNode: ASTNode? = treeNext
             while (nextNode != null && (nextNode.elementType == WHITE_SPACE || nextNode.elementType == EOL_COMMENT)) {
                 nextNode = nextNode.treeNext
             }
-            return nextNode.isDotBeforeCallOrReference()
+            return nextNode?.isDotBeforeCallOrReference() ?: false
         }
         return false
     }

diff --git a/...-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/IndentationRuleWarnTest.kt b/...-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/IndentationRuleWarnTest.kt
@@ -574,6 +574,22 @@ class IndentationRuleWarnTest : LintTestBase(::IndentationRule) {
         )
     }
 
+    @Test
+    @Tag(WarningNames.WRONG_INDENTATION)
+    fun `regression - npe with comments`() {
+        lintMethod(
+            """
+                |fun foo() {
+                |    bar.let {
+                |        baz(it)
+                |        // lorem ipsum
+                |    }
+                |}
+                |
+            """.trimMargin()
+        )
+    }
+
     @Test
     @Tag(WarningNames.WRONG_INDENTATION)
     @Disabled("https://github.com/cqfn/diKTat/issues/377")