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

Sibling lookup fixed, sorry

Browse Source
This commit is contained in:
Roman Shevchenko
2011-03-09 14:29:18 +01:00
parent 7fc1f11797
commit be8caaaceb
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/psi/impl/SharedPsiElementImplUtil.java
+12 -12
View File
@@ -86,7 +86,12 @@ public class SharedPsiElementImplUtil {
@Nullable
public static PsiElement getNextSibling(PsiElement element) {
PsiElement parent = getElementParent(element);
if (element instanceof PsiFile) {
final FileViewProvider viewProvider = ((PsiFile)element).getViewProvider();
element = viewProvider.getPsi(viewProvider.getBaseLanguage());
}
if (element == null) return null;
final PsiElement parent = element.getParent();
if (parent == null) return null;
final PsiElement[] children = parent.getChildren();
@@ -96,22 +101,17 @@ public class SharedPsiElementImplUtil {
@Nullable
public static PsiElement getPrevSibling(PsiElement element) {
PsiElement parent = getElementParent(element);
if (parent == null) return null;
final PsiElement[] children = parent.getChildren();
final int index = getChildIndex(children, element);
return index > 0 ? children[index - 1] : null;
}
@Nullable
private static PsiElement getElementParent(PsiElement element) {
if (element instanceof PsiFile) {
final FileViewProvider viewProvider = ((PsiFile)element).getViewProvider();
element = viewProvider.getPsi(viewProvider.getBaseLanguage());
}
if (element == null) return null;
return element.getParent();
final PsiElement parent = element.getParent();
if (parent == null) return null;
final PsiElement[] children = parent.getChildren();
final int index = getChildIndex(children, element);
return index > 0 ? children[index - 1] : null;
}
private static int getChildIndex(final PsiElement[] children, final PsiElement child) {