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

mad testing completion: a more elaborate check for declaration place, that covers java modules

Browse Source
This commit is contained in:
peter
2019-02-05 20:23:01 +01:00
parent ba6f8d6477
commit 56cd109ab0
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/testFramework/src/com/intellij/testFramework/propertyBased/CompletionPolicy.java
+12 -3
View File
@@ -104,9 +104,18 @@ public class CompletionPolicy {
PsiElement target = TargetElementUtil.findTargetElement(editor, TargetElementUtil.ELEMENT_NAME_ACCEPTED | TargetElementUtil.REFERENCED_ELEMENT_ACCEPTED);
if (target != null) target = target.getNavigationElement();
PsiFile targetFile = target != null ? target.getContainingFile() : null;
return targetFile != null && targetFile.getViewProvider() == file.getViewProvider() &&
(target.getTextOffset() == leaf.getTextRange().getStartOffset() ||
ref != null && target.getTextOffset() == ref.getElement().getTextRange().getStartOffset() + ref.getRangeInElement().getStartOffset());
if (targetFile == null || targetFile.getViewProvider() != file.getViewProvider()) {
return false;
}
if (target.getTextOffset() == leaf.getTextRange().getStartOffset() ||
ref != null && target.getTextOffset() == ref.getElement().getTextRange().getStartOffset() + ref.getRangeInElement().getStartOffset()) {
return true;
}
if (target instanceof PsiNameIdentifierOwner) {
PsiElement nameIdentifier = ((PsiNameIdentifierOwner)target).getNameIdentifier();
if (nameIdentifier != null && PsiTreeUtil.isAncestor(nameIdentifier, leaf, false)) return true;
}
return false;
}
protected boolean shouldSuggestNonReferenceLeafText(@NotNull PsiElement leaf) {