MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 21:11:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

language level 16, remove language level 14_preview (IDEA-257409)

Browse Source 
GitOrigin-RevId: 1f9626ba04ffd9588b0cf9b8a9f699faa613359b
This commit is contained in:
Anna Kozlova
2020-12-14 19:48:51 +01:00
committed by intellij-monorepo-bot
parent cb72e8a50c
commit fd17a8bb75
149 changed files with 247 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
View File

@@ -1021,7 +1021,7 @@ public final class GenericsHighlightUtil {
}
}
if (superMethod == null) {
if (languageLevel != LanguageLevel.JDK_14_PREVIEW && JavaPsiRecordUtil.getRecordComponentForAccessor(method) != null) {
if (JavaPsiRecordUtil.getRecordComponentForAccessor(method) != null) {
return null;
}
String description = JavaErrorBundle.message("method.does.not.override.super");

5
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java
View File

@@ -240,7 +240,7 @@ public final class HighlightControlFlowUtil {
PsiMethod canonicalConstructor = JavaPsiRecordUtil.findCanonicalConstructor(aClass);
if (canonicalConstructor == null || canonicalConstructor instanceof LightRecordCanonicalConstructor) return null;
boolean isCompact = JavaPsiRecordUtil.isCompactConstructor(canonicalConstructor);
if (isCompact && PsiUtil.getLanguageLevel(aClass) != LanguageLevel.JDK_14_PREVIEW) return null;
if (isCompact) return null;
PsiCodeBlock body = canonicalConstructor.getBody();
if (body == null) return null;
PsiField field = JavaPsiRecordUtil.getFieldForComponent(component);
@@ -650,8 +650,7 @@ public final class HighlightControlFlowUtil {
final PsiMember enclosingCtrOrInitializer = PsiUtil.findEnclosingConstructorOrInitializer(expression);
return enclosingCtrOrInitializer != null &&
!(enclosingCtrOrInitializer instanceof PsiMethod &&
JavaPsiRecordUtil.isCompactConstructor((PsiMethod)enclosingCtrOrInitializer) &&
PsiUtil.getLanguageLevel(enclosingCtrOrInitializer) != LanguageLevel.JDK_14_PREVIEW) &&
JavaPsiRecordUtil.isCompactConstructor((PsiMethod)enclosingCtrOrInitializer)) &&
isSameField(enclosingCtrOrInitializer, field, reference, containingFile);
}
if (variable instanceof PsiLocalVariable) {

2
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java
View File

@@ -2040,7 +2040,7 @@ public final class HighlightMethodUtil {
QuickFixAction.registerQuickFixAction(info, QUICK_FIX_FACTORY.createDeleteFix(typeParameterList.getTypeParameters()));
return info;
}
if (method.isConstructor() && PsiUtil.getLanguageLevel(method) != LanguageLevel.JDK_14_PREVIEW) {
if (method.isConstructor()) {
AccessModifier modifier = AccessModifier.fromModifierList(method.getModifierList());
PsiModifierList classModifierList = Objects.requireNonNull(method.getContainingClass()).getModifierList();
if (classModifierList != null) {

2
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
View File

@@ -1122,7 +1122,7 @@ public class HighlightVisitorImpl extends JavaElementVisitor implements Highligh
public void visitRecordComponent(PsiRecordComponent recordComponent) {
super.visitRecordComponent(recordComponent);
if (!myHolder.hasErrorResults()) myHolder.add(HighlightUtil.checkRecordComponentVarArg(recordComponent));
if (!myHolder.hasErrorResults() && myLanguageLevel != LanguageLevel.JDK_14_PREVIEW) {
if (!myHolder.hasErrorResults()) {
myHolder.add(HighlightUtil.checkRecordComponentCStyleDeclaration(recordComponent));
}
if (!myHolder.hasErrorResults()) myHolder.add(HighlightUtil.checkRecordComponentName(recordComponent));

40
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightingFeature.java
View File

@@ -36,33 +36,53 @@ public enum HighlightingFeature {
VAR_LAMBDA_PARAMETER(LanguageLevel.JDK_11, "feature.var.lambda.parameter"),
ENHANCED_SWITCH(LanguageLevel.JDK_14, "feature.enhanced.switch"),
SWITCH_EXPRESSION(LanguageLevel.JDK_14, "feature.switch.expressions"),
RECORDS(LanguageLevel.JDK_14_PREVIEW, "feature.records"),
PATTERNS(LanguageLevel.JDK_14_PREVIEW, "feature.patterns.instanceof"),
TEXT_BLOCK_ESCAPES(LanguageLevel.JDK_14_PREVIEW, "feature.text.block.escape.sequences") {
RECORDS(LanguageLevel.JDK_15_PREVIEW, "feature.records") {
@Override
boolean isSufficient(@NotNull LanguageLevel useSiteLevel) {
return useSiteLevel.isAtLeast(LanguageLevel.JDK_14_PREVIEW);
return useSiteLevel.isAtLeast(LanguageLevel.JDK_15_PREVIEW);
}
@Override
LanguageLevel getStandardLevel() {
return LanguageLevel.JDK_15;
return LanguageLevel.JDK_16;
}
},
TEXT_BLOCKS(LanguageLevel.JDK_14_PREVIEW, "feature.text.blocks") {
PATTERNS(LanguageLevel.JDK_15_PREVIEW, "feature.patterns.instanceof"){
@Override
boolean isSufficient(@NotNull LanguageLevel useSiteLevel) {
return useSiteLevel.isAtLeast(LanguageLevel.JDK_14_PREVIEW);
return useSiteLevel.isAtLeast(LanguageLevel.JDK_15_PREVIEW);
}
@Override
LanguageLevel getStandardLevel() {
return LanguageLevel.JDK_15;
return LanguageLevel.JDK_16;
}
},
TEXT_BLOCK_ESCAPES(LanguageLevel.JDK_15, "feature.text.block.escape.sequences"),
TEXT_BLOCKS(LanguageLevel.JDK_15, "feature.text.blocks") ,
SEALED_CLASSES(LanguageLevel.JDK_15_PREVIEW, "feature.sealed.classes"),
LOCAL_INTERFACES(LanguageLevel.JDK_15_PREVIEW, "feature.local.interfaces"),
LOCAL_ENUMS(LanguageLevel.JDK_15_PREVIEW, "feature.local.enums");
LOCAL_INTERFACES(LanguageLevel.JDK_15_PREVIEW, "feature.local.interfaces"){
@Override
boolean isSufficient(@NotNull LanguageLevel useSiteLevel) {
return useSiteLevel.isAtLeast(LanguageLevel.JDK_15_PREVIEW);
}
@Override
LanguageLevel getStandardLevel() {
return LanguageLevel.JDK_16;
}
},
LOCAL_ENUMS(LanguageLevel.JDK_15_PREVIEW, "feature.local.enums"){
@Override
boolean isSufficient(@NotNull LanguageLevel useSiteLevel) {
return useSiteLevel.isAtLeast(LanguageLevel.JDK_15_PREVIEW);
}
@Override
LanguageLevel getStandardLevel() {
return LanguageLevel.JDK_16;
}
};
public static final @NonNls String JDK_INTERNAL_PREVIEW_FEATURE = "jdk.internal.PreviewFeature";

4
java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java
View File

@@ -15,7 +15,6 @@ import com.intellij.openapi.editor.ScrollType;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.*;
import com.intellij.psi.impl.light.LightTypeElement;
@@ -778,8 +777,7 @@ public final class GenerateMembersUtil {
if (superMethod != null && superMethod.getContainingClass() != targetClass && PsiUtil.isAccessible(superMethod, targetClass, null)) {
OverrideImplementUtil.annotateOnOverrideImplement(generated, targetClass, superMethod, true);
}
if (JavaPsiRecordUtil.getRecordComponentForAccessor(generated) != null &&
PsiUtil.getLanguageLevel(targetClass) != LanguageLevel.JDK_14_PREVIEW) {
if (JavaPsiRecordUtil.getRecordComponentForAccessor(generated) != null) {
AddAnnotationPsiFix
.addPhysicalAnnotationIfAbsent(CommonClassNames.JAVA_LANG_OVERRIDE, PsiNameValuePair.EMPTY_ARRAY, generated.getModifierList());
}

11
java/java-impl/src/com/intellij/codeInsight/generation/RecordConstructorMember.java
View File

@@ -2,17 +2,14 @@
package com.intellij.codeInsight.generation;
import com.intellij.codeInsight.AnnotationTargetUtil;
import com.intellij.codeInsight.daemon.JavaErrorBundle;
import com.intellij.java.JavaBundle;
import com.intellij.openapi.project.Project;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.codeStyle.JavaCodeStyleSettings;
import com.intellij.psi.util.AccessModifier;
import com.intellij.psi.util.PsiFormatUtil;
import com.intellij.psi.util.PsiFormatUtilBase;
import com.intellij.psi.util.PsiUtil;
import com.intellij.ui.SimpleColoredComponent;
import one.util.streamex.StreamEx;
import org.jetbrains.annotations.NotNull;
@@ -53,11 +50,9 @@ public class RecordConstructorMember implements ClassMember {
public PsiMethod generateRecordConstructor() {
String constructor;
AccessModifier accessModifier = AccessModifier.PUBLIC;
if (PsiUtil.getLanguageLevel(myRecord) != LanguageLevel.JDK_14_PREVIEW) {
PsiModifierList list = myRecord.getModifierList();
if (list != null) {
accessModifier = AccessModifier.fromModifierList(list);
}
PsiModifierList list = myRecord.getModifierList();
if (list != null) {
accessModifier = AccessModifier.fromModifierList(list);
}
if (myCompact) {
constructor = myRecord.getName() + "{\n}";

3
java/java-impl/src/com/intellij/codeInspection/RedundantRecordConstructorInspection.java
View File

@@ -8,7 +8,6 @@ import com.intellij.codeInsight.daemon.impl.quickfix.DeleteElementFix;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.java.JavaBundle;
import com.intellij.openapi.project.Project;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.*;
import com.intellij.psi.util.JavaElementKind;
import com.intellij.psi.util.JavaPsiRecordUtil;
@@ -110,7 +109,7 @@ public class RedundantRecordConstructorInspection extends AbstractBaseJavaLocalI
return new RemoveRedundantCtorSimplifier();
}
if (PsiUtil.findReturnStatements(body).length > 0) return null;
if (PsiUtil.getLanguageLevel(ctor) != LanguageLevel.JDK_14_PREVIEW && assignedCount != components.length) {
if (assignedCount != components.length) {
return null;
}
return new MakeCtorCompactSimplifier();

2
java/java-impl/src/com/intellij/codeInspection/classCanBeRecord/RecordBuilder.java
View File

@@ -83,7 +83,7 @@ class RecordBuilder {
PsiClass build() {
PsiJavaFile psiFile = (PsiJavaFile)PsiFileFactory.getInstance(myOriginClass.getProject())
.createFileFromText("Dummy.java", JavaLanguage.INSTANCE, myRecordText.toString(), false, false);
PsiUtil.FILE_LANGUAGE_LEVEL_KEY.set(psiFile, LanguageLevel.JDK_14_PREVIEW);
PsiUtil.FILE_LANGUAGE_LEVEL_KEY.set(psiFile, LanguageLevel.JDK_15_PREVIEW);
PsiClass psiRecord = psiFile.getClasses()[0];
CodeStyleManager.getInstance(myOriginClass.getProject()).reformat(psiRecord);
return psiRecord;

2
java/java-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java
View File

@@ -75,8 +75,6 @@ public class Java15APIUsageInspection extends AbstractBaseJavaLocalInspectionToo
ourPresentableShortMessage.put(LanguageLevel.JDK_12, "13");
ourPresentableShortMessage.put(LanguageLevel.JDK_13, "14");
ourPresentableShortMessage.put(LanguageLevel.JDK_14, "15");
ourPresentableShortMessage.put(LanguageLevel.JDK_14_PREVIEW, "15nopreview");
}
private static final Set<String> ourGenerifiedClasses = new HashSet<>();

60
java/java-impl/src/com/intellij/codeInspection/java15api/api15nopreview.txt
View File

@@ -1,60 +0,0 @@
com.sun.source.tree.ClassTree#getPermitsClause()
com.sun.source.util.DocTrees#getType(com.sun.source.util.DocTreePath;)
java.lang.Boolean#describeConstable()
java.lang.Byte#describeConstable()
java.lang.Character#describeConstable()
java.lang.Character.UnicodeBlock#CHORASMIAN
java.lang.Character.UnicodeBlock#CJK_UNIFIED_IDEOGRAPHS_EXTENSION_G
java.lang.Character.UnicodeBlock#DIVES_AKURU
java.lang.Character.UnicodeBlock#KHITAN_SMALL_SCRIPT
java.lang.Character.UnicodeBlock#LISU_SUPPLEMENT
java.lang.Character.UnicodeBlock#SYMBOLS_FOR_LEGACY_COMPUTING
java.lang.Character.UnicodeBlock#TANGUT_SUPPLEMENT
java.lang.Character.UnicodeBlock#YEZIDI
java.lang.Character.UnicodeScript#CHORASMIAN
java.lang.Character.UnicodeScript#DIVES_AKURU
java.lang.Character.UnicodeScript#KHITAN_SMALL_SCRIPT
java.lang.Character.UnicodeScript#YEZIDI
java.lang.CharSequence#isEmpty()
java.lang.Class#isHidden()
java.lang.Class#isSealed()
java.lang.Class#permittedSubclasses()
java.lang.constant.ConstantDescs#BSM_EXPLICIT_CAST
java.lang.constant.ConstantDescs#BSM_GET_STATIC_FINAL
java.lang.constant.ConstantDescs#FALSE
java.lang.constant.ConstantDescs#TRUE
java.lang.invoke.ConstantBootstraps#explicitCast(java.lang.invoke.MethodHandles.Lookup;java.lang.String;java.lang.Class<?>;java.lang.Object;)
java.lang.invoke.MethodHandles#classData(java.lang.invoke.MethodHandles.Lookup;java.lang.String;java.lang.Class<T>;)
java.lang.invoke.MethodHandles.Lookup.ClassOption
java.lang.invoke.MethodHandles.Lookup#defineHiddenClass(byte[];boolean;java.lang.invoke.MethodHandles.Lookup.ClassOption[];)
java.lang.invoke.MethodHandles.Lookup#defineHiddenClassWithClassData(byte[];java.lang.Object;java.lang.invoke.MethodHandles.Lookup.ClassOption[];)
java.lang.invoke.MethodHandles.Lookup#ensureInitialized(java.lang.Class<?>;)
java.lang.Math#absExact(int;)
java.lang.Math#absExact(long;)
java.lang.Short#describeConstable()
java.lang.StrictMath#absExact(int;)
java.lang.StrictMath#absExact(long;)
java.nio.channels.ServerSocketChannel#open(java.net.ProtocolFamily;)
java.nio.channels.SocketChannel#open(java.net.ProtocolFamily;)
java.nio.channels.spi.SelectorProvider#openServerSocketChannel(java.net.ProtocolFamily;)
java.nio.channels.spi.SelectorProvider#openSocketChannel(java.net.ProtocolFamily;)
java.nio.CharBuffer#isEmpty()
java.security.interfaces.EdECKey
java.security.interfaces.EdECPrivateKey
java.security.interfaces.EdECPublicKey
java.security.spec.EdDSAParameterSpec
java.security.spec.EdECPoint
java.security.spec.EdECPrivateKeySpec
java.security.spec.EdECPublicKeySpec
java.security.spec.NamedParameterSpec#ED25519
java.security.spec.NamedParameterSpec#ED448
java.text.DecimalFormatSymbols#getMonetaryGroupingSeparator()
java.text.DecimalFormatSymbols#monetaryGroupingSeparator
java.text.DecimalFormatSymbols#setMonetaryGroupingSeparator(char;)
java.util.NoSuchElementException#NoSuchElementException(java.lang.String;java.lang.Throwable;)
java.util.NoSuchElementException#NoSuchElementException(java.lang.Throwable;)
javax.lang.model.element.Modifier#NON_SEALED
javax.lang.model.element.Modifier#SEALED
javax.lang.model.element.TypeElement#getPermittedSubclasses()
javax.lang.model.SourceVersion#RELEASE_15
jdk.net.ExtendedSocketOptions#SO_INCOMING_NAPI_ID

3
java/java-impl/src/com/intellij/ide/fileTemplates/JavaCreateFromTemplateHandler.java
View File

@@ -15,7 +15,6 @@
*/
package com.intellij.ide.fileTemplates;
import com.intellij.application.options.CodeStyle;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.java.JavaBundle;
import com.intellij.lang.java.JavaLanguage;
@@ -45,7 +44,7 @@ public class JavaCreateFromTemplateHandler implements CreateFromTemplateHandler
if (extension == null) extension = JavaFileType.INSTANCE.getDefaultExtension();
final String name = "myClass" + "." + extension;
final PsiFile psiFile = PsiFileFactory.getInstance(project).createFileFromText(name, JavaLanguage.INSTANCE, content, false, false);
psiFile.putUserData(PsiUtil.FILE_LANGUAGE_LEVEL_KEY, LanguageLevel.JDK_14_PREVIEW);
psiFile.putUserData(PsiUtil.FILE_LANGUAGE_LEVEL_KEY, LanguageLevel.JDK_15_PREVIEW);
if (!(psiFile instanceof PsiJavaFile)){
throw new IncorrectOperationException("This template did not produce a Java class or an interface\n"+psiFile.getText());

2
java/java-psi-api/resources/messages/JavaPsiBundle.properties
View File

@@ -116,6 +116,8 @@ jdk.14.language.level.description=14 - Switch expressions
jdk.14.preview.language.level.description=14 (Preview) - Records, patterns, text blocks
jdk.15.language.level.description=15 - Text blocks
jdk.15.preview.language.level.description=15 (Preview) - Sealed types, records, patterns, local enums and interfaces
jdk.16.language.level.description=16 - Records, patterns, local enums and interfaces
jdk.16.preview.language.level.description=16 (Preview) - Sealed types
jdk.X.language.level.description=X - Experimental features
local.class.preposition=local

3
java/java-psi-api/src/com/intellij/openapi/projectRoots/JavaSdkVersion.java
View File

@@ -30,7 +30,8 @@ public enum JavaSdkVersion {
JDK_13(LanguageLevel.JDK_13),
JDK_14(LanguageLevel.JDK_14),
JDK_15(LanguageLevel.JDK_15),
JDK_16(LanguageLevel.JDK_X);
JDK_16(LanguageLevel.JDK_16),
JDK_17(LanguageLevel.JDK_X);
private final LanguageLevel myMaxLanguageLevel;

5
java/java-psi-api/src/com/intellij/pom/java/LanguageLevel.java
View File

@@ -36,11 +36,12 @@ public enum LanguageLevel {
JDK_12(JavaPsiBundle.messagePointer("jdk.12.language.level.description"), 12),
JDK_13(JavaPsiBundle.messagePointer("jdk.13.language.level.description"), 13),
JDK_14(JavaPsiBundle.messagePointer("jdk.14.language.level.description"), 14),
JDK_14_PREVIEW(JavaPsiBundle.messagePointer("jdk.14.preview.language.level.description"), 14),
JDK_15(JavaPsiBundle.messagePointer("jdk.15.language.level.description"), 15),
JDK_15_PREVIEW(JavaPsiBundle.messagePointer("jdk.15.preview.language.level.description"), 15),
JDK_16(JavaPsiBundle.messagePointer("jdk.16.language.level.description"), 16),
JDK_16_PREVIEW(JavaPsiBundle.messagePointer("jdk.16.preview.language.level.description"), 16),
JDK_X(JavaPsiBundle.messagePointer("jdk.X.language.level.description"), 16);
JDK_X(JavaPsiBundle.messagePointer("jdk.X.language.level.description"), 17);
public static final LanguageLevel HIGHEST = JDK_15;
public static final Key<LanguageLevel> KEY = Key.create("LANGUAGE_LEVEL");

2
java/java-psi-impl/src/com/intellij/lang/java/lexer/JavaLexer.java
View File

@@ -38,7 +38,7 @@ public final class JavaLexer extends LexerBase {
return id != null &&
(level.isAtLeast(LanguageLevel.JDK_1_9) && JAVA9_KEYWORDS.contains(id) ||
level.isAtLeast(LanguageLevel.JDK_10) && VAR.contentEquals(id) ||
level.isAtLeast(LanguageLevel.JDK_14_PREVIEW) && RECORD.contentEquals(id) ||
level.isAtLeast(LanguageLevel.JDK_15_PREVIEW) && RECORD.contentEquals(id) ||
level.isAtLeast(LanguageLevel.JDK_14) && YIELD.contentEquals(id) ||
(level.isAtLeast(LanguageLevel.JDK_15_PREVIEW) && (SEALED.contentEquals(id) || PERMITS.contentEquals(id))));
}

2
java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
View File

@@ -419,7 +419,7 @@ public class DeclarationParser {
if (tokenType == JavaTokenType.IDENTIFIER && PsiKeyword.RECORD.equals(builder.getTokenText()) &&
builder.lookAhead(1) == JavaTokenType.IDENTIFIER) {
LanguageLevel level = getLanguageLevel(builder);
return level.isAtLeast(LanguageLevel.JDK_14_PREVIEW) && (level == LanguageLevel.JDK_X || level.isPreview());
return level.isAtLeast(LanguageLevel.JDK_15_PREVIEW) && (level == LanguageLevel.JDK_X || level.isPreview());
}
return false;
}

2
java/java-psi-impl/src/com/intellij/psi/impl/PsiJavaParserFacadeImpl.java
View File

@@ -155,7 +155,7 @@ public class PsiJavaParserFacadeImpl implements PsiJavaParserFacade {
}
private @NotNull PsiClass createRecordFromText(@NotNull String text) {
JavaDummyElement dummyElement = new JavaDummyElement(text, DECLARATION, LanguageLevel.JDK_14_PREVIEW);
JavaDummyElement dummyElement = new JavaDummyElement(text, DECLARATION, LanguageLevel.JDK_15_PREVIEW);
DummyHolder holder = DummyHolderFactory.createHolder(myManager, dummyElement, null);
PsiElement element = SourceTreeToPsiMap.treeElementToPsi(holder.getTreeElement().getFirstChildNode());
if (!(element instanceof PsiClass)) {

11
java/java-psi-impl/src/com/intellij/psi/util/AccessModifier.java
View File

@@ -2,7 +2,6 @@
package com.intellij.psi.util;
import com.intellij.core.JavaPsiBundle;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.*;
import com.intellij.psi.impl.light.LightRecordCanonicalConstructor;
import com.intellij.util.containers.ContainerUtil;
@@ -122,12 +121,10 @@ public enum AccessModifier {
if (JavaPsiRecordUtil.isCompactConstructor(method) ||
JavaPsiRecordUtil.isExplicitCanonicalConstructor(method) ||
method instanceof LightRecordCanonicalConstructor) {
if (PsiUtil.getLanguageLevel(member) != LanguageLevel.JDK_14_PREVIEW) {
PsiModifierList list = containingClass.getModifierList();
if (list != null) {
AccessModifier classModifier = fromModifierList(list);
return ContainerUtil.filter(ALL_MODIFIERS, m -> !classModifier.isWeaker(m));
}
PsiModifierList list = containingClass.getModifierList();
if (list != null) {
AccessModifier classModifier = fromModifierList(list);
return ContainerUtil.filter(ALL_MODIFIERS, m -> !classModifier.isWeaker(m));
}
return Collections.singletonList(PUBLIC);
}

3
java/java-tests/testData/codeInsight/completion/normal/RecordAccessorDeclaration_after.java
View File

@@ -1,5 +1,6 @@
record Test(int component) {
@Override
public int component() {
<selection>return component;</selection>
<selection><caret>return component;</selection>
}
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingRecords/RecordAccessors.java
View File

@@ -19,7 +19,7 @@ record RecThrows(int x) {
public int y() throws Exception {return x;}
}
record CheckOverride(int x) {
<error descr="Method does not override method from its superclass">@Override</error> public int x() { return x; }
@Override public int x() { return x; }
<error descr="Method does not override method from its superclass">@Override</error> public int y() { return x; }
}
record VarArg(int... x) {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingRecords/RecordBasics.java
View File

@@ -71,5 +71,5 @@ record StaticFieldCollides(int i) {
static int <error descr="Variable 'i' is already defined in the scope">i</error>;
}
record Incomplete(@<error descr="Class reference expected">i</error>nt a) {}
record CStyle(int a[]) {}
record CStyle(int a<error descr="C-style record component declaration is not allowed">[]</error>) {}
record SafeVarargComponent(<error descr="@SafeVarargs annotation cannot be applied for a record component">@SafeVarargs</error> int... component) {}

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingRecords/RecordCompactConstructors.java
View File

@@ -4,7 +4,7 @@ class NotRecord {
}
}
record NonPublic(int x) {
<error descr="Compact constructor must be 'public'">NonPublic</error> {
NonPublic {
}
}
@@ -28,11 +28,11 @@ record ReturnInCompact(int x) {
}
}
record NotInitialized(int x,
int <error descr="Record component 'y' might not be initialized in canonical constructor">y</error>,
int y,
int z) {
public NotInitialized {
this.x = 0;
if (Math.random() > 0.5) this.y = 1;
<error descr="Cannot assign a value to final variable 'x'">this.x</error> = 0;
if (Math.random() > 0.5) <error descr="Cannot assign a value to final variable 'y'">this.y</error> = 1;
}
}
record TwoCompacts(int x, int y) {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingRecords/RecordConstructors.java
View File

@@ -1,5 +1,5 @@
record NotPublic(int x, int y) {
<error descr="Canonical constructor must be 'public'">NotPublic</error>(int x, int y) {this.x = x; this.y = y;}
NotPublic(int x, int y) {this.x = x; this.y = y;}
NotPublic() {this(0,0);}
}
record Generic(String x) {

0
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/RecordParamJava14Preview.java → java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/RecordParamJava15Preview.java
View File

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/delegateWithDefaultValue/afterRecord.java
View File

@@ -1,6 +1,6 @@
// "Generate overloaded constructor with default parameter values" "true"
record Test(int x) {
public Test() {
Test() {
this();
}

6
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier14/afterCompactCtor.java
View File

@@ -1,4 +1,4 @@
// "Make 'R' public" "true"
record R () {
public R {}
// "Make 'R' protected" "true"
protected record R () {
protected R {}
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier14/beforeCompactCtor.java
View File

@@ -1,4 +1,4 @@
// "Make 'R' public" "true"
record R () {
// "Make 'R' protected" "true"
protected record R () {
<caret>R {}
}

2
java/java-tests/testData/codeInsight/generateConstructor/afterRecordCanonicalConstructor.java
View File

@@ -2,7 +2,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
record Test(final int foo, @Anno1 @Anno2 @Anno3 @Anno4 double bar, String... varArg) {
public Test(int foo, @Anno2 @Anno3 @Anno4 double bar, String... varArg) {<caret>
Test(int foo, @Anno2 @Anno3 @Anno4 double bar, String... varArg) {<caret>
this.foo = foo;
this.bar = bar;
this.varArg = varArg;

2
java/java-tests/testData/codeInsight/generateConstructor/afterRecordCompactConstructor.java
View File

@@ -1,4 +1,4 @@
record R(int x, int y) {
public R {<caret>
R {<caret>
}
}

2
java/java-tests/testData/inspection/classCanBeRecord/afterCtorParamsEqualToFields.java
View File

@@ -1,6 +1,6 @@
// "Convert to a record" "true"
record R(String second, int first) {
R {
R(String second, int first) {
this.second = second;
this.first = 1;
}

9
java/java-tests/testData/inspection/featurepreview/preview14on15API/LanguageLevel14Preview.java
View File

@@ -1,9 +0,0 @@
class Main {
{
g("%s".formatted(1),
"".stripIndent(),
"".translateEscapes());
}
private void g(String formatted, String stripIndent, String translateEscapes) {}
}

10
java/java-tests/testData/inspection/redundantRecordConstructor/java14/afterCanonicalAssignSameJava14Preview.java
View File

@@ -1,10 +0,0 @@
// "Convert canonical constructor to compact form" "true"
record Rec(int x, int y) {
public Rec {
this.x = y;
// 1
/*2*/
//3
//4
}
}

7
java/java-tests/testData/inspection/redundantRecordConstructor/java14/afterCanonicalAssignViceVersaJava14Preview.java
View File

@@ -1,7 +0,0 @@
// "Convert canonical constructor to compact form" "true"
record Rec(int x, int y) {
public Rec {
this.x = y;
this.y = x;
}
}

12
java/java-tests/testData/inspection/redundantRecordConstructor/java14/afterCanonicalNotAnnotatedParameterOkJava14Preview.java
View File

@@ -1,12 +0,0 @@
// "Convert canonical constructor to compact form" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
record Rec(@Anno int x, int y) {
public Rec {
this.x = y;
}
}
@Target(ElementType.FIELD)
@interface Anno {}

9
java/java-tests/testData/inspection/redundantRecordConstructor/java14/beforeCanonicalAssignSameJava14Preview.java
View File

@@ -1,9 +0,0 @@
// "Convert canonical constructor to compact form" "true"
record Rec(int x, int y) {
public Rec(int x<caret>, int y) {
this.x = y;
// 1
this.y /*2*/= y; //3
//4
}
}

7
java/java-tests/testData/inspection/redundantRecordConstructor/java14/beforeCanonicalAssignViceVersaJava14Preview.java
View File

@@ -1,7 +0,0 @@
// "Convert canonical constructor to compact form" "true"
record Rec(int x, int y) {
public Rec(int x<caret>, int y) {
this.x = y;
this.y = x;
}
}

13
java/java-tests/testData/inspection/redundantRecordConstructor/java14/beforeCanonicalNotAnnotatedParameterOkJava14Preview.java
View File

@@ -1,13 +0,0 @@
// "Convert canonical constructor to compact form" "true"
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
record Rec(@Anno int x, int y) {
public Rec(int x<caret>, int y) {
this.x = y;
this.y = y;
}
}
@Target(ElementType.FIELD)
@interface Anno {}

0
java/java-tests/testData/refactoring/introduceVariable/NonPatternDeclarationJava14Preview.after.java → java/java-tests/testData/refactoring/introduceVariable/NonPatternDeclarationJava15Preview.after.java
View File

0
java/java-tests/testData/refactoring/introduceVariable/NonPatternDeclarationJava14Preview.java → java/java-tests/testData/refactoring/introduceVariable/NonPatternDeclarationJava15Preview.java
View File

0
java/java-tests/testData/refactoring/introduceVariable/NonPatternVariableDeclarationTwoBlocksJava14Preview.after.java → java/java-tests/testData/refactoring/introduceVariable/NonPatternVariableDeclarationTwoBlocksJava15Preview.after.java
View File

0
java/java-tests/testData/refactoring/introduceVariable/NonPatternVariableDeclarationTwoBlocksJava14Preview.java → java/java-tests/testData/refactoring/introduceVariable/NonPatternVariableDeclarationTwoBlocksJava15Preview.java
View File

0
java/java-tests/testData/refactoring/introduceVariable/PatternVariableDeclarationAfterIfJava14Preview.after.java → java/java-tests/testData/refactoring/introduceVariable/PatternVariableDeclarationAfterIfJava15Preview.after.java
View File

0
java/java-tests/testData/refactoring/introduceVariable/PatternVariableDeclarationAfterIfJava14Preview.java → java/java-tests/testData/refactoring/introduceVariable/PatternVariableDeclarationAfterIfJava15Preview.java
View File

0
java/java-tests/testData/refactoring/introduceVariable/PatternVariableDeclarationJava14Preview.after.java → java/java-tests/testData/refactoring/introduceVariable/PatternVariableDeclarationJava15Preview.after.java
View File

0
java/java-tests/testData/refactoring/introduceVariable/PatternVariableDeclarationJava14Preview.java → java/java-tests/testData/refactoring/introduceVariable/PatternVariableDeclarationJava15Preview.java
View File

0
java/java-tests/testData/refactoring/introduceVariable/PatternVariableDeclarationUsedInLocalJava14Preview.after.java → java/java-tests/testData/refactoring/introduceVariable/PatternVariableDeclarationUsedInLocalJava15Preview.after.java
View File

0
java/java-tests/testData/refactoring/introduceVariable/PatternVariableDeclarationUsedInLocalJava14Preview.java → java/java-tests/testData/refactoring/introduceVariable/PatternVariableDeclarationUsedInLocalJava15Preview.java
View File

2
java/java-tests/testSrc/com/intellij/java/codeInsight/CompleteStatementTest.java
View File

@@ -37,7 +37,7 @@ public class CompleteStatementTest extends EditorActionTestCase {
@Override
protected LanguageLevel getLanguageLevel() {
return LanguageLevel.JDK_14_PREVIEW;
return LanguageLevel.JDK_15_PREVIEW;
}
public void testAddMissingSemicolon() { doTest(); }

2
java/java-tests/testSrc/com/intellij/java/codeInsight/GenerateConstructorTest.java
View File

@@ -45,7 +45,7 @@ public class GenerateConstructorTest extends LightJavaCodeInsightFixtureTestCase
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return JAVA_14;
return JAVA_15;
}
@Override

6
java/java-tests/testSrc/com/intellij/java/codeInsight/completion/KeywordCompletionTest.java
View File

@@ -147,7 +147,7 @@ public class KeywordCompletionTest extends LightCompletionTestCase {
public void testPrimitivesInClassAnnotationAttribute() { doTest(3, "true", "int", "boolean"); }
public void testPrimitivesInMethodReturningArray() { doTest(2, "true", "byte", "boolean"); }
public void testPrimitivesInMethodReturningClass() { doTest(3, "byte", "boolean", "void"); }
public void testPrimitivesInRecordHeader() {setLanguageLevel(LanguageLevel.JDK_14_PREVIEW); doTest(2, "byte", "boolean"); }
public void testPrimitivesInRecordHeader() {setLanguageLevel(LanguageLevel.JDK_15_PREVIEW); doTest(2, "byte", "boolean"); }
public void testNoClassKeywordsInLocalArrayInitializer() { doTest(0, "class", "interface", "enum"); }
public void testNoClassKeywordsInFieldArrayInitializer() { doTest(0, "class", "interface", "enum"); }
@@ -186,8 +186,8 @@ public class KeywordCompletionTest extends LightCompletionTestCase {
public void testSuggestModifiersAfterUnfinishedMethod() { doTest(1, "public"); }
public void testPrivateInJava9Interface() { setLanguageLevel(LanguageLevel.JDK_1_9); doTest(); }
public void testQualifiedNew() { doTest(1, "new"); }
public void testRecord() {setLanguageLevel(LanguageLevel.JDK_14_PREVIEW); doTest(); }
public void testRecordInFileScope() {setLanguageLevel(LanguageLevel.JDK_14_PREVIEW); doTest(1, "record"); }
public void testRecord() {setLanguageLevel(LanguageLevel.JDK_15_PREVIEW); doTest(); }
public void testRecordInFileScope() {setLanguageLevel(LanguageLevel.JDK_15_PREVIEW); doTest(1, "record"); }
public void testNoLocalInterfaceAt15() {
setLanguageLevel(LanguageLevel.JDK_15); doTest(0);
}

2
java/java-tests/testSrc/com/intellij/java/codeInsight/completion/Normal14CompletionTest.groovy
View File

@@ -11,7 +11,7 @@ class Normal14CompletionTest extends NormalCompletionTestCase {
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return JAVA_14
return JAVA_15
}
void testRecordImplements() {

2
java/java-tests/testSrc/com/intellij/java/codeInsight/completion/NormalSwitchCompletionTest.groovy
View File

@@ -10,7 +10,7 @@ class NormalSwitchCompletionTest extends NormalCompletionTestCase {
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return JAVA_14
return JAVA_15
}
void testDefaultInRuleSwitch() { doTest() }

2
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/JavaSwitchExpressionsHighlightingTest.kt
View File

@@ -6,7 +6,7 @@ import com.intellij.codeInspection.redundantCast.RedundantCastInspection
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
class JavaSwitchExpressionsHighlightingTest : LightJavaCodeInsightFixtureTestCase() {
override fun getProjectDescriptor() = JAVA_14
override fun getProjectDescriptor() = JAVA_15
override fun getBasePath() = "${JavaTestUtil.getRelativeJavaTestDataPath()}/codeInsight/daemonCodeAnalyzer/switchExpressions"
fun testEnhancedSwitchStatements() = doTest()

2
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/JavaTextBlocksHighlightingTest.kt
View File

@@ -6,7 +6,7 @@ import com.intellij.openapi.actionSystem.IdeActions
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
class JavaTextBlocksHighlightingTest : LightJavaCodeInsightFixtureTestCase() {
override fun getProjectDescriptor() = JAVA_14
override fun getProjectDescriptor() = JAVA_15
override fun getBasePath() = "${JavaTestUtil.getRelativeJavaTestDataPath()}/codeInsight/daemonCodeAnalyzer/textBlocks"
fun testTextBlocks() = doTest()

2
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/JavadocHighlightingTest.java
View File

@@ -56,7 +56,7 @@ public class JavadocHighlightingTest extends LightDaemonAnalyzerTestCase {
public void testParam2() { doTest(); }
public void testParam3() { doTest(); }
public void testParam4() { doTest(); }
public void testRecordParamJava14Preview() { doTest(); }
public void testRecordParamJava15Preview() { doTest(); }
public void testTypeParam() {
myInspection.METHOD_OPTIONS.ACCESS_JAVADOC_REQUIRED_FOR = "private";
myInspection.METHOD_OPTIONS.REQUIRED_TAGS = "@param";

2
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/LightPatternsHighlightingTest.java
View File

@@ -16,7 +16,7 @@ public class LightPatternsHighlightingTest extends LightJavaCodeInsightFixtureTe
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return JAVA_14;
return JAVA_15;
}
public void testInstanceOfBasics() {

2
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/LightRecordsHighlightingTest.java
View File

@@ -20,7 +20,7 @@ public class LightRecordsHighlightingTest extends LightJavaCodeInsightFixtureTes
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return JAVA_14;
return JAVA_15;
}
public void testRecordBasics() {

2
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/indentGuide/JavaTextBlockIndentGuidePerformanceTest.java
View File

@@ -35,7 +35,7 @@ public class JavaTextBlockIndentGuidePerformanceTest extends LightDaemonAnalyzer
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return LightJavaCodeInsightFixtureTestCase.JAVA_14;
return LightJavaCodeInsightFixtureTestCase.JAVA_15;
}
private static String createCodeBlocks(int n, int nLines) {

2
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/indentGuide/JavaTextBlockIndentGuideTest.java
View File

@@ -113,7 +113,7 @@ public class JavaTextBlockIndentGuideTest extends BaseIndentGuideTest {
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return JAVA_14;
return JAVA_15;
}
private void doTest(@NotNull String text) {

2
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/AddEmptyRecordHeaderTest.java
View File

@@ -10,7 +10,7 @@ public class AddEmptyRecordHeaderTest extends LightQuickFixParameterizedTestCase
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return LightJavaCodeInsightFixtureTestCase.JAVA_14;
return LightJavaCodeInsightFixtureTestCase.JAVA_15;
}
@Override

5
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/CreateClassFromNewTest.java
View File

@@ -19,10 +19,9 @@ import com.intellij.application.options.CodeStyle;
import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
import org.jetbrains.annotations.NotNull;
import static com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase.JAVA_14;
/**
* @author ven
*/
@@ -36,7 +35,7 @@ public class CreateClassFromNewTest extends LightQuickFixParameterizedTestCase {
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return JAVA_14;
return LightJavaCodeInsightFixtureTestCase.JAVA_15;
}
@Override

2
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/CreateInnerClassFromNewTest.java
View File

@@ -27,7 +27,7 @@ public class CreateInnerClassFromNewTest extends LightQuickFixParameterizedTestC
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return LightJavaCodeInsightFixtureTestCase.JAVA_14;
return LightJavaCodeInsightFixtureTestCase.JAVA_15;
}
@Override

2
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/DelegateWithDefaultParamValueTest.java
View File

@@ -33,6 +33,6 @@ public class DelegateWithDefaultParamValueTest extends LightQuickFixParameterize
@Override
protected LanguageLevel getLanguageLevel() {
return LanguageLevel.JDK_14_PREVIEW;
return LanguageLevel.JDK_15_PREVIEW;
}
}

4
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/Modifier14Test.java → java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/ModifierRecordsTest.java
View File

@@ -20,7 +20,7 @@ import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
import org.jetbrains.annotations.NotNull;
public class Modifier14Test extends LightQuickFixParameterizedTestCase {
public class ModifierRecordsTest extends LightQuickFixParameterizedTestCase {
@Override
protected String getBasePath() {
return "/codeInsight/daemonCodeAnalyzer/quickFix/modifier14";
@@ -29,6 +29,6 @@ public class Modifier14Test extends LightQuickFixParameterizedTestCase {
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return LightJavaCodeInsightFixtureTestCase.JAVA_14;
return LightJavaCodeInsightFixtureTestCase.JAVA_15;
}
}

2
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/RemoveUnusedAssignmentTest.java
View File

@@ -35,6 +35,6 @@ public class RemoveUnusedAssignmentTest extends LightQuickFixParameterizedTestCa
@Override
protected LanguageLevel getLanguageLevel() {
return LanguageLevel.JDK_14_PREVIEW;
return LanguageLevel.JDK_15_PREVIEW;
}
}

2
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/SafeVarargsCanBeUsedTest.java
View File

@@ -37,6 +37,6 @@ public class SafeVarargsCanBeUsedTest extends LightQuickFixParameterizedTestCase
@Override
protected LanguageLevel getLanguageLevel() {
return LanguageLevel.JDK_14_PREVIEW;
return LanguageLevel.JDK_15_PREVIEW;
}
}

2
java/java-tests/testSrc/com/intellij/java/codeInsight/editorActions/JavaQuoteTest.groovy
View File

@@ -36,7 +36,7 @@ class JavaQuoteTest extends LightJavaCodeInsightFixtureTestCase {
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return JAVA_14
return JAVA_15
}
private void doTest(String before, String after, char c = '"') {

3
java/java-tests/testSrc/com/intellij/java/codeInsight/folding/JavaFolding14Test.kt
View File

@@ -2,10 +2,9 @@
package com.intellij.java.codeInsight.folding
import com.intellij.testFramework.LightProjectDescriptor
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
class JavaFolding14Test : JavaFoldingTestCase() {
override fun getProjectDescriptor(): LightProjectDescriptor = LightJavaCodeInsightFixtureTestCase.JAVA_14
override fun getProjectDescriptor(): LightProjectDescriptor = JAVA_15
fun testRecord() {
val text = """

4
java/java-tests/testSrc/com/intellij/java/codeInsight/generation/surroundWith/JavaSurroundWith12Test.kt
View File

@@ -2,18 +2,18 @@
package com.intellij.java.codeInsight.generation.surroundWith
import com.intellij.codeInsight.generation.surroundWith.*
import com.intellij.java.codeInsight.folding.JavaFoldingTestCase
import com.intellij.lang.LanguageSurrounders
import com.intellij.lang.java.JavaLanguage
import com.intellij.lang.surroundWith.Surrounder
import com.intellij.testFramework.LightJavaCodeInsightTestCase
import com.intellij.testFramework.LightProjectDescriptor
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase.JAVA_15
import com.intellij.util.containers.ContainerUtil
class JavaSurroundWith13Test : LightJavaCodeInsightTestCase() {
private val BASE_PATH = "/codeInsight/generation/surroundWith/java13/"
override fun getProjectDescriptor(): LightProjectDescriptor = JavaFoldingTestCase.JAVA_14
override fun getProjectDescriptor(): LightProjectDescriptor = JAVA_15
fun testCaseBlockWithIf() = doTest(JavaWithIfSurrounder())
fun testCaseResultWithIf() = doTest(JavaWithIfSurrounder())

2
java/java-tests/testSrc/com/intellij/java/codeInsight/highlighting/HighlightUsagesHandlerTest.groovy
View File

@@ -21,7 +21,7 @@ class HighlightUsagesHandlerTest extends LightJavaCodeInsightFixtureTestCase {
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return JAVA_14
return JAVA_15
}
void testHighlightImport() {

5
java/java-tests/testSrc/com/intellij/java/codeInsight/intention/ConvertCompactConstructorToCanonicalActionTest.java
View File

@@ -17,10 +17,9 @@ package com.intellij.java.codeInsight.intention;
import com.intellij.codeInsight.daemon.LightIntentionActionTestCase;
import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
import org.jetbrains.annotations.NotNull;
import static com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase.JAVA_14;
public class ConvertCompactConstructorToCanonicalActionTest extends LightIntentionActionTestCase {
@Override
protected String getBasePath() {
@@ -29,6 +28,6 @@ public class ConvertCompactConstructorToCanonicalActionTest extends LightIntenti
@Override
protected @NotNull LightProjectDescriptor getProjectDescriptor() {
return JAVA_14;
return LightJavaCodeInsightFixtureTestCase.JAVA_15;
}
}

7
java/java-tests/testSrc/com/intellij/java/codeInsight/intention/ReplaceStringFormatWithPrintfIntentionTest.java
View File

@@ -3,17 +3,10 @@ package com.intellij.java.codeInsight.intention;
import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase;
import com.intellij.codeInspection.LocalInspectionTool;
import com.intellij.pom.java.LanguageLevel;
import com.siyeh.ig.performance.RedundantStringFormatCallInspection;
import org.jetbrains.annotations.NotNull;
public class ReplaceStringFormatWithPrintfIntentionTest extends LightQuickFixParameterizedTestCase {
@Override
protected LanguageLevel getLanguageLevel() {
return LanguageLevel.JDK_14_PREVIEW;
}
@Override
protected String getBasePath() {
return "/codeInsight/replaceStringFormat";

2
java/java-tests/testSrc/com/intellij/java/codeInsight/javadoc/JavaDocInfoGeneratorTest.java
View File

@@ -57,7 +57,7 @@ public class JavaDocInfoGeneratorTest extends JavaCodeInsightTestCase {
@Override
protected @NotNull LanguageLevel getProjectLanguageLevel() {
return LanguageLevel.JDK_14_PREVIEW;
return LanguageLevel.JDK_15_PREVIEW;
}
public void testSimpleField() { doTestField(); }

17
java/java-tests/testSrc/com/intellij/java/codeInsight/template/JavaLiveTemplateTest.groovy
View File

@@ -5,17 +5,26 @@ import com.intellij.JavaTestUtil
import com.intellij.codeInsight.CodeInsightSettings
import com.intellij.codeInsight.daemon.impl.quickfix.EmptyExpression
import com.intellij.codeInsight.lookup.Lookup
import com.intellij.codeInsight.template.*
import com.intellij.codeInsight.template.JavaCodeContextType
import com.intellij.codeInsight.template.JavaStringContextType
import com.intellij.codeInsight.template.Template
import com.intellij.codeInsight.template.TemplateActionContext
import com.intellij.codeInsight.template.TemplateContextType
import com.intellij.codeInsight.template.actions.SaveAsTemplateAction
import com.intellij.codeInsight.template.impl.*
import com.intellij.codeInsight.template.macro.*
import com.intellij.codeInsight.template.macro.BaseCompleteMacro
import com.intellij.codeInsight.template.macro.CompleteMacro
import com.intellij.codeInsight.template.macro.CompleteSmartMacro
import com.intellij.codeInsight.template.macro.MethodReturnTypeMacro
import com.intellij.codeInsight.template.macro.VariableOfTypeMacro
import com.intellij.openapi.command.WriteCommandAction
import com.intellij.openapi.editor.impl.DocumentImpl
import com.intellij.psi.PsiDocumentManager
import com.intellij.testFramework.LightProjectDescriptor
import groovy.transform.CompileStatic
import static com.intellij.codeInsight.template.Template.Property.USE_STATIC_IMPORT_IF_POSSIBLE
import static com.intellij.codeInsight.template.Template.Property.USE_STATIC_IMPORT_IF_POSSIBLE
/**
* @author peter
*/
@@ -24,7 +33,7 @@ class JavaLiveTemplateTest extends LiveTemplateTestCase {
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return JAVA_14
return JAVA_15
}
final String basePath = JavaTestUtil.getRelativeJavaTestDataPath() + "/codeInsight/template/"

2
java/java-tests/testSrc/com/intellij/java/codeInspection/DataFlowInspection14Test.java
View File

@@ -9,7 +9,7 @@ public class DataFlowInspection14Test extends DataFlowInspectionTestCase {
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return JAVA_14;
return JAVA_15;
}
@Override

4
java/java-tests/testSrc/com/intellij/java/codeInspection/Java14With15APIUsageInspectionTest.java
View File

@@ -53,8 +53,4 @@ public class Java14With15APIUsageInspectionTest extends LightJavaCodeInsightFixt
IdeaTestUtil.withLevel(myFixture.getModule(), LanguageLevel.JDK_14, () ->
myFixture.testHighlighting(getTestName(false) + ".java"));
}
public void testLanguageLevel14Preview() {
IdeaTestUtil.withLevel(myFixture.getModule(), LanguageLevel.JDK_14_PREVIEW, () ->
myFixture.testHighlighting(getTestName(false) + ".java"));
}
}

8
java/java-tests/testSrc/com/intellij/java/codeInspection/JavaAPIUsagesInspectionTest.java
View File

@@ -86,10 +86,10 @@ public class JavaAPIUsagesInspectionTest extends LightJavaCodeInsightFixtureTest
//generate apiXXX.txt
//configure jdk and set test project descriptor
private static final String PREVIEW_JDK_HOME = "/home/me/.jdks/openjdk-14.0.1";
private static final String JDK_HOME = "/home/me/java/jdk-15";
private static final LanguageLevel LANGUAGE_LEVEL = LanguageLevel.JDK_14_PREVIEW;
private static final String VERSION = "15";
private static final String PREVIEW_JDK_HOME = "/home/me/.jdks/openjdk-15";
private static final String JDK_HOME = "/home/me/java/jdk-16";
private static final LanguageLevel LANGUAGE_LEVEL = LanguageLevel.JDK_15_PREVIEW;
private static final String VERSION = "16";
private static final LightProjectDescriptor API_VERSION_PROJECT_DESCRIPTOR = new LightProjectDescriptor() {
@Override
public @NotNull Sdk getSdk() {

2
java/java-tests/testSrc/com/intellij/java/codeInspection/LocalCanBeFinalTest.java
View File

@@ -26,7 +26,7 @@ public class LocalCanBeFinalTest extends LightJavaCodeInsightFixtureTestCase {
@Override
protected LightProjectDescriptor getProjectDescriptor() {
// has to have JFrame and sources
return JAVA_14;
return JAVA_15;
}
private void doTest() {

5
java/java-tests/testSrc/com/intellij/java/codeInspection/PatternVariableCanBeUsedInspectionTest.java
View File

@@ -5,10 +5,9 @@ import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCa
import com.intellij.codeInspection.LocalInspectionTool;
import com.intellij.codeInspection.PatternVariableCanBeUsedInspection;
import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
import org.jetbrains.annotations.NotNull;
import static com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase.JAVA_14;
public class PatternVariableCanBeUsedInspectionTest extends LightQuickFixParameterizedTestCase {
@Override
protected LocalInspectionTool @NotNull [] configureLocalInspectionTools() {
@@ -18,7 +17,7 @@ public class PatternVariableCanBeUsedInspectionTest extends LightQuickFixParamet
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return JAVA_14;
return LightJavaCodeInsightFixtureTestCase.JAVA_15;
}
@Override

42
java/java-tests/testSrc/com/intellij/java/codeInspection/RedundantRecordConstructorInspection14Test.java
View File

@@ -1,42 +0,0 @@
/*
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.java.codeInspection;
import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase;
import com.intellij.codeInspection.LocalInspectionTool;
import com.intellij.codeInspection.RedundantRecordConstructorInspection;
import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
import org.jetbrains.annotations.NotNull;
// Remove this test when support of 14-preview is dropped
public class RedundantRecordConstructorInspection14Test extends LightQuickFixParameterizedTestCase {
@Override
protected LocalInspectionTool @NotNull [] configureLocalInspectionTools() {
return new LocalInspectionTool[]{new RedundantRecordConstructorInspection()};
}
@Override
protected @NotNull LightProjectDescriptor getProjectDescriptor() {
return LightJavaCodeInsightFixtureTestCase.JAVA_14;
}
@Override
protected String getBasePath() {
return "/inspection/redundantRecordConstructor/java14";
}
}

6
java/java-tests/testSrc/com/intellij/java/codeInspection/TextBlockBackwardMigrationInspectionTest.java
View File

@@ -5,7 +5,6 @@ import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCa
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.codeInspection.LocalInspectionTool;
import com.intellij.codeInspection.TextBlockBackwardMigrationInspection;
import com.intellij.pom.java.LanguageLevel;
import org.jetbrains.annotations.NotNull;
/**
@@ -44,9 +43,4 @@ public class TextBlockBackwardMigrationInspectionTest extends LightQuickFixParam
protected String getBasePath() {
return "/inspection/textBlockBackwardMigration/";
}
@Override
protected LanguageLevel getLanguageLevel() {
return LanguageLevel.JDK_14_PREVIEW;
}
}

5
java/java-tests/testSrc/com/intellij/java/codeInspection/TextBlockMigrationInspectionTest.java
View File

@@ -4,7 +4,6 @@ package com.intellij.java.codeInspection;
import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase;
import com.intellij.codeInspection.LocalInspectionTool;
import com.intellij.codeInspection.TextBlockMigrationInspection;
import com.intellij.pom.java.LanguageLevel;
import org.jetbrains.annotations.NotNull;
/**
@@ -23,8 +22,4 @@ public class TextBlockMigrationInspectionTest extends LightQuickFixParameterized
return "/inspection/textBlockMigration/";
}
@Override
protected LanguageLevel getLanguageLevel() {
return LanguageLevel.JDK_14_PREVIEW;
}
}

2
java/java-tests/testSrc/com/intellij/java/codeInspection/classCanBeRecord/ClassCanBeRecordInspectionAccessorsRenamingTest.java
View File

@@ -18,7 +18,7 @@ public class ClassCanBeRecordInspectionAccessorsRenamingTest extends LightQuickF
@Override
protected @NotNull LightProjectDescriptor getProjectDescriptor() {
return LightJavaCodeInsightFixtureTestCase.JAVA_14;
return LightJavaCodeInsightFixtureTestCase.JAVA_15;
}
@Override

2
java/java-tests/testSrc/com/intellij/java/codeInspection/classCanBeRecord/ClassCanBeRecordInspectionTest.java
View File

@@ -18,7 +18,7 @@ public class ClassCanBeRecordInspectionTest extends LightQuickFixParameterizedTe
@Override
protected @NotNull LightProjectDescriptor getProjectDescriptor() {
return LightJavaCodeInsightFixtureTestCase.JAVA_14;
return LightJavaCodeInsightFixtureTestCase.JAVA_15;
}
@Override

2
java/java-tests/testSrc/com/intellij/java/codeInspection/classCanBeRecord/ClassCanBeRecordInspectionUsageProviderTest.java
View File

@@ -45,7 +45,7 @@ public class ClassCanBeRecordInspectionUsageProviderTest extends LightQuickFixPa
@Override
protected @NotNull LightProjectDescriptor getProjectDescriptor() {
return LightJavaCodeInsightFixtureTestCase.JAVA_14;
return LightJavaCodeInsightFixtureTestCase.JAVA_15;
}
@Override

2
java/java-tests/testSrc/com/intellij/java/codeInspection/classCanBeRecord/ClassCanBeRecordInspectionWeakenAccessibilityTest.java
View File

@@ -18,7 +18,7 @@ public class ClassCanBeRecordInspectionWeakenAccessibilityTest extends LightQuic
@Override
protected @NotNull LightProjectDescriptor getProjectDescriptor() {
return LightJavaCodeInsightFixtureTestCase.JAVA_14;
return LightJavaCodeInsightFixtureTestCase.JAVA_15;
}
@Override

4
java/java-tests/testSrc/com/intellij/java/execution/configurations/JavaParametersTest.java
View File

@@ -111,7 +111,7 @@ public class JavaParametersTest extends ModuleRootManagerTestCase {
public void testPreviewLanguageFeatures() throws CantRunException {
ModuleRootModificationUtil.updateModel(myModule, (model) -> {
model.getModuleExtension(LanguageLevelModuleExtension.class)
.setLanguageLevel(LanguageLevel.JDK_14_PREVIEW);
.setLanguageLevel(LanguageLevel.JDK_15_PREVIEW);
model.setSdk(IdeaTestUtil.getMockJdk(JavaVersion.compose(14)));
});
JavaParameters javaParameters = new JavaParameters();
@@ -119,7 +119,7 @@ public class JavaParametersTest extends ModuleRootManagerTestCase {
assertTrue(javaParameters.getVMParametersList().hasParameter(JavaParameters.JAVA_ENABLE_PREVIEW_PROPERTY));
ModuleRootModificationUtil.updateModel(myModule, (model) -> model.getModuleExtension(LanguageLevelModuleExtension.class)
.setLanguageLevel(LanguageLevel.JDK_14));
.setLanguageLevel(LanguageLevel.JDK_15));
javaParameters = new JavaParameters();
javaParameters.configureByModule(myModule, JavaParameters.CLASSES_AND_TESTS);
assertFalse(javaParameters.getVMParametersList().hasParameter(JavaParameters.JAVA_ENABLE_PREVIEW_PROPERTY));

2
java/java-tests/testSrc/com/intellij/java/propertyBased/JavaCodeInsightSanityTest.java
View File

@@ -55,7 +55,7 @@ public class JavaCodeInsightSanityTest extends LightJavaCodeInsightFixtureTestCa
@Override
protected @NotNull LightProjectDescriptor getProjectDescriptor() {
return JAVA_14;
return JAVA_15;
}
public void testRandomActivity() {

2
java/java-tests/testSrc/com/intellij/java/propertyBased/JavaFeatureSpecificSanityTest.java
View File

@@ -28,7 +28,7 @@ public class JavaFeatureSpecificSanityTest extends LightJavaCodeInsightFixtureTe
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return JAVA_14;
return JAVA_15;
}
@Override

2
java/java-tests/testSrc/com/intellij/java/propertyBased/JavaTextBlockMigrationPropertyTest.java
View File

@@ -45,7 +45,7 @@ public class JavaTextBlockMigrationPropertyTest extends LightJavaCodeInsightFixt
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return JAVA_14;
return JAVA_15;
}
@Override

2
java/java-tests/testSrc/com/intellij/java/propertyBased/OptionalToIfConversionPropertyTest.java
View File

@@ -41,7 +41,7 @@ public class OptionalToIfConversionPropertyTest extends LightJavaCodeInsightFixt
@Override
protected @NotNull LightProjectDescriptor getProjectDescriptor() {
return JAVA_14;
return JAVA_15;
}
public void testCompilabilityAfterConversion() {

4
java/java-tests/testSrc/com/intellij/java/psi/JavaStubBuilderTest.java
View File

@@ -3,7 +3,6 @@ package com.intellij.java.psi;
import com.intellij.lang.FileASTNode;
import com.intellij.openapi.application.ex.PathManagerEx;
import com.intellij.openapi.roots.LanguageLevelProjectExtension;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.PsiJavaFile;
@@ -33,7 +32,6 @@ public class JavaStubBuilderTest extends LightIdeaTestCase {
@Override
public void setUp() throws Exception {
super.setUp();
LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.JDK_14_PREVIEW);
myBuilder = new JavaLightStubBuilder();
}
@@ -735,7 +733,7 @@ public class JavaStubBuilderTest extends LightIdeaTestCase {
private void doTest(/*@Language("JAVA")*/ String source, @Language("TEXT") String expected) {
PsiJavaFile file = (PsiJavaFile)createLightFile("test.java", source);
file.putUserData(PsiUtil.FILE_LANGUAGE_LEVEL_KEY, LanguageLevel.JDK_14_PREVIEW);
file.putUserData(PsiUtil.FILE_LANGUAGE_LEVEL_KEY, LanguageLevel.JDK_15_PREVIEW);
FileASTNode fileNode = file.getNode();
assertNotNull(fileNode);
assertFalse(fileNode.isParsed());

4
java/java-tests/testSrc/com/intellij/java/psi/OptimizeImportsTest.java
View File

@@ -16,9 +16,9 @@
package com.intellij.java.psi;
import com.intellij.application.options.CodeStyle;
import com.intellij.application.options.codeStyle.excludedFiles.NamedScopeDescriptor;
import com.intellij.codeInspection.unusedImport.UnusedImportInspection;
import com.intellij.formatting.MockCodeStyleSettingsModifier;
import com.intellij.application.options.codeStyle.excludedFiles.NamedScopeDescriptor;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ex.PathManagerEx;
import com.intellij.psi.PsiDocumentManager;
@@ -106,7 +106,7 @@ public class OptimizeImportsTest extends OptimizeImportsTestCase {
@Override
protected @NotNull LightProjectDescriptor getProjectDescriptor() {
return JAVA_14;
return JAVA_15;
}
public void testNoStubPsiMismatchOnRecordInsideImportList() {

4
java/java-tests/testSrc/com/intellij/java/psi/resolve/FileLocalResolverTest.groovy
View File

@@ -40,7 +40,7 @@ import org.jetbrains.annotations.NotNull
class FileLocalResolverTest extends LightJavaCodeInsightFixtureTestCase {
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return JAVA_14
return JAVA_15
}
void "test unknown variable"() {
@@ -254,7 +254,7 @@ class C {
def file = PsiFileFactory.getInstance(project).
createFileFromText('a.java', JavaLanguage.INSTANCE, myFixture.file.text, false, false)
file.putUserData(PsiUtil.FILE_LANGUAGE_LEVEL_KEY, LanguageLevel.JDK_14_PREVIEW)
file.putUserData(PsiUtil.FILE_LANGUAGE_LEVEL_KEY, LanguageLevel.JDK_15_PREVIEW)
def fctsTree = file.node.lighterAST
assert fctsTree instanceof FCTSBackedLighterAST

2
java/java-tests/testSrc/com/intellij/java/psi/resolve/ResolveRecordMethodsTest.java
View File

@@ -15,7 +15,7 @@ public class ResolveRecordMethodsTest extends LightResolveTestCase {
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return JAVA_14;
return JAVA_15;
}
private PsiElement resolve() {

2
java/java-tests/testSrc/com/intellij/java/psi/search/FindUsagesJava14Test.kt
View File

@@ -17,7 +17,7 @@ import java.lang.Integer.max
class FindUsagesJava14Test : JavaPsiTestCase() {
override fun setUp() {
super.setUp()
LanguageLevelProjectExtension.getInstance(myJavaFacade.project).languageLevel = LanguageLevel.JDK_14_PREVIEW
LanguageLevelProjectExtension.getInstance(myJavaFacade.project).languageLevel = LanguageLevel.JDK_15_PREVIEW
val root = JavaTestUtil.getJavaTestDataPath() + "/psi/search/findUsages14/" + getTestName(true)
PsiTestUtil.removeAllRoots(myModule, IdeaTestUtil.getMockJdk17())
createTestProjectStructure(root)

5
java/java-tests/testSrc/com/intellij/java/refactoring/ChangeSignatureTest.java
View File

@@ -12,20 +12,19 @@ import com.intellij.refactoring.changeSignature.ParameterInfoImpl;
import com.intellij.refactoring.changeSignature.ThrownExceptionInfo;
import com.intellij.refactoring.util.CanonicalTypes;
import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NotNull;
import java.util.HashSet;
import static com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase.JAVA_14;
/**
* @author dsl
*/
public class ChangeSignatureTest extends ChangeSignatureBaseTest {
@Override
protected @NotNull LightProjectDescriptor getProjectDescriptor() {
return JAVA_14;
return LightJavaCodeInsightFixtureTestCase.JAVA_15;
}
private CommonCodeStyleSettings getJavaSettings() {

4
java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodNewTest.java
View File

@@ -1138,7 +1138,7 @@ public class ExtractMethodNewTest extends LightJavaCodeInsightTestCase {
}
public void testPatternVariable() throws Exception {
doTestWithLanguageLevel(LanguageLevel.JDK_14_PREVIEW);
doTestWithLanguageLevel(LanguageLevel.JDK_15_PREVIEW);
}
public void testPatternVariableIntroduced() throws Exception {
@@ -1150,7 +1150,7 @@ public class ExtractMethodNewTest extends LightJavaCodeInsightTestCase {
}
public void testPatternVariableIntroduced3() throws Exception {
doTestWithLanguageLevel(LanguageLevel.JDK_14_PREVIEW);
doTestWithLanguageLevel(LanguageLevel.JDK_15_PREVIEW);
}
public void testSuggestChangeSignatureWithChangedParameterName() throws Exception {

4
java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodTest.java
View File

@@ -942,7 +942,7 @@ public class ExtractMethodTest extends LightJavaCodeInsightTestCase {
}
public void testPatternVariable() throws Exception {
doTestWithLanguageLevel(LanguageLevel.JDK_14_PREVIEW);
doTestWithLanguageLevel(LanguageLevel.JDK_15_PREVIEW);
}
public void testPatternVariableIntroduced() throws Exception {
@@ -954,7 +954,7 @@ public class ExtractMethodTest extends LightJavaCodeInsightTestCase {
}
public void testPatternVariableIntroduced3() throws Exception {
doTestWithLanguageLevel(LanguageLevel.JDK_14_PREVIEW);
doTestWithLanguageLevel(LanguageLevel.JDK_15_PREVIEW);
}
public void testSuggestChangeSignatureWithChangedParameterName() throws Exception {

Some files were not shown because too many files have changed in this diff Show More