Fix multi module tests for AddOperatorModifierInspection
This commit is contained in:
@@ -10,7 +10,6 @@ import com.intellij.openapi.project.Project
|
|||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
|
import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
|
||||||
import org.jetbrains.kotlin.idea.refactoring.withExpectedActuals
|
import org.jetbrains.kotlin.idea.refactoring.withExpectedActuals
|
||||||
import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
|
|
||||||
import org.jetbrains.kotlin.lexer.KtTokens
|
import org.jetbrains.kotlin.lexer.KtTokens
|
||||||
import org.jetbrains.kotlin.psi.KtNamedFunction
|
import org.jetbrains.kotlin.psi.KtNamedFunction
|
||||||
import org.jetbrains.kotlin.psi.psiUtil.startOffset
|
import org.jetbrains.kotlin.psi.psiUtil.startOffset
|
||||||
@@ -23,8 +22,6 @@ class AddOperatorModifierInspection : AbstractApplicabilityBasedInspection<KtNam
|
|||||||
|
|
||||||
override val defaultFixText = "Add 'operator' modifier"
|
override val defaultFixText = "Add 'operator' modifier"
|
||||||
|
|
||||||
override val startFixInWriteAction: Boolean = false
|
|
||||||
|
|
||||||
override fun isApplicable(element: KtNamedFunction): Boolean {
|
override fun isApplicable(element: KtNamedFunction): Boolean {
|
||||||
if (element.nameIdentifier == null || element.hasModifier(KtTokens.OPERATOR_KEYWORD)) return false
|
if (element.nameIdentifier == null || element.hasModifier(KtTokens.OPERATOR_KEYWORD)) return false
|
||||||
val functionDescriptor = element.resolveToDescriptorIfAny() ?: return false
|
val functionDescriptor = element.resolveToDescriptorIfAny() ?: return false
|
||||||
@@ -32,9 +29,8 @@ class AddOperatorModifierInspection : AbstractApplicabilityBasedInspection<KtNam
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun applyTo(element: PsiElement, project: Project, editor: Editor?) {
|
override fun applyTo(element: PsiElement, project: Project, editor: Editor?) {
|
||||||
val declarations = (element as KtNamedFunction).withExpectedActuals()
|
for (declaration in (element as KtNamedFunction).withExpectedActuals()) {
|
||||||
project.executeWriteCommand(defaultFixText) {
|
declaration.addModifier(KtTokens.OPERATOR_KEYWORD)
|
||||||
for (declaration in declarations) declaration.addModifier(KtTokens.OPERATOR_KEYWORD)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
@@ -1,4 +1,5 @@
|
|||||||
// "Add 'operator' modifier" "true"
|
// "Add 'operator' modifier" "true"
|
||||||
|
// TOOL: org.jetbrains.kotlin.idea.inspections.AddOperatorModifierInspection
|
||||||
|
|
||||||
actual class Foo {
|
actual class Foo {
|
||||||
actual fun <caret>unaryMinus() {
|
actual fun <caret>unaryMinus() {
|
||||||
+1
@@ -1,4 +1,5 @@
|
|||||||
// "Add 'operator' modifier" "true"
|
// "Add 'operator' modifier" "true"
|
||||||
|
// TOOL: org.jetbrains.kotlin.idea.inspections.AddOperatorModifierInspection
|
||||||
|
|
||||||
actual class Foo {
|
actual class Foo {
|
||||||
actual operator fun unaryMinus() {
|
actual operator fun unaryMinus() {
|
||||||
+1
@@ -1,4 +1,5 @@
|
|||||||
// "Add 'operator' modifier" "true"
|
// "Add 'operator' modifier" "true"
|
||||||
|
// TOOL: org.jetbrains.kotlin.idea.inspections.AddOperatorModifierInspection
|
||||||
|
|
||||||
expect class Foo {
|
expect class Foo {
|
||||||
fun <caret>unaryMinus()
|
fun <caret>unaryMinus()
|
||||||
+1
@@ -1,4 +1,5 @@
|
|||||||
// "Add 'operator' modifier" "true"
|
// "Add 'operator' modifier" "true"
|
||||||
|
// TOOL: org.jetbrains.kotlin.idea.inspections.AddOperatorModifierInspection
|
||||||
|
|
||||||
expect class Foo {
|
expect class Foo {
|
||||||
operator fun unaryMinus()
|
operator fun unaryMinus()
|
||||||
+6
-6
@@ -70,14 +70,14 @@ public class QuickFixMultiModuleTestGenerated extends AbstractQuickFixMultiModul
|
|||||||
runTest("idea/testData/multiModuleQuickFix/addFunctionToCommonClassFromJavaUsage/");
|
runTest("idea/testData/multiModuleQuickFix/addFunctionToCommonClassFromJavaUsage/");
|
||||||
}
|
}
|
||||||
|
|
||||||
@TestMetadata("addOperatorByHeader")
|
@TestMetadata("addOperatorByActual")
|
||||||
public void testAddOperatorByHeader() throws Exception {
|
public void testAddOperatorByActual() throws Exception {
|
||||||
runTest("idea/testData/multiModuleQuickFix/addOperatorByHeader/");
|
runTest("idea/testData/multiModuleQuickFix/addOperatorByActual/");
|
||||||
}
|
}
|
||||||
|
|
||||||
@TestMetadata("addOperatorByImpl")
|
@TestMetadata("addOperatorByExpect")
|
||||||
public void testAddOperatorByImpl() throws Exception {
|
public void testAddOperatorByExpect() throws Exception {
|
||||||
runTest("idea/testData/multiModuleQuickFix/addOperatorByImpl/");
|
runTest("idea/testData/multiModuleQuickFix/addOperatorByExpect/");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testAllFilesPresentInMultiModuleQuickFix() throws Exception {
|
public void testAllFilesPresentInMultiModuleQuickFix() throws Exception {
|
||||||
|
|||||||
Reference in New Issue
Block a user