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

Suppress warning intention fix: now multi declaration is not a possible intention target but its initializer is, relevant test fixes

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-09-15 16:49:29 +03:00
parent 9feb82c268
commit f1fcb14f44
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt
+5 -4
View File
@@ -54,7 +54,7 @@ fun createSuppressWarningActions(element: PsiElement, diagnosticFactory: Diagnos
var current: PsiElement? = element var current: PsiElement? = element
var suppressAtStatementAllowed = true var suppressAtStatementAllowed = true
while (current != null) { while (current != null) {
if (current is JetDeclaration) { if (current is JetDeclaration && current !is JetMultiDeclaration) {
val declaration = current val declaration = current
val kind = DeclarationKindDetector.detect(declaration) val kind = DeclarationKindDetector.detect(declaration)
if (kind != null) { if (kind != null) {
@@ -64,14 +64,15 @@ fun createSuppressWarningActions(element: PsiElement, diagnosticFactory: Diagnos
} }
else if (current is JetExpression && suppressAtStatementAllowed) { else if (current is JetExpression && suppressAtStatementAllowed) {
// Add suppress action at first statement // Add suppress action at first statement
if (current.getParent() is JetBlockExpression) { if (current.parent is JetBlockExpression || current.parent is JetMultiDeclaration) {
val kind = if (current.parent is JetBlockExpression) "statement" else "initializer"
actions.add(KotlinSuppressIntentionAction(current, diagnosticFactory, actions.add(KotlinSuppressIntentionAction(current, diagnosticFactory,
AnnotationHostKind("statement", "", true))) AnnotationHostKind(kind, "", true)))
suppressAtStatementAllowed = false suppressAtStatementAllowed = false
} }
} }
current = current.getParent() current = current.parent
} }
return actions return actions
} }
idea/testData/quickfix/suppress/declarationKinds/multiVal.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// "Suppress 'REDUNDANT_NULLABLE' for val (a, b)" "true" // "Suppress 'REDUNDANT_NULLABLE' for initializer " "true"
fun foo() { fun foo() {
val (a, b) = Pair<String?<caret>?, String>("", "") val (a, b) = Pair<String?<caret>?, String>("", "")
idea/testData/quickfix/suppress/declarationKinds/multiVal.kt.after
Vendored
+3 -3
View File
@@ -1,8 +1,8 @@
// "Suppress 'REDUNDANT_NULLABLE' for val (a, b)" "true" // "Suppress 'REDUNDANT_NULLABLE' for initializer " "true"
fun foo() { fun foo() {
@Suppress("REDUNDANT_NULLABLE") val (a, b) = @Suppress("REDUNDANT_NULLABLE")
val (a, b) = Pair<String?<caret>?, String>("", "") Pair<String??, String>("", "")
} }
data class Pair<A, B>(val a: A, val b: B) data class Pair<A, B>(val a: A, val b: B)
idea/testData/quickfix/suppress/declarationKinds/multiVar.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// "Suppress 'REDUNDANT_NULLABLE' for var (a, b)" "true" // "Suppress 'REDUNDANT_NULLABLE' for initializer " "true"
fun foo() { fun foo() {
var (a, b) = Pair<String?<caret>?, String>("", "") var (a, b) = Pair<String?<caret>?, String>("", "")
idea/testData/quickfix/suppress/declarationKinds/multiVar.kt.after
Vendored
+3 -3
View File
@@ -1,8 +1,8 @@
// "Suppress 'REDUNDANT_NULLABLE' for var (a, b)" "true" // "Suppress 'REDUNDANT_NULLABLE' for initializer " "true"
fun foo() { fun foo() {
@Suppress("REDUNDANT_NULLABLE") var (a, b) = @Suppress("REDUNDANT_NULLABLE")
var (a, b) = Pair<String?<caret>?, String>("", "") Pair<String??, String>("", "")
} }
data class Pair<A, B>(val a: A, val b: B) data class Pair<A, B>(val a: A, val b: B)