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

workaround for FlexCompletionTest.testBindingCompletion() (the actual problem is somewhere in injected<->host offset remapping in CompletionUtilCoreImpl.getOriginalElement())

Browse Source
This commit is contained in:
Dmitry Jemerov
2013-07-11 19:15:16 +02:00
parent 7e625e47cb
commit d1e2ded1ba
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java
+19
View File
@@ -455,4 +455,23 @@ public class PsiUtilCore {
throw new PsiInvalidElementAccessException(element);
}
}
/**
* @deprecated use CompletionUtil#getOriginalElement where appropriate instead
*/
@Nullable
public static <T extends PsiElement> T getOriginalElement(@NotNull T psiElement, final Class<? extends T> elementClass) {
final PsiFile psiFile = psiElement.getContainingFile();
final PsiFile originalFile = psiFile.getOriginalFile();
if (originalFile == psiFile) return psiElement;
final TextRange range = psiElement.getTextRange();
final PsiElement element = originalFile.findElementAt(range.getStartOffset());
final int maxLength = range.getLength();
T parent = PsiTreeUtil.getParentOfType(element, elementClass, false);
for (T next = parent ;
next != null && next.getTextLength() <= maxLength;
parent = next, next = PsiTreeUtil.getParentOfType(next, elementClass, true)) {
}
return parent;
}
}
platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java
-19
View File
@@ -116,25 +116,6 @@ public class PsiUtilBase extends PsiUtilCore {
return host != null && isUnderPsiRoot(root, host);
}
/**
* @deprecated use CompletionUtil#getOriginalElement where appropriate instead
*/
@Nullable
public static <T extends PsiElement> T getOriginalElement(@NotNull T psiElement, final Class<? extends T> elementClass) {
final PsiFile psiFile = psiElement.getContainingFile();
final PsiFile originalFile = psiFile.getOriginalFile();
if (originalFile == psiFile) return psiElement;
final TextRange range = psiElement.getTextRange();
final PsiElement element = originalFile.findElementAt(range.getStartOffset());
final int maxLength = range.getLength();
T parent = PsiTreeUtil.getParentOfType(element, elementClass, false);
for (T next = parent ;
next != null && next.getTextLength() <= maxLength;
parent = next, next = PsiTreeUtil.getParentOfType(next, elementClass, true)) {
}
return parent;
}
@Nullable
public static Language getLanguageInEditor(@NotNull final Editor editor, @NotNull final Project project) {
PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument());