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

Use new Java parser

Browse Source
This commit is contained in:
Roman Shevchenko
2010-12-20 13:40:36 +03:00
parent f5cf5983f3
commit 7e77623f0a
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/source/PsiAnonymousClassImpl.java
+15 -17
View File
@@ -21,12 +21,10 @@ import com.intellij.psi.impl.PsiClassImplUtil;
import com.intellij.psi.impl.PsiSuperMethodImplUtil;
import com.intellij.psi.impl.java.stubs.JavaStubElementTypes;
import com.intellij.psi.impl.java.stubs.PsiClassStub;
import com.intellij.psi.impl.source.parsing.Parsing;
import com.intellij.psi.impl.source.tree.ChildRole;
import com.intellij.psi.impl.source.tree.FileElement;
import com.intellij.psi.impl.source.tree.SharedImplUtil;
import com.intellij.psi.impl.source.tree.TreeElement;
import com.intellij.psi.scope.PsiScopeProcessor;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.PatchedSoftReference;
import org.jetbrains.annotations.NotNull;
@@ -60,7 +58,10 @@ public class PsiAnonymousClassImpl extends PsiClassImpl implements PsiAnonymousC
@NotNull
public PsiJavaCodeReferenceElement getBaseClassReference() {
return (PsiJavaCodeReferenceElement)getNode().findChildByRoleAsPsiElement(ChildRole.BASE_CLASS_REFERENCE);
final PsiJavaCodeReferenceElement result =
(PsiJavaCodeReferenceElement)getNode().findChildByRoleAsPsiElement(ChildRole.BASE_CLASS_REFERENCE);
assert result != null;
return result;
}
@NotNull
@@ -77,23 +78,20 @@ public class PsiAnonymousClassImpl extends PsiClassImpl implements PsiAnonymousC
if (!isInQualifiedNew()) {
final PsiJavaCodeReferenceElement ref;
String refText = stub.getBaseClassReferenceText();
final DummyHolder holder = DummyHolderFactory
.createHolder(getManager(), calcBasesResolveContext(PsiNameHelper.getShortClassName(refText), getExtendsList()));
final FileElement holderElement = holder.getTreeElement();
final String refText = stub.getBaseClassReferenceText();
assert refText != null : stub;
final PsiElementFactory factory = JavaPsiFacade.getInstance(getProject()).getElementFactory();
ref = (PsiJavaCodeReferenceElementImpl)Parsing.parseJavaCodeReferenceText(getManager(), refText,
holderElement.getCharTable());
if (ref == null) {
final PsiElement context = calcBasesResolveContext(PsiNameHelper.getShortClassName(refText), getExtendsList());
try {
ref = factory.createReferenceFromText(refText, context);
((PsiJavaCodeReferenceElementImpl)ref).setKindWhenDummy(PsiJavaCodeReferenceElementImpl.CLASS_NAME_KIND);
type = factory.createType(ref);
}
catch (IncorrectOperationException e) {
type = PsiClassType.getJavaLangObject(getManager(), getResolveScope());
myCachedBaseType = new PatchedSoftReference<PsiClassType>(type);
return type;
}
holderElement.rawAddChildren((TreeElement)ref);
((PsiJavaCodeReferenceElementImpl)ref).setKindWhenDummy(PsiJavaCodeReferenceElementImpl.CLASS_NAME_KIND);
type = JavaPsiFacade.getInstance(getProject()).getElementFactory().createType(ref);
myCachedBaseType = new PatchedSoftReference<PsiClassType>(type);
return type;
}
java/java-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java
+6 -2
View File
@@ -76,13 +76,17 @@ public class PsiJavaCodeReferenceElementImpl extends CompositePsiElement impleme
}
public void setKindWhenDummy(final int kind) {
LOG.assertTrue(getTreeParent().getElementType() == TokenType.DUMMY_HOLDER);
LOG.assertTrue(isDummy(getTreeParent().getElementType()));
myKindWhenDummy = kind;
}
private static boolean isDummy(final IElementType type) {
return type == TokenType.DUMMY_HOLDER || type == JavaElementType.DUMMY_ELEMENT;
}
public int getKind() {
IElementType i = getTreeParent().getElementType();
if (i == TokenType.DUMMY_HOLDER) {
if (isDummy(i)) {
return myKindWhenDummy;
}
if (i == JavaElementType.TYPE) {