-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into bugfix/gradle-plugin-onfig-resolving#703
- Loading branch information
Showing
84 changed files
with
2,054 additions
and
661 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/AsyncAndSyncRule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package org.cqfn.diktat.ruleset.rules | ||
|
|
||
| import org.cqfn.diktat.common.config.rules.RulesConfig | ||
| import org.cqfn.diktat.ruleset.constants.EmitType | ||
| import org.cqfn.diktat.ruleset.constants.Warnings.RUN_BLOCKING_INSIDE_ASYNC | ||
| import org.cqfn.diktat.ruleset.utils.hasChildOfType | ||
|
|
||
| import com.pinterest.ktlint.core.Rule | ||
| import com.pinterest.ktlint.core.ast.ElementType.CALL_EXPRESSION | ||
| import com.pinterest.ktlint.core.ast.ElementType.FUN | ||
| import com.pinterest.ktlint.core.ast.ElementType.LAMBDA_ARGUMENT | ||
| import com.pinterest.ktlint.core.ast.ElementType.REFERENCE_EXPRESSION | ||
| import com.pinterest.ktlint.core.ast.parent | ||
| import org.jetbrains.kotlin.com.intellij.lang.ASTNode | ||
| import org.jetbrains.kotlin.psi.KtFunction | ||
| import org.jetbrains.kotlin.psi.psiUtil.hasSuspendModifier | ||
|
|
||
| /** | ||
| * This rule finds if using runBlocking in asynchronous code | ||
| */ | ||
| class AsyncAndSyncRule(private val configRules: List<RulesConfig>) : Rule("sync-in-async") { | ||
| private val asyncList = listOf("async", "launch") | ||
| private var isFixMode: Boolean = false | ||
| private lateinit var emitWarn: EmitType | ||
|
|
||
| override fun visit(node: ASTNode, | ||
| autoCorrect: Boolean, | ||
| emit: EmitType) { | ||
| emitWarn = emit | ||
| isFixMode = autoCorrect | ||
|
|
||
| if (node.isRunBlocking()) { | ||
| checkRunBlocking(node) | ||
| } | ||
| } | ||
|
|
||
| private fun checkRunBlocking(node: ASTNode) { | ||
| node.parent({it.isAsync() || it.isSuspend()})?.let { | ||
| RUN_BLOCKING_INSIDE_ASYNC.warn(configRules, emitWarn, isFixMode, node.text, node.startOffset, node) | ||
| } | ||
| } | ||
|
|
||
| private fun ASTNode.isAsync() = this.elementType == CALL_EXPRESSION && this.findChildByType(REFERENCE_EXPRESSION)?.text in asyncList | ||
|
|
||
| private fun ASTNode.isSuspend() = this.elementType == FUN && (this.psi as KtFunction).modifierList?.hasSuspendModifier() ?: false | ||
|
|
||
| private fun ASTNode.isRunBlocking() = this.elementType == REFERENCE_EXPRESSION && this.text == "runBlocking" && this.treeParent.hasChildOfType(LAMBDA_ARGUMENT) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/CheckInverseMethodRule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package org.cqfn.diktat.ruleset.rules | ||
|
|
||
| import org.cqfn.diktat.common.config.rules.RulesConfig | ||
| import org.cqfn.diktat.ruleset.constants.EmitType | ||
| import org.cqfn.diktat.ruleset.constants.Warnings.INVERSE_FUNCTION_PREFERRED | ||
|
|
||
| import com.pinterest.ktlint.core.Rule | ||
| import com.pinterest.ktlint.core.ast.ElementType.BLOCK_COMMENT | ||
| import com.pinterest.ktlint.core.ast.ElementType.CALL_EXPRESSION | ||
| import com.pinterest.ktlint.core.ast.ElementType.IDENTIFIER | ||
| import com.pinterest.ktlint.core.ast.ElementType.LPAR | ||
| import com.pinterest.ktlint.core.ast.ElementType.OPERATION_REFERENCE | ||
| import com.pinterest.ktlint.core.ast.ElementType.REFERENCE_EXPRESSION | ||
| import com.pinterest.ktlint.core.ast.ElementType.RPAR | ||
| import com.pinterest.ktlint.core.ast.ElementType.VALUE_ARGUMENT_LIST | ||
| import com.pinterest.ktlint.core.ast.ElementType.WHITE_SPACE | ||
| import org.jetbrains.kotlin.com.intellij.lang.ASTNode | ||
| import org.jetbrains.kotlin.com.intellij.psi.impl.source.tree.CompositeElement | ||
| import org.jetbrains.kotlin.com.intellij.psi.impl.source.tree.LeafPsiElement | ||
| import org.jetbrains.kotlin.psi.psiUtil.siblings | ||
|
|
||
| /** | ||
| * This rule checks if inverse method can be used. | ||
| * For example if there is !isEmpty() on collection call that it changes it to isNotEmpty() | ||
| */ | ||
| class CheckInverseMethodRule(private val configRules: List<RulesConfig>) : Rule("inverse-method") { | ||
| private var isFixMode: Boolean = false | ||
| private lateinit var emitWarn: EmitType | ||
|
|
||
| override fun visit(node: ASTNode, | ||
| autoCorrect: Boolean, | ||
| emit: EmitType) { | ||
| emitWarn = emit | ||
| isFixMode = autoCorrect | ||
|
|
||
| if (node.elementType == CALL_EXPRESSION && node.text in methodMap.keys) { | ||
| checkCallExpressionName(node) | ||
| } | ||
| } | ||
|
|
||
| private fun checkCallExpressionName(node: ASTNode) { | ||
| val operationRef = node | ||
| .treeParent | ||
| .siblings(forward = false) | ||
| .takeWhile { it.elementType in intermediateTokens } | ||
| .firstOrNull { it.elementType == OPERATION_REFERENCE} | ||
| if (operationRef?.text == "!") { | ||
| INVERSE_FUNCTION_PREFERRED.warnAndFix(configRules, emitWarn, isFixMode, "${methodMap[node.text]} instead of !${node.text}", node.startOffset, node) { | ||
| val callExpression = CompositeElement(CALL_EXPRESSION) | ||
| val referenceExp = CompositeElement(REFERENCE_EXPRESSION) | ||
| val argList = CompositeElement(VALUE_ARGUMENT_LIST) | ||
| node.treeParent.addChild(callExpression, node) | ||
| callExpression.addChild(referenceExp) | ||
| callExpression.addChild(argList) | ||
| referenceExp.addChild(LeafPsiElement(IDENTIFIER, "${methodMap[node.text]}".dropLast(2))) | ||
| argList.addChild(LeafPsiElement(LPAR, "(")) | ||
| argList.addChild(LeafPsiElement(RPAR, ")")) | ||
| node.treeParent.treeParent.removeChild(node.treeParent.treePrev) // removing OPERATION_EXPRESSION - ! | ||
| node.treeParent.removeChild(node) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| val methodMap = mapOf( | ||
| "isEmpty()" to "isNotEmpty()", | ||
| "isBlank()" to "isNotBlank()", | ||
| "isNotEmpty()" to "isEmpty()", | ||
| "isNotBlank()" to "isBlank()" | ||
| ) | ||
| val intermediateTokens = listOf(WHITE_SPACE, OPERATION_REFERENCE, BLOCK_COMMENT) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.