Skip to content

Commit 6038c58

Browse files
Select module import
+ feature no longer requires preview flag! + update tests 23 -> 25 Fixes eclipse-jdt#4371
1 parent 8c02407 commit 6038c58

3 files changed

Lines changed: 6 additions & 8 deletions

File tree

org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AllJavaModelTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ private static Class[] getAllTestClasses() {
116116
ResolveTests10.class,
117117
ResolveTests12To15.class,
118118
ResolveTests21.class,
119-
ResolveTests23.class,
119+
ResolveTests25.class,
120120
SelectionJavadocModelTests.class,
121121

122122
// Some test suite above breaks completion tests below

org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ResolveTests23.java renamed to org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ResolveTests25.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@
1919
import org.eclipse.core.runtime.CoreException;
2020
import org.eclipse.jdt.core.ICompilationUnit;
2121
import org.eclipse.jdt.core.IJavaElement;
22-
import org.eclipse.jdt.core.JavaCore;
2322
import org.eclipse.jdt.core.JavaModelException;
2423
import org.eclipse.jdt.core.WorkingCopyOwner;
2524

26-
public class ResolveTests23 extends AbstractJavaModelTests {
25+
public class ResolveTests25 extends AbstractJavaModelTests {
2726
ICompilationUnit wc = null;
2827

2928
static {
@@ -32,9 +31,9 @@ public class ResolveTests23 extends AbstractJavaModelTests {
3231
// TESTS_RANGE = new int[] { 16, -1 };
3332
}
3433
public static Test suite() {
35-
return buildModelTestSuite(ResolveTests23.class);
34+
return buildModelTestSuite(ResolveTests25.class);
3635
}
37-
public ResolveTests23(String name) {
36+
public ResolveTests25(String name) {
3837
super(name);
3938
}
4039
@Override
@@ -44,8 +43,7 @@ public ICompilationUnit getWorkingCopy(String path, String source) throws JavaMo
4443
@Override
4544
public void setUpSuite() throws Exception {
4645
super.setUpSuite();
47-
this.currentProject = setUpJavaProject("Resolve", "23", false);
48-
this.currentProject.setOption(JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES, JavaCore.ENABLED);
46+
this.currentProject = setUpJavaProject("Resolve", "25", false);
4947
waitUntilIndexesReady();
5048
}
5149
@Override

org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/SelectionEngine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,7 @@ public void select(
953953
if (importReference instanceof SelectionOnImportReference) {
954954
char[][] tokens = ((SelectionOnImportReference) importReference).tokens;
955955
this.noProposal = false;
956-
if ((importReference.modifiers & ClassFileConstants.AccModule) != 0 && this.compilerOptions.enablePreviewFeatures) {
956+
if ((importReference.modifiers & ClassFileConstants.AccModule) != 0) {
957957
this.nameEnvironment.findModules(CharOperation.concatWithAll(tokens, '.'), this, null);
958958
return;
959959
}

0 commit comments

Comments
 (0)