MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[jvm-inspections] IDEA-310343 Patterns as arguments for logging. Fix names

Browse Source 
GitOrigin-RevId: 694653eaad58d932594427354999edd297a6713a
This commit is contained in:
Mikhail Pyltsin
2023-02-03 00:32:27 +00:00
committed by intellij-monorepo-bot
parent cb42438bcd
commit 838311cfdb
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jvm/jvm-analysis-impl/src/com/intellij/codeInspection/logging/LoggingStringTemplateAsArgumentInspection.kt
+10 -10
View File
@@ -167,11 +167,11 @@ private class ConvertToPlaceHolderQuickfix(private val indexStringExpression: In
override fun getFamilyName(): String = JvmAnalysisBundle.message("jvm.inspection.logging.string.template.as.argument.quickfix.name")
override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
val uCallExpression = descriptor.psiElement.getUastParentOfType<UCallExpression>() ?: return
val (parametersBeforeString: MutableList<UExpression>, parametersAfterString: MutableList<UExpression>, builderString) =
val (parametersBeforeString: MutableList<UExpression>, parametersAfterString: MutableList<UExpression>, textPattern) =
createMethodContext(uCallExpression)
val elementFactory = uCallExpression.getUastElementFactory(project) ?: return
val newText = elementFactory.createStringLiteralExpression(builderString.toString(), uCallExpression.sourcePsi) ?: return
val newText = elementFactory.createStringLiteralExpression(textPattern.toString(), uCallExpression.sourcePsi) ?: return
val newParameters = mutableListOf<UExpression>().apply {
addAll(parametersBeforeString)
add(newText)
@@ -193,7 +193,7 @@ private class ConvertToPlaceHolderQuickfix(private val indexStringExpression: In
if (indexStringExpression == 1) {
parametersBeforeString.add(valueArguments[0])
}
val builderString = StringBuilder()
val textPattern = StringBuilder()
val stringTemplate = valueArguments[indexStringExpression]
var indexOuterPlaceholder = indexStringExpression + 1
if (stringTemplate is UPolyadicExpression) {
@@ -213,20 +213,20 @@ private class ConvertToPlaceHolderQuickfix(private val indexStringExpression: In
}
}
indexOuterPlaceholder += countPlaceHolders
builderString.append(text)
textPattern.append(text)
}
else {
if (builderString.endsWith("\\") &&
if (textPattern.endsWith("\\") &&
(loggerType == Companion.LoggerType.SLF4J_LOGGER_TYPE || loggerType == Companion.LoggerType.SLF4J_BUILDER_TYPE)) {
builderString.append("\\")
textPattern.append("\\")
}
builderString.append("{}")
textPattern.append("{}")
parametersAfterString.add(operand)
}
}
}
else {
builderString.append("{}")
textPattern.append("{}")
parametersAfterString.add(stringTemplate)
}
@@ -235,10 +235,10 @@ private class ConvertToPlaceHolderQuickfix(private val indexStringExpression: In
parametersAfterString.add(valueArguments[index])
}
}
return MethodContext(parametersBeforeString, parametersAfterString, builderString)
return MethodContext(parametersBeforeString, parametersAfterString, textPattern)
}
data class MethodContext(val parametersBeforeString: MutableList<UExpression>,
val parametersAfterString: MutableList<UExpression>,
val builderString: StringBuilder)
val textPattern: StringBuilder)
}