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

[java-refactoring] Cosmetic; use JavaFeatures

Browse Source 
GitOrigin-RevId: 4a60e9012e90a77a7fd0c0c3bf73619e3f5c2c49
This commit is contained in:
Tagir Valeev
2024-03-16 12:47:07 +00:00
committed by intellij-monorepo-bot
parent 10310458ce
commit 4228eb556f
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
+1 -1
View File
@@ -709,7 +709,7 @@ public class ExtractMethodProcessor implements MatchProvider {
}
private Nullability initNullability() {
if (!PsiUtil.isLanguageLevel5OrHigher(myElements[0]) || PsiUtil.resolveClassInType(myReturnType) == null) return null;
if (!PsiUtil.isAvailable(JavaFeature.ANNOTATIONS, myElements[0]) || PsiUtil.resolveClassInType(myReturnType) == null) return null;
final NullableNotNullManager manager = NullableNotNullManager.getInstance(myProject);
final PsiClass nullableAnnotationClass = JavaPsiFacade.getInstance(myProject)
.findClass(manager.getDefaultNullable(), myElements[0].getResolveScope());
java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/SignatureBuilder.kt
+3 -5
View File
@@ -54,10 +54,8 @@ class SignatureBuilder(private val project: Project) {
}
private fun visibilityCanBeApplied(targetClass: PsiClass, visibility: String): Boolean {
if (targetClass.isInterface) {
return PsiUtil.isLanguageLevel9OrHigher(targetClass) && visibility == PsiModifier.PRIVATE
}
return true
return !targetClass.isInterface
|| (visibility == PsiModifier.PRIVATE && PsiUtil.isAvailable(JavaFeature.PRIVATE_INTERFACE_METHODS, targetClass))
}
private fun createParameterList(inputParameters: List<InputParameter>, scope: List<PsiElement>): PsiParameterList {
@@ -69,7 +67,7 @@ class SignatureBuilder(private val project: Project) {
if (inputParameters.isEmpty()) return parameterList
val element = inputParameters.first().references.first()
val useDefaultFinal = JavaCodeStyleSettings.getInstance(scope.first().project).GENERATE_FINAL_PARAMETERS
val useDefaultFinal = JavaCodeStyleSettings.getInstance(scope.first().containingFile).GENERATE_FINAL_PARAMETERS
inputParameters.forEach { parameter ->
val shouldBeFinal = when {
java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/ThreadLocalConversionRule.java
+3 -3
View File
@@ -46,7 +46,7 @@ public final class ThreadLocalConversionRule extends TypeConversionRule {
return false;
}
final PsiTypeParameter[] typeParameters = threadLocalClass.getTypeParameters();
if (typeParameters.length != 1) return !PsiUtil.isLanguageLevel5OrHigher(context);
if (typeParameters.length != 1) return !PsiUtil.isAvailable(JavaFeature.GENERICS, context);
final PsiType toTypeParameterValue = resolveResult.getSubstitutor().substitute(typeParameters[0]);
if (toTypeParameterValue != null) {
if (from instanceof PsiPrimitiveType) {
@@ -172,11 +172,11 @@ public final class ThreadLocalConversionRule extends TypeConversionRule {
}
final StringBuilder result = new StringBuilder("new ");
result.append(to.getCanonicalText()).append("() {\n");
if (PsiUtil.isLanguageLevel5OrHigher(context)) {
if (PsiUtil.isAvailable(JavaFeature.ANNOTATIONS, context)) {
result.append(" @").append(CommonClassNames.JAVA_LANG_OVERRIDE).append("\n");
}
result.append(" protected ")
.append(PsiUtil.isLanguageLevel5OrHigher(context) ? to.getParameters()[0].getCanonicalText() : CommonClassNames.JAVA_LANG_OBJECT)
.append(PsiUtil.isAvailable(JavaFeature.GENERICS, context) ? to.getParameters()[0].getCanonicalText() : CommonClassNames.JAVA_LANG_OBJECT)
.append(" initialValue() {\n")
.append(" return ")
.append(coerceType("$qualifier$", from, to, context)).append(";\n")