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

restore java reflection completion in string literals: don't let properties override it

Browse Source
This commit is contained in:
peter
2014-06-12 17:59:48 +02:00
parent 0766961917
commit fcd5c1f1bf
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaReflectionCompletionTest.java
+1
View File
@@ -64,6 +64,7 @@ public class JavaReflectionCompletionTest extends LightFixtureCompletionTestCase
}
public void testGenerics() throws Exception {
myFixture.addFileToProject("a.properties", "foo=bar"); // check that property variants don't override reflection ones
doTest(0, "foo");
}
plugins/properties/src/com/intellij/lang/properties/references/PropertiesCompletionContributor.java
+16 -13
View File
@@ -30,9 +30,11 @@ import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiReference;
import com.intellij.util.*;
import com.intellij.util.ArrayUtil;
import com.intellij.util.NullableFunction;
import com.intellij.util.PlatformIcons;
import com.intellij.util.ProcessingContext;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.FilteringIterator;
import org.jetbrains.annotations.NotNull;
import java.util.Arrays;
@@ -55,12 +57,11 @@ public class PropertiesCompletionContributor extends CompletionContributor {
});
}
private static final Condition<PsiReference> PROPERTY_REFERENCE = FilteringIterator.instanceOf(PropertyReference.class);
private void doAdd(CompletionParameters parameters, final CompletionResultSet result) {
private static void doAdd(CompletionParameters parameters, final CompletionResultSet result) {
PsiElement position = parameters.getPosition();
PsiReference[] references = ArrayUtil.mergeArrays(position.getReferences(), position.getParent().getReferences());
PropertyReference propertyReference = (PropertyReference)ContainerUtil.find(references, PROPERTY_REFERENCE);
if (propertyReference != null) {
PropertyReference propertyReference = ContainerUtil.findInstance(references, PropertyReference.class);
if (propertyReference != null && !hasMoreImportantReference(references, propertyReference)) {
final int startOffset = parameters.getOffset();
PsiElement element = propertyReference.getElement();
final int offsetInElement = startOffset - element.getTextRange().getStartOffset();
@@ -73,13 +74,15 @@ public class PropertiesCompletionContributor extends CompletionContributor {
result.stopHere();
}
}
//if (parameters.isExtendedCompletion()) {
// CompletionService.getCompletionService().getVariantsFromContributors(parameters.delegateToClassName(), null, new Consumer<CompletionResult>() {
// public void consume(final CompletionResult completionResult) {
// result.passResult(completionResult);
// }
// });
//}
}
private static boolean hasMoreImportantReference(PsiReference[] references, PropertyReference propertyReference) {
return propertyReference.isSoft() && ContainerUtil.or(references, new Condition<PsiReference>() {
@Override
public boolean value(PsiReference reference) {
return !reference.isSoft();
}
});
}
public static final LookupElementRenderer<LookupElement> LOOKUP_ELEMENT_RENDERER = new LookupElementRenderer<LookupElement>() {