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

[groovy] simplify Groovy<->Java mapping of anonymous classes

Browse Source
This commit is contained in:
Daniil Ovchinnikov
2016-05-23 19:04:55 +03:00
parent 6ee3023109
commit 680ab49a2e
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrAnonymousClassDefinitionImpl.java
+3 -16
View File
@@ -17,10 +17,8 @@
package org.jetbrains.plugins.groovy.lang.psi.impl.statements.typedef;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.scope.PsiScopeProcessor;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.reference.SoftReference;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -97,16 +95,7 @@ public class GrAnonymousClassDefinitionImpl extends GrTypeDefinitionImpl impleme
@Override
@NotNull
public PsiJavaCodeReferenceElement getBaseClassReference() {
final GrCodeReferenceElement ref = getBaseClassReferenceGroovy();
final PsiElement element = ref.resolve();
final Project project = getProject();
if (element instanceof PsiClass) {
final GrClassReferenceType type = new GrClassReferenceType(ref);
return JavaPsiFacade.getElementFactory(project).createReferenceElementByType(type);
}
String qName = ref.getReferenceName(); //not null
assert qName != null;
return JavaPsiFacade.getElementFactory(project).createReferenceElementByFQClassName(qName, GlobalSearchScope.allScope(project));
return JavaPsiFacade.getElementFactory(getProject()).createReferenceElementByType(getBaseClassType());
}
@Override
@@ -132,14 +121,12 @@ public class GrAnonymousClassDefinitionImpl extends GrTypeDefinitionImpl impleme
@NotNull
private PsiClassType createClassType() {
return JavaPsiFacade.getInstance(getProject()).getElementFactory().createType(getBaseClassReference());
return new GrClassReferenceType(getBaseClassReferenceGroovy());
}
@Nullable
private PsiClass getBaseClass() {
final PsiElement element = getBaseClassReferenceGroovy().resolve();
if (element instanceof PsiClass) return (PsiClass)element;
return null;
return getBaseClassType().resolve();
}
@NotNull