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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Maxim.Mossienko
2011-06-23 13:07:18 +04:00
parent 44213cdfca cdd77c8de7
commit 54f2fe2d18
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java
+2 -2
View File
@@ -543,6 +543,7 @@ public class PsiJavaCodeReferenceElementImpl extends CompositePsiElement impleme
private PsiElement bindToClass(final PsiClass aClass) throws IncorrectOperationException {
String qName = aClass.getQualifiedName();
final boolean preserveQualification = CodeStyleSettingsManager.getSettings(getProject()).USE_FQ_CLASS_NAMES && isFullyQualified();
final JavaPsiFacade facade = JavaPsiFacade.getInstance(getProject());
if (qName == null) {
qName = aClass.getName();
@@ -552,12 +553,11 @@ public class PsiJavaCodeReferenceElementImpl extends CompositePsiElement impleme
}
}
else {
if (facade.findClass(qName, getResolveScope()) == null) {
if (facade.findClass(qName, getResolveScope()) == null && !preserveQualification) {
return this;
}
}
final boolean preserveQualification = CodeStyleSettingsManager.getSettings(getProject()).USE_FQ_CLASS_NAMES && isFullyQualified();
final PsiReferenceParameterList parameterList = getParameterList();
String text = parameterList == null ? qName : qName + parameterList.getText();
PsiJavaCodeReferenceElement ref = facade.getParserFacade().createReferenceFromText(text, getParent());
java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
+2 -2
View File
@@ -484,14 +484,14 @@ public class PsiReferenceExpressionImpl extends ExpressionPsiElement implements
final PsiManager manager = getManager();
final PsiJavaParserFacade parserFacade = JavaPsiFacade.getInstance(getProject()).getParserFacade();
if (element instanceof PsiClass) {
final boolean preserveQualification = CodeStyleSettingsManager.getSettings(getProject()).USE_FQ_CLASS_NAMES && isFullyQualified(this);
String qName = ((PsiClass)element).getQualifiedName();
if (qName == null) {
qName = ((PsiClass)element).getName();
}
else if (JavaPsiFacade.getInstance(manager.getProject()).findClass(qName, getResolveScope()) == null) {
else if (JavaPsiFacade.getInstance(manager.getProject()).findClass(qName, getResolveScope()) == null && !preserveQualification) {
return this;
}
final boolean preserveQualification = CodeStyleSettingsManager.getSettings(getProject()).USE_FQ_CLASS_NAMES && isFullyQualified(this);
PsiExpression ref = parserFacade.createExpressionFromText(qName, this);
getTreeParent().replaceChildInternal(this, (TreeElement)ref.getNode());
final JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(manager.getProject());