MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Java. Code Formatting] Disable KEEP_LINE_BREAKS by default in TypeAnnotationFormatterTest

Browse Source 
IDEA-353192

GitOrigin-RevId: cdefb444214d19fcfa762e2ab00fb0e236882d14
This commit is contained in:
Georgii Ustinov
2024-06-19 17:33:46 +03:00
committed by intellij-monorepo-bot
parent 1b99ec9f45
commit 009e515c58
6 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java-tests/testData/psi/formatter/java/typeAnnotation/FullyQualifiedName_after.java
View File

@@ -9,13 +9,11 @@ public class Formatter {
return null;
}
@org.jetbrains.annotations.NotNull
String getNotNullName() {
@org.jetbrains.annotations.NotNull String getNotNullName() {
return "";
}
@org.jetbrains.annotations.Nullable
String getNullableName() {
@org.jetbrains.annotations.Nullable String getNullableName() {
return null;
}
}

3
java/java-tests/testData/psi/formatter/java/typeAnnotation/ImportMix_after.java
View File

@@ -9,8 +9,7 @@ public class Formatter {
return List.of();
}
@NotNull @org.jetbrains.annotations.Nullable
String getNotNullName() {
@NotNull @org.jetbrains.annotations.Nullable String getNotNullName() {
return "";
}
}

6
java/java-tests/testData/psi/formatter/java/typeAnnotation/ImportOnDemand_after.java
View File

@@ -13,13 +13,11 @@ public class Formatter {
return null;
}
@NotNull
String getNotNullName() {
@NotNull String getNotNullName() {
return "";
}
@Nullable
String getNullableName() {
@Nullable String getNullableName() {
return null;
}
}

7
java/java-tests/testData/psi/formatter/java/typeAnnotation/PreserveWrappingManyAnnotations_after.java
View File

@@ -6,14 +6,11 @@ import org.jetbrains.annotations.Nullable;
import java.util.List;
public class Formatter {
@NotNull
@Nullable <T, V> List<T> getStrangeList() {
@NotNull @Nullable <T, V> List<T> getStrangeList() {
return List.of();
}
@NotNull
@Nullable
String getNotNullName() {
@NotNull @Nullable String getNotNullName() {
return "";
}
}

6
java/java-tests/testData/psi/formatter/java/typeAnnotation/PreserveWrappingSingleAnnotation_after.java
View File

@@ -14,13 +14,11 @@ public class Formatter {
return null;
}
@NotNull
String getNotNullName() {
@NotNull String getNotNullName() {
return "";
}
@Nullable
String getNullableName() {
@Nullable String getNullableName() {
return null;
}
}

11
java/java-tests/testSrc/com/intellij/java/psi/formatter/java/TypeAnnotationFormatterTest.kt
View File

@@ -20,6 +20,7 @@ class TypeAnnotationFormatterTest : LightJavaCodeInsightFixtureTestCase() {
override fun setUp() {
super.setUp()
commonSettings.KEEP_LINE_BREAKS = false
commonSettings.METHOD_ANNOTATION_WRAP = WRAP_ALWAYS
ModuleRootModificationUtil.updateModel(module, DefaultLightProjectDescriptor::addJetBrainsAnnotations)
}
@@ -42,15 +43,9 @@ class TypeAnnotationFormatterTest : LightJavaCodeInsightFixtureTestCase() {
fun testImportMix() = doTest()
fun testSpacesInImportList() {
commonSettings.KEEP_LINE_BREAKS = false
doTest()
}
fun testSpacesInImportList() = doTest()
fun testSpacesInFqnAnnotations() {
commonSettings.KEEP_LINE_BREAKS = false
doTest()
}
fun testSpacesInFqnAnnotations() = doTest()
private fun doTest() {
val testName = getTestName(false)