Merge branch 'master' into bugfix/extension-function-kdoc(#489)

saveourtool · Nov 11, 2020 · 96261ee · 96261ee
2 parents 47e279d + 48eec27
commit 96261ee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/kdoc/KdocComments.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/kdoc/KdocComments.kt
@@ -278,10 +278,13 @@ class KdocComments(private val configRules: List<RulesConfig>) : Rule("kdoc-comm
         val modifier = node.getFirstChildWithType(MODIFIER_LIST)
         val name = node.getIdentifierName()
 
-        if (modifier.isAccessibleOutside() && kdoc == null) {
+        if (modifier.isAccessibleOutside() && kdoc == null && !isTopLevelFunctionStandard(node)) {
             warning.warn(configRules, emitWarn, isFixMode, name!!.text, node.startOffset, node)
         }
     }
+
+    private fun isTopLevelFunctionStandard(node: ASTNode) : Boolean = node.elementType == FUN && node.isStandardMethod()
+
     companion object {
         private val statementsToDocument = TokenSet.create(CLASS, FUN, PROPERTY)
     }

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocWarnTest.kt
@@ -65,6 +65,8 @@ class KdocWarnTest : LintTestBase(::KdocComments) {
                     internal fun someGoodNameNew(): String {
                         return " ";
                     }
+                    
+                    fun main() {}
                 """.trimIndent()
         lintMethod(code,
                 LintError(1, 1, ruleId, "${MISSING_KDOC_TOP_LEVEL.warnText()} someGoodName"),
@@ -116,6 +118,8 @@ class KdocWarnTest : LintTestBase(::KdocComments) {
 
                         private class InternalClass {
                         }
+                        
+                        public fun main() {}
                     }
                 """.trimIndent()
         lintMethod(code,