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

cleanup

Browse Source
This commit is contained in:
Alexey Kudravtsev
2018-06-03 17:57:58 +03:00
parent 97280a97d5
commit 08632d306a
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiTypeElementImpl.java
+13 -14
View File
@@ -37,15 +37,13 @@ import org.jetbrains.annotations.Nullable;
import java.lang.ref.WeakReference;
import java.util.List;
import static com.intellij.util.containers.ContainerUtil.copyAndClear;
public class PsiTypeElementImpl extends CompositePsiElement implements PsiTypeElement {
@SuppressWarnings({"UnusedDeclaration"})
@SuppressWarnings("UnusedDeclaration")
public PsiTypeElementImpl() {
this(JavaElementType.TYPE);
}
protected PsiTypeElementImpl(IElementType type) {
PsiTypeElementImpl(@NotNull IElementType type) {
super(type);
}
@@ -65,6 +63,7 @@ public class PsiTypeElementImpl extends CompositePsiElement implements PsiTypeEl
return CachedValuesManager.getCachedValue(this, () -> CachedValueProvider.Result.create(calculateType(), PsiModificationTracker.MODIFICATION_COUNT));
}
@NotNull
private PsiType calculateType() {
PsiType inferredType = PsiAugmentProvider.getInferredType(this);
if (inferredType != null) {
@@ -186,9 +185,9 @@ public class PsiTypeElementImpl extends CompositePsiElement implements PsiTypeEl
return null;
}
private static boolean isSelfReferenced(PsiExpression initializer, PsiElement parent) {
private static boolean isSelfReferenced(@NotNull PsiExpression initializer, PsiElement parent) {
class SelfReferenceVisitor extends JavaRecursiveElementVisitor {
private boolean referenced = false;
private boolean referenced;
@Override
public void visitElement(PsiElement element) {
@@ -213,11 +212,11 @@ public class PsiTypeElementImpl extends CompositePsiElement implements PsiTypeEl
@Override
public boolean isInferredType() {
PsiElement firstChild = getFirstChild();
return firstChild != null && PsiUtil.isJavaToken(firstChild, JavaTokenType.VAR_KEYWORD);
return PsiUtil.isJavaToken(firstChild, JavaTokenType.VAR_KEYWORD);
}
@NotNull
private Computable<PsiJavaCodeReferenceElement> getReferenceComputable(PsiJavaCodeReferenceElement ref) {
private Computable<PsiJavaCodeReferenceElement> getReferenceComputable(@NotNull PsiJavaCodeReferenceElement ref) {
final PsiElement parent = getParent();
if (parent instanceof PsiMethod || parent instanceof PsiVariable) {
return computeFromTypeOwner(parent, new WeakReference<>(ref));
@@ -227,7 +226,7 @@ public class PsiTypeElementImpl extends CompositePsiElement implements PsiTypeEl
}
@NotNull
private static Computable<PsiJavaCodeReferenceElement> computeFromTypeOwner(final PsiElement parent, final WeakReference<PsiJavaCodeReferenceElement> ref) {
private static Computable<PsiJavaCodeReferenceElement> computeFromTypeOwner(final PsiElement parent, @NotNull WeakReference<PsiJavaCodeReferenceElement> ref) {
return new Computable<PsiJavaCodeReferenceElement>() {
volatile WeakReference<PsiJavaCodeReferenceElement> myCache = ref;
@@ -249,10 +248,12 @@ public class PsiTypeElementImpl extends CompositePsiElement implements PsiTypeEl
};
}
private static TypeAnnotationProvider createProvider(List<PsiAnnotation> annotations) {
return TypeAnnotationProvider.Static.create(copyAndClear(annotations, PsiAnnotation.ARRAY_FACTORY, true));
@NotNull
private static TypeAnnotationProvider createProvider(@NotNull List<PsiAnnotation> annotations) {
return TypeAnnotationProvider.Static.create(ContainerUtil.copyAndClear(annotations, PsiAnnotation.ARRAY_FACTORY, true));
}
@NotNull
private List<PsiType> collectTypes() {
List<PsiTypeElement> typeElements = PsiTreeUtil.getChildrenOfTypeAsList(this, PsiTypeElement.class);
return ContainerUtil.map(typeElements, typeElement -> typeElement.getType());
@@ -265,9 +266,7 @@ public class PsiTypeElementImpl extends CompositePsiElement implements PsiTypeEl
if (firstChildNode.getElementType() == JavaElementType.TYPE) {
return SourceTreeToPsiMap.<PsiTypeElement>treeToPsiNotNull(firstChildNode).getInnermostComponentReferenceElement();
}
else {
return getReferenceElement();
}
return getReferenceElement();
}
@Nullable
platform/core-impl/src/com/intellij/psi/impl/source/resolve/ResolveCache.java
+9 -9
View File
@@ -49,6 +49,15 @@ public class ResolveCache {
return ServiceManager.getService(project, ResolveCache.class);
}
public ResolveCache(@NotNull MessageBus messageBus) {
messageBus.connect().subscribe(PsiManagerImpl.ANY_PSI_CHANGE_TOPIC, new AnyPsiChangeListener.Adapter() {
@Override
public void beforePsiChanged(boolean isPhysical) {
clearCache(isPhysical);
}
});
}
@FunctionalInterface
public interface AbstractResolver<TRef extends PsiReference, TResult> {
TResult resolve(@NotNull TRef ref, boolean incompleteCode);
@@ -80,15 +89,6 @@ public class ResolveCache {
public interface Resolver extends AbstractResolver<PsiReference, PsiElement> {
}
public ResolveCache(@NotNull MessageBus messageBus) {
messageBus.connect().subscribe(PsiManagerImpl.ANY_PSI_CHANGE_TOPIC, new AnyPsiChangeListener.Adapter() {
@Override
public void beforePsiChanged(boolean isPhysical) {
clearCache(isPhysical);
}
});
}
@NotNull
private static <K,V> Map<K, V> createWeakMap() {
return new ConcurrentWeakKeySoftValueHashMap<K, V>(100, 0.75f, Runtime.getRuntime().availableProcessors(), ContainerUtil.canonicalStrategy()){