MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 13:02:30 +07:00
Code Issues Packages Projects Releases Wiki Activity

replace inaccessible field with getter/setter (IDEA-22752)

Browse Source
This commit is contained in:
anna
2011-09-01 15:54:01 +02:00
parent fa6a4cdece
commit a8172fdc67
12 changed files with 246 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
View File

@@ -47,11 +47,9 @@ import com.intellij.psi.scope.processor.VariablesNotProcessor;
import com.intellij.psi.scope.util.PsiScopesUtil;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.*;
import com.intellij.refactoring.util.RefactoringUIUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Function;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.VisibilityUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.xml.util.XmlStringUtil;
import gnu.trove.THashMap;
@@ -246,6 +244,13 @@ public class HighlightUtil {
PsiJavaCodeReferenceElement place,
HighlightInfo errorResult,
final PsiElement fileResolveScope) {
PsiClass accessObjectClass = null;
PsiElement qualifier = place.getQualifier();
if (qualifier instanceof PsiExpression) {
accessObjectClass = (PsiClass)PsiUtil.getAccessObjectClass((PsiExpression)qualifier).getElement();
}
ReplaceInaccessibleFieldWithGetterSetterFix.registerQuickFix(refElement, place, accessObjectClass, errorResult);
if (refElement instanceof PsiCompiledElement) return;
PsiModifierList modifierList = refElement.getModifierList();
if (modifierList == null) return;
@@ -271,11 +276,6 @@ public class HighlightUtil {
minModifier = PsiModifier.PUBLIC;
}
String[] modifiers = {PsiModifier.PACKAGE_LOCAL, PsiModifier.PROTECTED, PsiModifier.PUBLIC,};
PsiClass accessObjectClass = null;
PsiElement qualifier = place.getQualifier();
if (qualifier instanceof PsiExpression) {
accessObjectClass = (PsiClass)PsiUtil.getAccessObjectClass((PsiExpression)qualifier).getElement();
}
for (int i = ArrayUtil.indexOf(modifiers, minModifier); i < modifiers.length; i++) {
@Modifier String modifier = modifiers[i];
modifierListCopy.setModifierProperty(modifier, true);

108
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceInaccessibleFieldWithGetterSetterFix.java Normal file
View File

@@ -0,0 +1,108 @@
/*
* Copyright 2000-2011 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.impl.quickfix;
import com.intellij.codeInsight.daemon.impl.HighlightInfo;
import com.intellij.codeInspection.LocalQuickFixAndIntentionActionOnPsiElement;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.util.PropertyUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class ReplaceInaccessibleFieldWithGetterSetterFix extends LocalQuickFixAndIntentionActionOnPsiElement {
private final String myMethodName;
private final boolean myIsSetter;
protected ReplaceInaccessibleFieldWithGetterSetterFix(@Nullable PsiElement element, PsiMethod getter, boolean isSetter) {
super(element);
myMethodName = getter.getName();
myIsSetter = isSetter;
}
@Override
public void invoke(@NotNull Project project,
@NotNull PsiFile file,
@Nullable("is null when called from inspection") Editor editor,
@NotNull PsiElement startElement,
@NotNull PsiElement endElement) {
PsiReferenceExpression place = (PsiReferenceExpression)startElement;
String qualifier = null;
final PsiExpression qualifierExpression = place.getQualifierExpression();
if (qualifierExpression != null) {
qualifier = qualifierExpression.getText();
}
PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(project);
PsiMethodCallExpression callExpression;
final String call = (qualifier != null ? qualifier + "." : "") + myMethodName;
if (!myIsSetter) {
callExpression = (PsiMethodCallExpression)elementFactory.createExpressionFromText(call + "()", null);
callExpression = (PsiMethodCallExpression)CodeStyleManager.getInstance(project).reformat(callExpression);
place.replace(callExpression);
} else {
PsiElement parent = PsiTreeUtil.skipParentsOfType(place, PsiParenthesizedExpression.class);
if (parent instanceof PsiAssignmentExpression) {
final PsiExpression rExpression = ((PsiAssignmentExpression)parent).getRExpression();
final String argList = rExpression != null ? rExpression.getText() : "";
callExpression = (PsiMethodCallExpression)elementFactory.createExpressionFromText(call + "(" + argList + ")", null);
callExpression = (PsiMethodCallExpression)CodeStyleManager.getInstance(project).reformat(callExpression);
parent.replace(callExpression);
}
}
}
@NotNull
@Override
public String getText() {
return myIsSetter ? "Replace with setter" : "Replace with getter";
}
@NotNull
@Override
public String getFamilyName() {
return "Replace with getter/setter";
}
public static void registerQuickFix(PsiMember refElement,
PsiJavaCodeReferenceElement place,
PsiClass accessObjectClass,
HighlightInfo error) {
if (refElement instanceof PsiField && place instanceof PsiReferenceExpression) {
final PsiField psiField = (PsiField)refElement;
final PsiClass containingClass = psiField.getContainingClass();
if (containingClass != null) {
if (PsiUtil.isOnAssignmentLeftHand((PsiExpression)place)) {
final PsiMethod setterPrototype = PropertyUtil.generateSetterPrototype(psiField);
final PsiMethod setter = containingClass.findMethodBySignature(setterPrototype, true);
if (setter != null && PsiUtil.isAccessible(setter, place, accessObjectClass)) {
QuickFixAction.registerQuickFixAction(error, new ReplaceInaccessibleFieldWithGetterSetterFix(place, setter, true));
}
}
else if (PsiUtil.isAccessedForReading((PsiExpression)place)) {
final PsiMethod getterPrototype = PropertyUtil.generateGetterPrototype(psiField);
final PsiMethod getter = containingClass.findMethodBySignature(getterPrototype, true);
if (getter != null && PsiUtil.isAccessible(getter, place, accessObjectClass)) {
QuickFixAction.registerQuickFixAction(error, new ReplaceInaccessibleFieldWithGetterSetterFix(place, getter, false));
}
}
}
}
}
}

14
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceFieldWithGetterSetter/after3.java Normal file
View File

@@ -0,0 +1,14 @@
// "Replace with getter" "true"
class Test {
private int i;
public int getI() {
return i;
}
}
class Foo {
void foo(Test t) {
System.out.println(t.getI());
}
}

14
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceFieldWithGetterSetter/after5.java Normal file
View File

@@ -0,0 +1,14 @@
// "Replace with setter" "true"
class Test {
private int i;
public void setI(int i) {
this.i = i;
}
}
class Foo {
void foo(Test t) {
t.setI(0);
}
}

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceFieldWithGetterSetter/after6.java Normal file
View File

@@ -0,0 +1,8 @@
// "Replace with getter" "true"
import java.io.File;
class Foo {
void foo(File f) {
String ss = f.getPath();
}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceFieldWithGetterSetter/before1.java Normal file
View File

@@ -0,0 +1,10 @@
// "Replace with getter" "false"
class Test {
private int i;
}
class Foo {
void foo(Test t) {
System.out.println(t.<caret>i);
}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceFieldWithGetterSetter/before2.java Normal file
View File

@@ -0,0 +1,10 @@
// "Replace with setter" "false"
class Test {
private int i;
}
class Foo {
void foo(Test t) {
System.out.println(t.<caret>i);
}
}

14
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceFieldWithGetterSetter/before3.java Normal file
View File

@@ -0,0 +1,14 @@
// "Replace with getter" "true"
class Test {
private int i;
public int getI() {
return i;
}
}
class Foo {
void foo(Test t) {
System.out.println(t.<caret>i);
}
}

14
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceFieldWithGetterSetter/before4.java Normal file
View File

@@ -0,0 +1,14 @@
// "Replace with getter" "false"
class Test {
private int i;
public int getI() {
return i;
}
}
class Foo {
void foo(Test t) {
t.<caret>i = 0;
}
}

14
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceFieldWithGetterSetter/before5.java Normal file
View File

@@ -0,0 +1,14 @@
// "Replace with setter" "true"
class Test {
private int i;
public void setI(int i) {
this.i = i;
}
}
class Foo {
void foo(Test t) {
t.<caret>i = 0;
}
}

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceFieldWithGetterSetter/before6.java Normal file
View File

@@ -0,0 +1,8 @@
// "Replace with getter" "true"
import java.io.File;
class Foo {
void foo(File f) {
String ss = f.<caret>path;
}
}

25
java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceInaccessibleFieldWithGetterSetterFixTest.java Normal file
View File

@@ -0,0 +1,25 @@
/*
* Copyright 2000-2011 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;
public class ReplaceInaccessibleFieldWithGetterSetterFixTest extends LightQuickFixTestCase {
public void test() throws Exception { doAllTests(); }
@Override
protected String getBasePath() {
return "/codeInsight/daemonCodeAnalyzer/quickFix/replaceFieldWithGetterSetter";
}
}