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

DirectiveBasedActionUtils: don't allow to specify ACTION directives that won't be checked anyway

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-06-15 20:19:38 +03:00
parent c0062b1199
commit eadeb6e63f
11 changed files with 7 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/DirectiveBasedActionUtils.kt
+7 -2
View File
@@ -45,19 +45,24 @@ public object DirectiveBasedActionUtils {
public fun checkAvailableActionsAreExpected(file: JetFile, availableActions: Collection<IntentionAction>) { public fun checkAvailableActionsAreExpected(file: JetFile, availableActions: Collection<IntentionAction>) {
val expectedActions = InTextDirectivesUtils.findLinesWithPrefixesRemoved(file.getText(), "// ACTION:").sort() val expectedActions = InTextDirectivesUtils.findLinesWithPrefixesRemoved(file.getText(), "// ACTION:").sort()
UsefulTestCase.assertEmpty("Irrelevant actions should not be specified in ACTION directive for they are not checked anyway",
expectedActions.filter { isIrrelevantAction(it) })
val actualActions = availableActions.map { it.getText() }.sort() val actualActions = availableActions.map { it.getText() }.sort()
UsefulTestCase.assertOrderedEquals("Some unexpected actions available at current position. Use // ACTION: directive", UsefulTestCase.assertOrderedEquals("Some unexpected actions available at current position. Use // ACTION: directive",
filterOutIrrelevantActions(actualActions), filterOutIrrelevantActions(actualActions),
filterOutIrrelevantActions(expectedActions)) expectedActions)
} }
//TODO: hack, implemented because irrelevant actions behave in different ways on build server and locally //TODO: hack, implemented because irrelevant actions behave in different ways on build server and locally
// this behaviour should be investigated and hack can be removed // this behaviour should be investigated and hack can be removed
private fun filterOutIrrelevantActions(actions: Collection<String>): Collection<String> { private fun filterOutIrrelevantActions(actions: Collection<String>): Collection<String> {
return actions.filter { action -> IRRELEVANT_ACTION_PREFIXES.none { action.startsWith(it) } } return actions.filter { !isIrrelevantAction(it) }
} }
private fun isIrrelevantAction(action: String) = IRRELEVANT_ACTION_PREFIXES.any { action.startsWith(it) }
private val IRRELEVANT_ACTION_PREFIXES = listOf( private val IRRELEVANT_ACTION_PREFIXES = listOf(
"Disable ", "Disable ",
"Edit intention settings", "Edit intention settings",
idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt
Vendored
-2
View File
@@ -1,9 +1,7 @@
// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false" // "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
// ERROR: Unresolved reference: SomeTest // ERROR: Unresolved reference: SomeTest
// ACTION: Create class 'SomeTest' // ACTION: Create class 'SomeTest'
// ACTION: Edit intention settings
// ACTION: Replace safe access expression with 'if' expression // ACTION: Replace safe access expression with 'if' expression
// ACTION: Disable 'Replace Safe Access Expression with 'if' Expression'
package testing package testing
idea/testData/quickfix/createFromUsage/createVariable/property/localValNoReceiver.kt
Vendored
-2
View File
@@ -1,7 +1,5 @@
// "Create property 'foo'" "false" // "Create property 'foo'" "false"
// ACTION: Convert to expression body // ACTION: Convert to expression body
// ACTION: Disable 'Convert to Expression Body'
// ACTION: Edit intention settings
// ACTION: Create parameter 'foo' // ACTION: Create parameter 'foo'
// ACTION: Create local variable 'foo' // ACTION: Create local variable 'foo'
// ERROR: Unresolved reference: foo // ERROR: Unresolved reference: foo
idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaInterface.before.Main.kt
Vendored
-2
View File
@@ -1,7 +1,5 @@
// "Create property 'foo'" "false" // "Create property 'foo'" "false"
// ACTION: Convert to expression body // ACTION: Convert to expression body
// ACTION: Disable 'Convert to Expression Body'
// ACTION: Edit intention settings
// ACTION: Create extension property 'foo' // ACTION: Create extension property 'foo'
// ERROR: Unresolved reference: foo // ERROR: Unresolved reference: foo
idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeMultipleOverriddenPropertiesTypes.kt
Vendored
-2
View File
@@ -1,7 +1,5 @@
// "Change 'A.x' type to '(Int) -> Int'" "false" // "Change 'A.x' type to '(Int) -> Int'" "false"
// ACTION: Change 'C.x' type to '(String) -> Int' // ACTION: Change 'C.x' type to '(String) -> Int'
// ACTION: Disable inspection
// ACTION: Edit inspection profile setting
// ERROR: <html>Return type is '(kotlin.Int) &rarr; kotlin.Int', which is not a subtype of overridden<br/><b>internal</b> <b>abstract</b> <b>val</b> x: (kotlin.String) &rarr; kotlin.Int <i>defined in</i> A</html> // ERROR: <html>Return type is '(kotlin.Int) &rarr; kotlin.Int', which is not a subtype of overridden<br/><b>internal</b> <b>abstract</b> <b>val</b> x: (kotlin.String) &rarr; kotlin.Int <i>defined in</i> A</html>
interface A { interface A {
val x: (String) -> Int val x: (String) -> Int
idea/testData/quickfix/typeAddition/publicFunWithoutBody.kt
Vendored
-6
View File
@@ -3,12 +3,6 @@
// ACTION: Add function body // ACTION: Add function body
// ACTION: Make 'foo' abstract // ACTION: Make 'foo' abstract
// ACTION: Convert member to extension // ACTION: Convert member to extension
// ACTION: Disable 'Convert to extension'
// ACTION: Disable inspection
// ACTION: Disable inspection
// ACTION: Edit inspection profile setting
// ACTION: Edit inspection profile setting
// ACTION: Edit intention settings
package a package a
idea/testData/quickfix/typeMismatch/dontChangeOverriddenPropertyTypeToErrorType.kt
Vendored
-2
View File
@@ -1,7 +1,5 @@
// "Change 'B.x' type to '(String) -> [ERROR : Ay]'" "false" // "Change 'B.x' type to '(String) -> [ERROR : Ay]'" "false"
// ACTION: Change 'A.x' type to '(Int) -> Int' // ACTION: Change 'A.x' type to '(Int) -> Int'
// ACTION: Disable inspection
// ACTION: Edit inspection profile setting
// ERROR: <html>Return type is '(kotlin.Int) &rarr; kotlin.Int', which is not a subtype of overridden<br/><b>internal</b> <b>abstract</b> <b>val</b> x: (kotlin.String) &rarr; [ERROR : Ay] <i>defined in</i> A</html> // ERROR: <html>Return type is '(kotlin.Int) &rarr; kotlin.Int', which is not a subtype of overridden<br/><b>internal</b> <b>abstract</b> <b>val</b> x: (kotlin.String) &rarr; [ERROR : Ay] <i>defined in</i> A</html>
// ERROR: Unresolved reference: Ay // ERROR: Unresolved reference: Ay
interface A { interface A {
idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType4.kt
Vendored
-2
View File
@@ -1,7 +1,5 @@
// "Change parameter 'z' type of function 'foo' to '(Int) -> String'" "false" // "Change parameter 'z' type of function 'foo' to '(Int) -> String'" "false"
// ACTION: Edit intention settings
fun foo(y: Int = 0, z: (Int) -> String = {""}) { fun foo(y: Int = 0, z: (Int) -> String = {""}) {
foo { foo {
""<caret> as Int ""<caret> as Int
idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt
Vendored
-2
View File
@@ -1,6 +1,4 @@
// "Change 'foo' function return type to '([ERROR : NoSuchType]) -> Int'" "false" // "Change 'foo' function return type to '([ERROR : NoSuchType]) -> Int'" "false"
// ACTION: Disable 'Make Types Implicit In Lambda (May Break Code)'
// ACTION: Edit intention settings
// ACTION: Create annotation 'NoSuchType' // ACTION: Create annotation 'NoSuchType'
// ACTION: Create class 'NoSuchType' // ACTION: Create class 'NoSuchType'
// ACTION: Create enum 'NoSuchType' // ACTION: Create enum 'NoSuchType'
idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverride.kt
Vendored
-2
View File
@@ -1,8 +1,6 @@
// "Change 'AA.f' function return type to 'Boolean'" "false" // "Change 'AA.f' function return type to 'Boolean'" "false"
// ACTION: Change 'AAA.g' function return type to 'Int' // ACTION: Change 'AAA.g' function return type to 'Int'
// ACTION: Convert to expression body // ACTION: Convert to expression body
// ACTION: Disable 'Convert to Expression Body'
// ACTION: Edit intention settings
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Boolean</td></tr><tr><td>Found:</td><td>kotlin.Int</td></tr></table></html> // ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Boolean</td></tr><tr><td>Found:</td><td>kotlin.Int</td></tr></table></html>
interface A { interface A {
fun f(): Int fun f(): Int
idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverrideForOperatorConvention.kt
Vendored
-4
View File
@@ -1,10 +1,6 @@
// "Change 'AA.contains' function return type to 'Int'" "false" // "Change 'AA.contains' function return type to 'Int'" "false"
// ACTION: Change 'AAA.g' function return type to 'Boolean' // ACTION: Change 'AAA.g' function return type to 'Boolean'
// ACTION: Convert to expression body // ACTION: Convert to expression body
// ACTION: Disable 'Convert to Expression Body'
// ACTION: Disable 'Replace Overloaded Operator With Function Call'
// ACTION: Edit intention settings
// ACTION: Edit intention settings
// ACTION: Replace overloaded operator with function call // ACTION: Replace overloaded operator with function call
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Int</td></tr><tr><td>Found:</td><td>kotlin.Boolean</td></tr></table></html> // ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Int</td></tr><tr><td>Found:</td><td>kotlin.Boolean</td></tr></table></html>
interface A { interface A {