From b91bb73dd2d19a76f02aa83adb4b6c27d73f08fb Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Fri, 16 Mar 2018 16:09:32 +0100 Subject: [PATCH] inline same param value: ensure literals are escaped --- .../intellij/codeInspection/reference/RefParameterImpl.java | 2 +- .../sameParameterValue/SameParameterValueInspectionBase.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefParameterImpl.java b/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefParameterImpl.java index 1e4d919511a5..9226494e3e23 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefParameterImpl.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefParameterImpl.java @@ -143,7 +143,7 @@ public class RefParameterImpl extends RefJavaElementImpl implements RefParameter return null; } Object constValue = JavaConstantExpressionEvaluator.computeConstantExpression(expression, false); - return constValue == null ? VALUE_IS_NOT_CONST : constValue; + return constValue == null ? VALUE_IS_NOT_CONST : constValue instanceof String ? "\"" + constValue + "\"" : constValue; } @Nullable diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/sameParameterValue/SameParameterValueInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/sameParameterValue/SameParameterValueInspectionBase.java index 5197afcff925..8053ac7a3074 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/sameParameterValue/SameParameterValueInspectionBase.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/sameParameterValue/SameParameterValueInspectionBase.java @@ -247,8 +247,7 @@ public class SameParameterValueInspectionBase extends GlobalJavaBatchInspectionT boolean usedForWriting) { final String name = parameter.getName(); String stringPresentation = value instanceof PsiType ? ((PsiType)value).getPresentableText() + ".class" - : value instanceof String ? "\"" + value + "\"" - : String.valueOf(value); + : String.valueOf(value); return manager.createProblemDescriptor(ObjectUtils.notNull(parameter.getNameIdentifier(), parameter), InspectionsBundle.message("inspection.same.parameter.problem.descriptor", name,