Merge branch 'master' into bugfix/NewLinesRuleDotQualifiedExpression

.editorconfig

@@ -49,7 +49,7 @@ ij_kotlin_field_annotation_wrap = split_into_lines
 ij_kotlin_finally_on_new_line = false
 ij_kotlin_if_rparen_on_new_line = true
 ij_kotlin_import_nested_classes = false
-ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
+ij_kotlin_imports_layout = android.**,androidx.**,com.android.**,org.cqfn.diktat.**,*,java.**,javax.**,kotlin.**,kotlinx.**,^
 ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
 ij_kotlin_keep_blank_lines_before_right_brace = 2
 ij_kotlin_keep_blank_lines_in_code = 2

diktat-analysis.yml

@@ -10,7 +10,7 @@
     # or: "1, 2, 3, 4, 5, 6"
     disabledChapters: ""
     testDirs: test
-    kotlinVersion: 1.6
+    kotlinVersion: 1.7
     srcDirectories: "main"
 # Checks that the Class/Enum/Interface name does not match Pascal case
 - name: CLASS_NAME_INCORRECT
@@ -98,6 +98,9 @@
 # Checks that underscore is correctly used to split package naming
 - name: INCORRECT_PACKAGE_SEPARATOR
   enabled: true
+# Checks that code block doesn't contain kdoc comments
+- name: COMMENTED_BY_KDOC
+  enabled: true
 # Checks that there is no @deprecated tag in kdoc
 - name: KDOC_NO_DEPRECATED_TAG
   enabled: true

diktat-gradle-plugin/build.gradle.kts

