i18n: update bundle for KotlinSuppressableWarningProblemGroup
#KT-37483
This commit is contained in:
@@ -52,11 +52,19 @@ script.0.1=<script {0} {1}>
|
|||||||
module.name.0.test={0} (test)
|
module.name.0.test={0} (test)
|
||||||
platform.module.0.including.1=<Platform module {0} including {1}>
|
platform.module.0.including.1=<Platform module {0} including {1}>
|
||||||
the.following.declarations.have.the.same.jvm.signature.code.0.1.code.br.ul.2.ul=The following declarations have the same JVM signature (<code>{0}{1}</code>):<br/>\n<ul>\n{2}</ul>
|
the.following.declarations.have.the.same.jvm.signature.code.0.1.code.br.ul.2.ul=The following declarations have the same JVM signature (<code>{0}{1}</code>):<br/>\n<ul>\n{2}</ul>
|
||||||
object=object
|
declaration.kind.object=object
|
||||||
companion.object=companion object
|
declaration.kind.companion.object=companion object
|
||||||
initializer=initializer
|
declaration.kind.initializer=initializer
|
||||||
statement=statement
|
declaration.kind.statement=statement
|
||||||
0.of.1={0} of {1}
|
declaration.kind.file=file
|
||||||
|
declaration.name.0.of.1={0} of {1}
|
||||||
|
declaration.kind.secondary.constructor.of=secondary constructor of
|
||||||
|
declaration.kind.enum.entry=enum entry
|
||||||
|
declaration.kind.type.parameter=type parameter
|
||||||
|
declaration.kind.class=class
|
||||||
|
declaration.kind.interface=interface
|
||||||
|
declaration.kind.fun=fun
|
||||||
|
declaration.kind.parameter=parameter
|
||||||
where=where
|
where=where
|
||||||
cannot.be.inferred=cannot be inferred
|
cannot.be.inferred=cannot be inferred
|
||||||
i.for.i.br.0=<i> for </i><br/>{0}
|
i.for.i.br.0=<i> for </i><br/>{0}
|
||||||
|
|||||||
+47
-13
@@ -61,11 +61,19 @@ fun createSuppressWarningActions(element: PsiElement, severity: Severity, suppre
|
|||||||
// Add suppress action at first statement
|
// Add suppress action at first statement
|
||||||
if (current.parent is KtBlockExpression || current.parent is KtDestructuringDeclaration) {
|
if (current.parent is KtBlockExpression || current.parent is KtDestructuringDeclaration) {
|
||||||
val kind = if (current.parent is KtBlockExpression)
|
val kind = if (current.parent is KtBlockExpression)
|
||||||
KotlinIdeaAnalysisBundle.message("statement")
|
KotlinIdeaAnalysisBundle.message("declaration.kind.statement")
|
||||||
else
|
else
|
||||||
KotlinIdeaAnalysisBundle.message("initializer")
|
KotlinIdeaAnalysisBundle.message("declaration.kind.initializer")
|
||||||
actions.add(
|
actions.add(
|
||||||
KotlinSuppressIntentionAction(current, suppressionKey, AnnotationHostKind(kind, "", true))
|
KotlinSuppressIntentionAction(
|
||||||
|
current,
|
||||||
|
suppressionKey,
|
||||||
|
AnnotationHostKind(
|
||||||
|
KotlinIdeaAnalysisBundle.message("declaration.kind.file"),
|
||||||
|
"",
|
||||||
|
true
|
||||||
|
)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
suppressAtStatementAllowed = false
|
suppressAtStatementAllowed = false
|
||||||
}
|
}
|
||||||
@@ -73,7 +81,15 @@ fun createSuppressWarningActions(element: PsiElement, severity: Severity, suppre
|
|||||||
|
|
||||||
current is KtFile -> {
|
current is KtFile -> {
|
||||||
actions.add(
|
actions.add(
|
||||||
KotlinSuppressIntentionAction(current, suppressionKey, AnnotationHostKind("file", current.name, true))
|
KotlinSuppressIntentionAction(
|
||||||
|
current,
|
||||||
|
suppressionKey,
|
||||||
|
AnnotationHostKind(
|
||||||
|
KotlinIdeaAnalysisBundle.message("declaration.kind.file"),
|
||||||
|
current.name,
|
||||||
|
true
|
||||||
|
)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
suppressAtStatementAllowed = false
|
suppressAtStatementAllowed = false
|
||||||
}
|
}
|
||||||
@@ -90,32 +106,50 @@ private object DeclarationKindDetector : KtVisitor<AnnotationHostKind?, Unit?>()
|
|||||||
|
|
||||||
override fun visitDeclaration(d: KtDeclaration, data: Unit?) = null
|
override fun visitDeclaration(d: KtDeclaration, data: Unit?) = null
|
||||||
|
|
||||||
override fun visitClass(d: KtClass, data: Unit?) = detect(d, if (d.isInterface()) "interface" else "class")
|
override fun visitClass(d: KtClass, data: Unit?) = detect(
|
||||||
|
d,
|
||||||
|
if (d.isInterface())
|
||||||
|
KotlinIdeaAnalysisBundle.message("declaration.kind.interface")
|
||||||
|
else
|
||||||
|
KotlinIdeaAnalysisBundle.message("declaration.kind.class")
|
||||||
|
)
|
||||||
|
|
||||||
override fun visitNamedFunction(d: KtNamedFunction, data: Unit?) = detect(d, "fun")
|
override fun visitNamedFunction(d: KtNamedFunction, data: Unit?) = detect(d, KotlinIdeaAnalysisBundle.message("declaration.kind.fun"))
|
||||||
|
|
||||||
override fun visitProperty(d: KtProperty, data: Unit?) = detect(d, d.valOrVarKeyword.text!!)
|
override fun visitProperty(d: KtProperty, data: Unit?) = detect(d, d.valOrVarKeyword.text!!)
|
||||||
|
|
||||||
override fun visitDestructuringDeclaration(d: KtDestructuringDeclaration, data: Unit?) =
|
override fun visitDestructuringDeclaration(d: KtDestructuringDeclaration, data: Unit?) =
|
||||||
detect(d, d.valOrVarKeyword?.text ?: "val", name = d.entries.joinToString(", ", "(", ")") { it.name!! })
|
detect(d, d.valOrVarKeyword?.text ?: "val", name = d.entries.joinToString(", ", "(", ")") { it.name!! })
|
||||||
|
|
||||||
override fun visitTypeParameter(d: KtTypeParameter, data: Unit?) = detect(d, "type parameter", newLineNeeded = false)
|
override fun visitTypeParameter(d: KtTypeParameter, data: Unit?) = detect(
|
||||||
|
d,
|
||||||
|
KotlinIdeaAnalysisBundle.message("declaration.kind.type.parameter"), newLineNeeded = false
|
||||||
|
)
|
||||||
|
|
||||||
override fun visitEnumEntry(d: KtEnumEntry, data: Unit?) = detect(d, "enum entry")
|
override fun visitEnumEntry(d: KtEnumEntry, data: Unit?) = detect(d, KotlinIdeaAnalysisBundle.message("declaration.kind.enum.entry"))
|
||||||
|
|
||||||
override fun visitParameter(d: KtParameter, data: Unit?) = detect(d, "parameter", newLineNeeded = false)
|
override fun visitParameter(d: KtParameter, data: Unit?) = detect(
|
||||||
|
d,
|
||||||
|
KotlinIdeaAnalysisBundle.message("declaration.kind.parameter"),
|
||||||
|
newLineNeeded = false
|
||||||
|
)
|
||||||
|
|
||||||
override fun visitSecondaryConstructor(constructor: KtSecondaryConstructor, data: Unit?) =
|
override fun visitSecondaryConstructor(constructor: KtSecondaryConstructor, data: Unit?) =
|
||||||
detect(constructor, "secondary constructor of")
|
detect(constructor, KotlinIdeaAnalysisBundle.message("declaration.kind.secondary.constructor.of"))
|
||||||
|
|
||||||
override fun visitObjectDeclaration(d: KtObjectDeclaration, data: Unit?): AnnotationHostKind? {
|
override fun visitObjectDeclaration(d: KtObjectDeclaration, data: Unit?): AnnotationHostKind? {
|
||||||
if (d.isCompanion()) return detect(
|
if (d.isCompanion()) return detect(
|
||||||
d,
|
d,
|
||||||
KotlinIdeaAnalysisBundle.message("companion.object"),
|
KotlinIdeaAnalysisBundle.message("declaration.kind.companion.object"),
|
||||||
name = KotlinIdeaAnalysisBundle.message("0.of.1", d.name.toString(), d.getStrictParentOfType<KtClass>()?.name.toString())
|
name = KotlinIdeaAnalysisBundle.message(
|
||||||
|
"declaration.name.0.of.1",
|
||||||
|
d.name.toString(),
|
||||||
|
d.getStrictParentOfType<KtClass>()?.name.toString()
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
if (d.parent is KtObjectLiteralExpression) return null
|
if (d.parent is KtObjectLiteralExpression) return null
|
||||||
return detect(d, KotlinIdeaAnalysisBundle.message("object"))
|
return detect(d, KotlinIdeaAnalysisBundle.message("declaration.kind.object"))
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun detect(
|
private fun detect(
|
||||||
|
|||||||
Reference in New Issue
Block a user