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

IDEA-78720

Browse Source
This commit is contained in:
Alexey Kudravtsev
2011-12-13 14:21:27 +04:00
parent 2573ab7ac6
commit 7d7a5e5a1f
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/psi/impl/smartPointers/SmartPointerEx.java
+1 -3
View File
@@ -18,7 +18,6 @@ package com.intellij.psi.impl.smartPointers;
import com.intellij.openapi.editor.RangeMarker;
import com.intellij.psi.PsiElement;
import com.intellij.psi.SmartPsiElementPointer;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public interface SmartPointerEx<E extends PsiElement> extends SmartPsiElementPointer<E> {
@@ -27,6 +26,5 @@ public interface SmartPointerEx<E extends PsiElement> extends SmartPsiElementPoi
void unfastenBelt(int offset);
@NotNull
SmartPointerElementInfo getElementInfo();
PsiElement getCachedElement();
}
platform/lang-impl/src/com/intellij/psi/impl/smartPointers/SmartPointerManagerImpl.java
+5 -3
View File
@@ -179,9 +179,11 @@ public class SmartPointerManagerImpl extends SmartPointerManager {
private static <E extends PsiElement> SmartPsiElementPointer<E> getCachedPointer(@NotNull E element) {
Reference<SmartPsiElementPointer> data = element.getUserData(CACHED_SMART_POINTER_KEY);
SmartPsiElementPointer cachedPointer = data == null ? null : data.get();
if (cachedPointer instanceof SmartPointerEx
&& ((SmartPointerEx)cachedPointer).getElementInfo().restoreElement() != element) {
return null;
if (cachedPointer instanceof SmartPointerEx) {
PsiElement cachedElement = ((SmartPointerEx)cachedPointer).getCachedElement();
if (cachedElement != null && cachedElement != element) {
return null;
}
}
return cachedPointer;
}
platform/lang-impl/src/com/intellij/psi/impl/smartPointers/SmartPsiElementPointerImpl.java
+1 -2
View File
@@ -106,7 +106,7 @@ class SmartPsiElementPointerImpl<E extends PsiElement> implements SmartPointerEx
myElement = element == null ? null : new SoftReference<E>(element);
}
private E getCachedElement() {
public E getCachedElement() {
Reference<E> ref = myElement;
return ref == null ? null : ref.get();
}
@@ -203,7 +203,6 @@ class SmartPsiElementPointerImpl<E extends PsiElement> implements SmartPointerEx
myElementInfo.fastenBelt(offset, cachedRangeMarker);
}
@Override
@NotNull
public SmartPointerElementInfo getElementInfo() {
return myElementInfo;