@@ -3,7 +3,7 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.getCurr
 
 plugins {
     `java-gradle-plugin`
-    kotlin("jvm") version "1.6.21"
+    kotlin("jvm") version "1.7.0"
     jacoco
     id("pl.droidsonroids.jacoco.testkit") version "1.0.9"
     id("org.gradle.test-retry") version "1.4.0"

diktat-maven-plugin/pom.xml

@@ -13,7 +13,7 @@
     <packaging>maven-plugin</packaging>
 
     <properties>
-        <maven.api.version>3.8.5</maven.api.version>
+        <maven.api.version>3.8.6</maven.api.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.itf.version>0.11.0</maven.itf.version>
     </properties>

diktat-rules/src/main/kotlin/generated/WarningNames.kt

@@ -108,6 +108,8 @@ public object WarningNames {
 
     public const val COMMENTED_OUT_CODE: String = "COMMENTED_OUT_CODE"
 
+    public const val COMMENTED_BY_KDOC: String = "COMMENTED_BY_KDOC"
+
     public const val WRONG_NEWLINES_AROUND_KDOC: String = "WRONG_NEWLINES_AROUND_KDOC"
 
     public const val FIRST_COMMENT_NO_BLANK_LINE: String = "FIRST_COMMENT_NO_BLANK_LINE"

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/constants/Warnings.kt

@@ -89,6 +89,7 @@ enum class Warnings(
     HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE(false, "2.2.1", "files that contain multiple or no classes should contain description of what is inside of this file"),
     HEADER_NOT_BEFORE_PACKAGE(true, "2.2.1", "header KDoc should be placed before package and imports"),
     COMMENTED_OUT_CODE(false, "2.4.2", "you should not comment out code, use VCS to save it in history and delete this block"),
+    COMMENTED_BY_KDOC(true, "2.1.1", "you should not comment inside code blocks using kdoc syntax"),
     WRONG_NEWLINES_AROUND_KDOC(true, "2.4.1", "there should be a blank line above the kDoc and there should not be no blank lines after kDoc"),
     FIRST_COMMENT_NO_BLANK_LINE(true, "2.4.1", "there should not be any blank lines before first comment"),
     COMMENT_WHITE_SPACE(true, "2.4.1", "there should be a white space between code and comment also between code start token and comment text"),

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter2/kdoc/KdocComments.kt

@@ -13,6 +13,7 @@ import org.cqfn.diktat.ruleset.rules.DiktatRule
 import org.cqfn.diktat.ruleset.utils.*
 
 import com.pinterest.ktlint.core.ast.ElementType
+import com.pinterest.ktlint.core.ast.ElementType.BLOCK
 import com.pinterest.ktlint.core.ast.ElementType.BLOCK_COMMENT
 import com.pinterest.ktlint.core.ast.ElementType.CLASS
 import com.pinterest.ktlint.core.ast.ElementType.CLASS_BODY
@@ -35,6 +36,7 @@ import com.pinterest.ktlint.core.ast.parent
 import com.pinterest.ktlint.core.ast.prevSibling
 import org.jetbrains.kotlin.com.intellij.lang.ASTNode
 import org.jetbrains.kotlin.com.intellij.psi.impl.source.tree.LeafPsiElement
+import org.jetbrains.kotlin.com.intellij.psi.impl.source.tree.PsiCommentImpl
 import org.jetbrains.kotlin.com.intellij.psi.impl.source.tree.PsiWhiteSpaceImpl
 import org.jetbrains.kotlin.com.intellij.psi.tree.TokenSet
 import org.jetbrains.kotlin.kdoc.parser.KDocKnownTag
@@ -67,13 +69,30 @@ class KdocComments(configRules: List<RulesConfig>) : DiktatRule(
                 CLASS -> checkClassElements(node)
                 VALUE_PARAMETER -> checkValueParameter(node)
                 PRIMARY_CONSTRUCTOR -> checkParameterList(node.findChildByType(VALUE_PARAMETER_LIST))
+                BLOCK -> checkKdocPresent(node)
                 else -> {
                     // this is a generated else block
                 }
             }
         }
     }
 
+    private fun checkKdocPresent(node: ASTNode) {
+        node.findChildrenMatching { it.elementType == KDOC }.forEach {
+            warnKdocInsideBlock(it)
+        }
+    }
+
+    private fun warnKdocInsideBlock(kdocNode: ASTNode) {
+        Warnings.COMMENTED_BY_KDOC.warnAndFix(
+            configRules, emitWarn, isFixMode,
+            "Redundant asterisk in block comment: \\**", kdocNode.startOffset, kdocNode
+        ) {
+            kdocNode.treeParent.addChild(PsiCommentImpl(BLOCK_COMMENT, kdocNode.text.replace("/**", "/*")), kdocNode)
+            kdocNode.treeParent.removeChild(kdocNode)
+        }
+    }
+
     private fun checkParameterList(node: ASTNode?) {
         val kdocBeforeClass = node
             ?.parent({ it.elementType == CLASS })
@@ -305,10 +324,11 @@ class KdocComments(configRules: List<RulesConfig>) : DiktatRule(
         }
     }
 
-    private fun checkTopLevelDoc(node: ASTNode) =
+    private fun checkTopLevelDoc(node: ASTNode) {
         // checking that all top level class declarations and functions have kDoc
-        (node.getAllChildrenWithType(CLASS) + node.getAllChildrenWithType(FUN))
+        return (node.getAllChildrenWithType(CLASS) + node.getAllChildrenWithType(FUN))
             .forEach { checkDoc(it, MISSING_KDOC_TOP_LEVEL) }
+    }
 
     /**
      * raises warning if protected, public or internal code element does not have a Kdoc

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/ExtensionFunctionsSameNameRule.kt

@@ -38,7 +38,7 @@ class ExtensionFunctionsSameNameRule(configRules: List<RulesConfig>) : DiktatRul
     listOf(EXTENSION_FUNCTION_SAME_SIGNATURE)
 ) {
     override fun logic(node: ASTNode) {
-        /**
+        /*
          * 1) Collect all classes that extend other classes (collect related classes)
          * 2) Collect all extension functions with same signature
          * 3) Check if classes of functions are related

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/AstNodeUtils.kt

@@ -847,9 +847,9 @@ private fun ASTNode.findOffsetByLine(line: Int, positionByOffset: (Int) -> Pair<
     val currentOffset = this.startOffset
 
     var forwardDirection = true
+
     // We additionaly consider the offset and line for current node in aim to speed up the search
     // and not start any time from beginning of file, if possible
-    // 
     // If current line is closer to the requested line, start search from it
     // otherwise search from the beginning of file
     var lineOffset = if (line < currentLine) {

diktat-rules/src/main/resources/diktat-analysis-huawei.yml

@@ -7,7 +7,7 @@
     # testDirs: test
     disabledChapters: ""
     testDirs: test
-    kotlinVersion: 1.6
+    kotlinVersion: 1.7
     srcDirectories: "main"
 # Checks that the Class/Enum/Interface name does not match Pascal case
 - name: CLASS_NAME_INCORRECT
@@ -100,6 +100,9 @@
 # Checks that underscore is correctly used to split package naming
 - name: INCORRECT_PACKAGE_SEPARATOR
   enabled: true
+# Checks that code block doesn't contain kdoc comments
+- name: COMMENTED_BY_KDOC
+  enabled: true
 # Checks that there is no @deprecated tag in kdoc
 - name: KDOC_NO_DEPRECATED_TAG
   enabled: true

diktat-rules/src/main/resources/diktat-analysis.yml

@@ -7,7 +7,7 @@
     # expected values:  disabledChapters: "Naming, Comments, General, Variables, Functions, Classes"
     # or: "1, 2, 3, 4, 5, 6"
     disabledChapters: ""
-    kotlinVersion: 1.6
+    kotlinVersion: 1.7
     srcDirectories: "main"
 # Checks that the Class/Enum/Interface name does not match Pascal case
 - name: CLASS_NAME_INCORRECT
@@ -100,6 +100,9 @@
 # Checks that underscore is correctly used to split package naming
 - name: INCORRECT_PACKAGE_SEPARATOR
   enabled: true
+# Checks that code block doesn't contain kdoc comments
+- name: COMMENTED_BY_KDOC
+  enabled: true
 # Checks that there is no @deprecated tag in kdoc
 - name: KDOC_NO_DEPRECATED_TAG
   enabled: true

diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocCommentsFixTest.kt

@@ -8,6 +8,12 @@ import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 
 class KdocCommentsFixTest : FixTestBase("test/paragraph2/kdoc/", ::KdocComments) {
+    @Test
+    @Tag(WarningNames.COMMENTED_BY_KDOC)
+    fun `check fix code block with kdoc comment`() {
+        fixAndCompare("KdocBlockCommentExpected.kt", "KdocBlockCommentTest.kt")
+    }
+
     @Test
     @Tag(WarningNames.KDOC_NO_CONSTRUCTOR_PROPERTY)
     fun `check fix with class kdoc`() {

diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocCommentsWarnTest.kt

@@ -1,5 +1,6 @@
 package org.cqfn.diktat.ruleset.chapter2
 
+import org.cqfn.diktat.ruleset.constants.Warnings
 import org.cqfn.diktat.ruleset.constants.Warnings.KDOC_EXTRA_PROPERTY
 import org.cqfn.diktat.ruleset.constants.Warnings.KDOC_NO_CLASS_BODY_PROPERTIES_IN_HEADER
 import org.cqfn.diktat.ruleset.constants.Warnings.KDOC_NO_CONSTRUCTOR_PROPERTY
@@ -19,6 +20,42 @@ import org.junit.jupiter.api.Test
 class KdocCommentsWarnTest : LintTestBase(::KdocComments) {
     private val ruleId: String = "$DIKTAT_RULE_SET_ID:${KdocComments.NAME_ID}"
 
+    @Test
+    @Tag(WarningNames.COMMENTED_BY_KDOC)
+    fun `Should warn if kdoc comment is inside code block`() {
+        val code =
+            """
+                    |package org.cqfn.diktat.example
+                    |
+                    |/**
+                    |  * right place for kdoc
+                    |  */
+                    |class Example {
+                    |/**
+                    |  * right place for kdoc
+                    |  */
+                    |    fun doGood(){
+                    |        /**
+                    |         * wrong place for kdoc
+                    |         */
+                    |        1+2
+                    |        /**
+                    |         * right place for kdoc
+                    |         */
+                    |        fun prettyPrint(level: Int = 0, maxLevel: Int = -1): String {
+                    |            return "test"
+                    |        }
+                    |    }
+                    |}
+            """.trimMargin()
+        lintMethod(
+            code,
+            LintError(
+                11, 9, ruleId, "${Warnings.COMMENTED_BY_KDOC.warnText()} Redundant asterisk in block comment: \\**", true
+            )
+        )
+    }
+
     @Test
     @Tag(WarningNames.MISSING_KDOC_TOP_LEVEL)
     fun `all public classes should be documented with KDoc`() {
@@ -39,7 +76,8 @@ class KdocCommentsWarnTest : LintTestBase(::KdocComments) {
                 }
 
             """.trimIndent()
-        lintMethod(code,
+        lintMethod(
+            code,
             LintError(1, 1, ruleId, "${MISSING_KDOC_TOP_LEVEL.warnText()} SomeGoodName"),
             LintError(6, 1, ruleId, "${MISSING_KDOC_TOP_LEVEL.warnText()} SomeOtherGoodName"),
             LintError(9, 1, ruleId, "${MISSING_KDOC_TOP_LEVEL.warnText()} SomeNewGoodName"),
@@ -55,8 +93,10 @@ class KdocCommentsWarnTest : LintTestBase(::KdocComments) {
                 internal class SomeGoodName {
                 }
             """.trimIndent()
-        lintMethod(code, LintError(
-            1, 1, ruleId, "${MISSING_KDOC_TOP_LEVEL.warnText()} SomeGoodName")
+        lintMethod(
+            code, LintError(
+                1, 1, ruleId, "${MISSING_KDOC_TOP_LEVEL.warnText()} SomeGoodName"
+            )
         )
     }
 
@@ -71,10 +111,11 @@ class KdocCommentsWarnTest : LintTestBase(::KdocComments) {
                 internal fun someGoodNameNew(): String {
                     return " ";
                 }
-                
+
                 fun main() {}
             """.trimIndent()
-        lintMethod(code,
+        lintMethod(
+            code,
             LintError(1, 1, ruleId, "${MISSING_KDOC_TOP_LEVEL.warnText()} someGoodName"),
             LintError(4, 1, ruleId, "${MISSING_KDOC_TOP_LEVEL.warnText()} someGoodNameNew")
         )
@@ -124,11 +165,12 @@ class KdocCommentsWarnTest : LintTestBase(::KdocComments) {
 
                     private class InternalClass {
                     }
-                    
+
                     public fun main() {}
                 }
             """.trimIndent()
-        lintMethod(code,
+        lintMethod(
+            code,
             LintError(5, 5, ruleId, "${MISSING_KDOC_CLASS_ELEMENTS.warnText()} variable"),
             LintError(7, 5, ruleId, "${MISSING_KDOC_CLASS_ELEMENTS.warnText()} perfectFunction"),
             LintError(13, 5, ruleId, "${MISSING_KDOC_CLASS_ELEMENTS.warnText()} InternalClass")
@@ -158,11 +200,12 @@ class KdocCommentsWarnTest : LintTestBase(::KdocComments) {
 
                     private class InternalClass {
                     }
-                    
+
                     public fun main() {}
                 }
             """.trimIndent()
-        lintMethod(code,
+        lintMethod(
+            code,
             LintError(5, 5, ruleId, "${MISSING_KDOC_CLASS_ELEMENTS.warnText()} variable"),
             LintError(8, 5, ruleId, "${MISSING_KDOC_CLASS_ELEMENTS.warnText()} perfectFunction"),
             LintError(14, 5, ruleId, "${MISSING_KDOC_CLASS_ELEMENTS.warnText()} InternalClass")
@@ -193,7 +236,8 @@ class KdocCommentsWarnTest : LintTestBase(::KdocComments) {
                         private class InternalClass {
                         }
                     }
-                """.trimIndent())
+                """.trimIndent()
+        )
     }
 
     @Test
@@ -374,7 +418,7 @@ class KdocCommentsWarnTest : LintTestBase(::KdocComments) {
                     |    * some descriptions
                     |    * @return fdv
                     |    */
-                    |    
+                    |
                     |   val name: String,
                     |   anotherName: String,
                     |   OneMoreName: String
@@ -398,7 +442,7 @@ class KdocCommentsWarnTest : LintTestBase(::KdocComments) {
                     |    * sdcjkh
                     |    * @property name text2
                     |    */
-                    |   val name: String, 
+                    |   val name: String,
                     |   ) {
                     |}
                 """.trimMargin(),
@@ -415,7 +459,7 @@ class KdocCommentsWarnTest : LintTestBase(::KdocComments) {
                     | * text
                     | */
                     |class Example (
-                    |   private val name: String, 
+                    |   private val name: String,
                     |   ) {
                     |}
                 """.trimMargin()
@@ -432,7 +476,7 @@ class KdocCommentsWarnTest : LintTestBase(::KdocComments) {
                     | * @property
                     | */
                     |class Example (
-                    |   val name: String, 
+                    |   val name: String,
                     |   ) {
                     |}
                 """.trimMargin(),
@@ -447,7 +491,7 @@ class KdocCommentsWarnTest : LintTestBase(::KdocComments) {
         lintMethod(
             """
                     |class Example (
-                    |   val name: String, 
+                    |   val name: String,
                     |   private val surname: String
                     |   ) {
                     |}
@@ -467,7 +511,7 @@ class KdocCommentsWarnTest : LintTestBase(::KdocComments) {
                     | * @property kek
                     | */
                     |class Example (
-                    |   val name: String, 
+                    |   val name: String,
                     |   private val surname: String
                     |   ) {
                     |}