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

paste reference: ignore binding if reference was not created as it could be e.g. groovy method name = invalid java identifier

Browse Source 
EA-89854 - IOE: PsiJavaParserFacadeImpl.createExpressionFromText
This commit is contained in:
Anna.Kozlova
2016-10-17 13:10:49 +02:00
parent 867b295cd7
commit 313b33ec31
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/ide/actions/JavaQualifiedNameProvider.java
+18 -21
View File
@@ -219,30 +219,27 @@ public class JavaQualifiedNameProvider implements QualifiedNameProvider {
final PsiExpression expression;
try {
expression = factory.createExpressionFromText(toInsert + suffix, elementAtCaret);
}
catch (IncorrectOperationException e) {
LOG.error(e);
return;
}
final PsiReferenceExpression referenceExpression = expression instanceof PsiMethodCallExpression
? ((PsiMethodCallExpression)expression).getMethodExpression()
: expression instanceof PsiReferenceExpression
? (PsiReferenceExpression)expression
: null;
if (referenceExpression == null || !referenceExpression.isValid()) {
toInsert = fqn;
}
else if (!isReferencedTo(referenceExpression, targetElement)) {
try {
referenceExpression.bindToElement(targetElement);
}
catch (IncorrectOperationException e) {
// failed to bind
}
if (!referenceExpression.isValid() || !isReferencedTo(referenceExpression, targetElement)) {
final PsiReferenceExpression referenceExpression = expression instanceof PsiMethodCallExpression
? ((PsiMethodCallExpression)expression).getMethodExpression()
: expression instanceof PsiReferenceExpression
? (PsiReferenceExpression)expression
: null;
if (referenceExpression == null || !referenceExpression.isValid()) {
toInsert = fqn;
}
else if (!isReferencedTo(referenceExpression, targetElement)) {
try {
referenceExpression.bindToElement(targetElement);
}
catch (IncorrectOperationException e) {
// failed to bind
}
if (!referenceExpression.isValid() || !isReferencedTo(referenceExpression, targetElement)) {
toInsert = fqn;
}
}
}
catch (IncorrectOperationException ignored) {}
}
if (toInsert == null) toInsert = "";