Fixed bug 483895: [content assist] Disable and remove substring
completion from Preferences
Change-Id: Ief6ce10b3dd1cd483f99161b0f92daed88678ccf
Signed-off-by: Noopur Gupta <noopur_gupta@in.ibm.com>
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RunCompletionModelTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RunCompletionModelTests.java
index 65954de..90cc04b 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RunCompletionModelTests.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RunCompletionModelTests.java
@@ -38,7 +38,7 @@
COMPLETION_SUITES.add(CompletionWithMissingTypesTests2.class);
COMPLETION_SUITES.add(CompletionWithMissingTypesTests_1_5.class);
COMPLETION_SUITES.add(SnippetCompletionContextTests.class);
- COMPLETION_SUITES.add(SubstringCompletionTests.class);
+// COMPLETION_SUITES.add(SubstringCompletionTests.class);
}
COMPLETION_SUITES.add(JavadocTypeCompletionModelTest.class);
COMPLETION_SUITES.add(JavadocFieldCompletionModelTest.class);
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistOptions.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistOptions.java
index 8c6d3d3..00191b1 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistOptions.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistOptions.java
@@ -66,7 +66,7 @@
public boolean checkDiscouragedReference = false;
public boolean forceImplicitQualification = false;
public boolean camelCaseMatch = true;
- public boolean substringMatch = true;
+ public boolean substringMatch = /*true*/false;
public boolean suggestStaticImport = true;
public char[][] fieldPrefixes = null;
public char[][] staticFieldPrefixes = null;
@@ -234,11 +234,12 @@
}
}
if ((optionValue = optionsMap.get(OPTION_SubstringMatch)) != null) {
- if (ENABLED.equals(optionValue)) {
+ /*if (ENABLED.equals(optionValue)) {
this.substringMatch = true;
} else if (DISABLED.equals(optionValue)) {
this.substringMatch = false;
- }
+ }*/
+ this.substringMatch = false;
}
if ((optionValue = optionsMap.get(OPTION_PerformDeprecationCheck)) != null) {
if (ENABLED.equals(optionValue)) {
