azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Redundant async cleanup: use CAPS for constant names

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-11-30 12:21:19 +03:00
parent e6a1b96c53
commit 5947ca1142
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/coroutines/RedundantAsyncInspection.kt
+6 -6
View File
@@ -44,7 +44,7 @@ class RedundantAsyncInspection : AbstractCallChainChecker() {
if (scopeExpression != null) { if (scopeExpression != null) {
val context = scopeExpression.analyze(BodyResolveMode.PARTIAL) val context = scopeExpression.analyze(BodyResolveMode.PARTIAL)
val scopeDescriptor = (scopeExpression as? KtNameReferenceExpression)?.let { context[BindingContext.REFERENCE_TARGET, it] } val scopeDescriptor = (scopeExpression as? KtNameReferenceExpression)?.let { context[BindingContext.REFERENCE_TARGET, it] }
if (scopeDescriptor?.fqNameSafe?.toString() != globalScope) { if (scopeDescriptor?.fqNameSafe?.toString() != GLOBAL_SCOPE) {
// Temporary forbid cases with explicit non-global scope // Temporary forbid cases with explicit non-global scope
return null return null
} }
@@ -53,9 +53,9 @@ class RedundantAsyncInspection : AbstractCallChainChecker() {
if (defaultContext!! && defaultStart!!) { if (defaultContext!! && defaultStart!!) {
conversion = conversion.withArgumentList( conversion = conversion.withArgumentList(
if (conversion === conversions[0]) { if (conversion === conversions[0]) {
"($defaultAsyncArgument)" "($DEFAULT_ASYNC_ARGUMENT)"
} else { } else {
"($defaultAsyncArgumentExperimental)" "($DEFAULT_ASYNC_ARGUMENT_EXPERIMENTAL)"
} }
) )
} }
@@ -93,11 +93,11 @@ class RedundantAsyncInspection : AbstractCallChainChecker() {
) )
) )
private const val globalScope = "kotlinx.coroutines.GlobalScope" private const val GLOBAL_SCOPE = "kotlinx.coroutines.GlobalScope"
private const val defaultAsyncArgument = "$COROUTINE_PACKAGE.Dispatchers.Default" private const val DEFAULT_ASYNC_ARGUMENT = "$COROUTINE_PACKAGE.Dispatchers.Default"
private const val defaultAsyncArgumentExperimental = "$COROUTINE_EXPERIMENTAL_PACKAGE.DefaultDispatcher" private const val DEFAULT_ASYNC_ARGUMENT_EXPERIMENTAL = "$COROUTINE_EXPERIMENTAL_PACKAGE.DefaultDispatcher"
} }
} }