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

more IDEA-CR-1432

Browse Source
This commit is contained in:
Dennis Ushakov
2015-02-19 16:49:44 +03:00
parent 278ba23829
commit 6675461b1a
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/smartPointers/JavaAnchorProvider.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class JavaAnchorProvider extends SmartPointerAnchorProvider {
@Nullable
@Override
public PsiElement getElement(@NotNull PsiElement anchor) {
public PsiElement restoreElement(@NotNull PsiElement anchor) {
if (anchor instanceof PsiIdentifier) {
PsiElement parent = anchor.getParent();
if (parent instanceof PsiJavaCodeReferenceElement) { // anonymous class, type
platform/core-impl/src/com/intellij/psi/impl/smartPointers/AnchorElementInfo.java
+1 -1
View File
@@ -73,7 +73,7 @@ class AnchorElementInfo extends SelfElementInfo {
if (range.getStartOffset() != getSyncStartOffset() || range.getEndOffset() != getSyncEndOffset()) return null;
for (SmartPointerAnchorProvider provider : SmartPointerAnchorProvider.EP_NAME.getExtensions()) {
final PsiElement element = provider.getElement(anchor);
final PsiElement element = provider.restoreElement(anchor);
if (element != null) return element;
}
return null;
platform/core-impl/src/com/intellij/psi/impl/smartPointers/AnchorElementInfoFactory.java
+1 -2
View File
@@ -58,9 +58,8 @@ public class AnchorElementInfoFactory implements SmartPointerElementInfoFactory
PsiElement anchor = null;
for (SmartPointerAnchorProvider provider : SmartPointerAnchorProvider.EP_NAME.getExtensions()) {
anchor = provider.getAnchor(element);
if (anchor != null) break;
if (anchor != null && anchor.isPhysical()) return anchor;
}
if (anchor != null && (!anchor.isPhysical() /*|| anchor.getTextRange()==null*/)) return null;
return anchor;
}
}
platform/core-impl/src/com/intellij/psi/impl/smartPointers/SmartPointerAnchorProvider.java
+4 -2
View File
@@ -29,8 +29,10 @@ public abstract class SmartPointerAnchorProvider {
public static final ExtensionPointName<SmartPointerAnchorProvider> EP_NAME = ExtensionPointName.create("com.intellij.smartPointer.anchorProvider");
/**
* Provides anchor used for restoring elements after stub-to-AST switch.
* One can use name identifier (such as tag or method name) as an anchor
* @param element
* @return anchor to be used when restoring element after stub-to-AST switch
* @return anchor to be used when restoring element
*/
@Nullable
public abstract PsiElement getAnchor(@NotNull PsiElement element);
@@ -40,5 +42,5 @@ public abstract class SmartPointerAnchorProvider {
* @return restored original element using anchor
*/
@Nullable
public abstract PsiElement getElement(@NotNull PsiElement anchor);
public abstract PsiElement restoreElement(@NotNull PsiElement anchor);
}
xml/impl/src/com/intellij/psi/impl/smartPointers/XmlAnchorProvider.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class XmlAnchorProvider extends SmartPointerAnchorProvider {
@Nullable
@Override
public PsiElement getElement(@NotNull PsiElement anchor) {
public PsiElement restoreElement(@NotNull PsiElement anchor) {
if (anchor instanceof XmlToken) {
XmlToken token = (XmlToken)anchor;
return token.getTokenType() == XmlTokenType.XML_NAME ? token.getParent() : null;