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

Moved 2 intentions from idea-analysis to idea

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-05-12 14:26:04 +03:00
parent addcadeddf
commit 54051c40dc
2 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArguments.kt → idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArguments.kt
+12 -18
View File
@@ -17,25 +17,19 @@
package org.jetbrains.kotlin.idea.intentions
import com.intellij.openapi.editor.Editor
import org.jetbrains.kotlin.psi.JetCallExpression
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.calls.util.DelegatingCall
import org.jetbrains.kotlin.types.TypeUtils
import org.jetbrains.kotlin.resolve.scopes.JetScope
import org.jetbrains.kotlin.psi.JetTypeProjection
import org.jetbrains.kotlin.psi.Call
import org.jetbrains.kotlin.di.InjectorForMacros
import org.jetbrains.kotlin.resolve.BindingTraceContext
import org.jetbrains.kotlin.psi.JetProperty
import org.jetbrains.kotlin.psi.JetTypeArgumentList
import org.jetbrains.kotlin.psi.JetReturnExpression
import org.jetbrains.kotlin.psi.JetDeclarationWithBody
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.psi.psiUtil.getTextWithLocation
import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo
import org.jetbrains.kotlin.idea.util.approximateFlexibleTypes
import org.jetbrains.kotlin.idea.caches.resolve.findModuleDescriptor
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.caches.resolve.findModuleDescriptor
import org.jetbrains.kotlin.idea.util.approximateFlexibleTypes
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getTextWithLocation
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.BindingTraceContext
import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.calls.util.DelegatingCall
import org.jetbrains.kotlin.resolve.scopes.JetScope
import org.jetbrains.kotlin.types.TypeUtils
public class RemoveExplicitTypeArguments : JetSelfTargetingOffsetIndependentIntention<JetTypeArgumentList>(
"remove.explicit.type.arguments", javaClass()) {
@@ -91,4 +85,4 @@ public class RemoveExplicitTypeArguments : JetSelfTargetingOffsetIndependentInte
override fun applyTo(element: JetTypeArgumentList, editor: Editor) {
element.delete()
}
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.kt → idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.kt
+14 -14
View File
@@ -16,11 +16,11 @@
package org.jetbrains.kotlin.idea.intentions
import org.jetbrains.kotlin.lexer.JetToken
import org.jetbrains.kotlin.lexer.JetSingleValueToken
import com.intellij.openapi.editor.Editor
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.kotlin.idea.JetBundle
import org.jetbrains.kotlin.lexer.JetSingleValueToken
import org.jetbrains.kotlin.lexer.JetToken
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.kotlin.psi.*
public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingOffsetIndependentIntention<JetPrefixExpression>("simplify.negated.binary.expression", javaClass()) {
@@ -30,20 +30,20 @@ public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingOffsetIn
}
public fun JetToken.negate(): JetSingleValueToken? = when (this) {
JetTokens.IN_KEYWORD -> JetTokens.NOT_IN
JetTokens.NOT_IN -> JetTokens.IN_KEYWORD
JetTokens.IN_KEYWORD -> JetTokens.NOT_IN
JetTokens.NOT_IN -> JetTokens.IN_KEYWORD
JetTokens.IS_KEYWORD -> JetTokens.NOT_IS
JetTokens.NOT_IS -> JetTokens.IS_KEYWORD
JetTokens.IS_KEYWORD -> JetTokens.NOT_IS
JetTokens.NOT_IS -> JetTokens.IS_KEYWORD
JetTokens.EQEQ -> JetTokens.EXCLEQ
JetTokens.EXCLEQ -> JetTokens.EQEQ
JetTokens.EQEQ -> JetTokens.EXCLEQ
JetTokens.EXCLEQ -> JetTokens.EQEQ
JetTokens.LT -> JetTokens.GTEQ
JetTokens.GTEQ -> JetTokens.LT
JetTokens.LT -> JetTokens.GTEQ
JetTokens.GTEQ -> JetTokens.LT
JetTokens.GT -> JetTokens.LTEQ
JetTokens.LTEQ -> JetTokens.GT
JetTokens.GT -> JetTokens.LTEQ
JetTokens.LTEQ -> JetTokens.GT
else -> null
}
@@ -89,4 +89,4 @@ public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingOffsetIn
}
)
}
}
}