allow to replace strings with non-final static 'constants' (IDEA-119480)

This commit is contained in:
Anna Kozlova
2014-04-10 14:03:05 +02:00
parent 69f8d95193
commit 52951cfbfe
4 changed files with 59 additions and 1 deletions

View File

@@ -0,0 +1,10 @@
// "Replace with 'A.RADIUS'" "true"
class A {
public static String RADIUS = "radius";
public void myMethod(String propertyName) {
if (RADIUS.equals(propertyName)) {
}
}
}

View File

@@ -0,0 +1,10 @@
// "Replace with 'A.RADIUS'" "true"
class A {
public static String RADIUS = "radius";
public void myMethod(String propertyName) {
if ("rad<caret>ius".equals(propertyName)) {
}
}
}

View File

@@ -0,0 +1,38 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.codeInsight.daemon.quickFix;
import com.intellij.codeInspection.LocalInspectionTool;
import com.intellij.codeInspection.duplicateStringLiteral.DuplicateStringLiteralInspection;
import org.jetbrains.annotations.NotNull;
public class ReplaceWithConstantFixTest extends LightQuickFixParameterizedTestCase {
@NotNull
@Override
protected LocalInspectionTool[] configureLocalInspectionTools() {
return new LocalInspectionTool[]{new DuplicateStringLiteralInspection()};
}
public void test() throws Exception {
doAllTests();
}
@Override
protected String getBasePath() {
return "/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithConstant";
}
}

View File

@@ -222,7 +222,7 @@ public class DuplicateStringLiteralInspection extends BaseLocalInspectionTool {
PsiElement parent = expression1.getParent();
if (parent instanceof PsiField) {
final PsiField field = (PsiField)parent;
if (field.getInitializer() == expression1 && field.hasModifierProperty(PsiModifier.FINAL) && field.hasModifierProperty(PsiModifier.STATIC)) {
if (field.getInitializer() == expression1 && field.hasModifierProperty(PsiModifier.STATIC)) {
constants.add(field);
iterator.remove();
}