diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterEmptyLastLine.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/EmptyLastLine.after.java similarity index 64% rename from java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterEmptyLastLine.java rename to java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/EmptyLastLine.after.java index 6c25fbd5d163..9ce71fc1c76f 100644 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterEmptyLastLine.java +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/EmptyLastLine.after.java @@ -1,5 +1,3 @@ -// "Remove trailing whitespace characters" "true" - class Foo { void test() { String colors = """ diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/EmptyLastLine.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/EmptyLastLine.java new file mode 100644 index 000000000000..91474f3ae625 --- /dev/null +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/EmptyLastLine.java @@ -0,0 +1,8 @@ +class Foo { + void test() { + String colors = """ + red + """; + } +} + diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterOneLineBlock.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/OneLineBlock.after.java similarity index 58% rename from java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterOneLineBlock.java rename to java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/OneLineBlock.after.java index 2f484e6fe54d..917e5b34b480 100644 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterOneLineBlock.java +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/OneLineBlock.after.java @@ -1,5 +1,3 @@ -// "Remove trailing whitespace characters" "true" - class Foo { void test() { String colors = """ diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/OneLineBlock.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/OneLineBlock.java new file mode 100644 index 000000000000..33a5b8f9f2fe --- /dev/null +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/OneLineBlock.java @@ -0,0 +1,7 @@ +class Foo { + void test() { + String colors = """ + red """; + } +} + diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterReplaceAtTheEnd.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/ReplaceAtTheEnd.after.java similarity index 61% rename from java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterReplaceAtTheEnd.java rename to java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/ReplaceAtTheEnd.after.java index 82d8d70bcd44..4422b0048cca 100644 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterReplaceAtTheEnd.java +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/ReplaceAtTheEnd.after.java @@ -1,5 +1,3 @@ -// "Escape trailing whitespace characters" "true" - class Foo { void test() { String text = """ diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/ReplaceAtTheEnd.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/ReplaceAtTheEnd.java new file mode 100644 index 000000000000..4b47a73602e9 --- /dev/null +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/ReplaceAtTheEnd.java @@ -0,0 +1,6 @@ +class Foo { + void test() { + String text = """ + hello """; + } +} diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterStringTemplate1Java21Preview.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate1Java21Preview.after.java similarity index 66% rename from java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterStringTemplate1Java21Preview.java rename to java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate1Java21Preview.after.java index 1434c85a1434..c922b3af0ac8 100644 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterStringTemplate1Java21Preview.java +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate1Java21Preview.after.java @@ -1,5 +1,3 @@ -// "Escape trailing whitespace characters" "true" - class StringTemplate1 { String s = STR.""" \{}one\s diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate1Java21Preview.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate1Java21Preview.java new file mode 100644 index 000000000000..353f66a1414b --- /dev/null +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate1Java21Preview.java @@ -0,0 +1,6 @@ +class StringTemplate1 { + String s = STR.""" + \{}one + two + four" """; +} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterStringTemplate2Java21Preview.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate2Java21Preview.after.java similarity index 61% rename from java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterStringTemplate2Java21Preview.java rename to java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate2Java21Preview.after.java index 9c0a7dff3bb5..915850737fde 100644 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterStringTemplate2Java21Preview.java +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate2Java21Preview.after.java @@ -1,5 +1,3 @@ -// "Escape trailing whitespace characters" "true" - class StringTemplate2 { String s = STR.""" yes\s diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate2Java21Preview.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate2Java21Preview.java new file mode 100644 index 000000000000..f356e868194f --- /dev/null +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate2Java21Preview.java @@ -0,0 +1,5 @@ +class StringTemplate2 { + String s = STR.""" + yes + \{}one"""; +} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterStringTemplate3Java21Preview.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate3Java21Preview.after.java similarity index 100% rename from java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterStringTemplate3Java21Preview.java rename to java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate3Java21Preview.after.java diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeStringTemplate3Java21Preview.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate3Java21Preview.java similarity index 53% rename from java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeStringTemplate3Java21Preview.java rename to java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate3Java21Preview.java index 6869b8b46f16..afdfe7628bb2 100644 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeStringTemplate3Java21Preview.java +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate3Java21Preview.java @@ -2,6 +2,6 @@ class StringTemplate2 { String s = STR.""" - before\{} + before\{} \{}after"""; } \ No newline at end of file diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterStringTemplate4Java21Preview.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate4Java21Preview.after.java similarity index 54% rename from java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterStringTemplate4Java21Preview.java rename to java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate4Java21Preview.after.java index 615a832b940c..4050d7e02a2b 100644 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterStringTemplate4Java21Preview.java +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate4Java21Preview.after.java @@ -1,5 +1,3 @@ -// "Escape trailing whitespace characters" "true" - class StringTemplate1 { String s = STR.""" \{}one\s diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate4Java21Preview.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate4Java21Preview.java new file mode 100644 index 000000000000..0bee8bf51abe --- /dev/null +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/StringTemplate4Java21Preview.java @@ -0,0 +1,5 @@ +class StringTemplate1 { + String s = STR.""" +\{}one +"""; +} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterTrailingTabs.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/TrailingSpaces.after.java similarity index 65% rename from java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterTrailingTabs.java rename to java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/TrailingSpaces.after.java index a5e54736ac90..60e0273c7000 100644 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterTrailingTabs.java +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/TrailingSpaces.after.java @@ -1,5 +1,3 @@ -// "Remove trailing whitespace characters" "true" - class Foo { void test() { String colors = """ @@ -8,3 +6,4 @@ class Foo { """; } } + diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/TrailingSpaces.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/TrailingSpaces.java new file mode 100644 index 000000000000..5139734fffab --- /dev/null +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/TrailingSpaces.java @@ -0,0 +1,9 @@ +class Foo { + void test() { + String colors = """ + red + green +"""; + } +} + diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterTrailingSpaces.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/TrailingTabs.after.java similarity index 63% rename from java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterTrailingSpaces.java rename to java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/TrailingTabs.after.java index 72569bacc114..1515845aa9c4 100644 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterTrailingSpaces.java +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/TrailingTabs.after.java @@ -1,5 +1,3 @@ -// "Remove trailing whitespace characters" "true" - class Foo { void test() { String colors = """ @@ -8,4 +6,3 @@ class Foo { """; } } - diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/TrailingTabs.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/TrailingTabs.java new file mode 100644 index 000000000000..8b6fd9c7387e --- /dev/null +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/TrailingTabs.java @@ -0,0 +1,8 @@ +class Foo { + void test() { + String colors = """ + red + green +"""; + } +} diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterWithBlankLines.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithBlankLines.after.java similarity index 73% rename from java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterWithBlankLines.java rename to java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithBlankLines.after.java index 162927307ade..71833d4ae922 100644 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterWithBlankLines.java +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithBlankLines.after.java @@ -1,5 +1,3 @@ -// "Remove trailing whitespace characters" "true" - class Foo { void test() { String colors = """ diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithBlankLines.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithBlankLines.java new file mode 100644 index 000000000000..cd03af45e8b1 --- /dev/null +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithBlankLines.java @@ -0,0 +1,20 @@ +class Foo { + void test() { + String colors = """ + + + + red + + + + green + + + + blue + + + orange """; + + \ No newline at end of file diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterWithEndQuotes.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithEndQuotes.after.java similarity index 91% rename from java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterWithEndQuotes.java rename to java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithEndQuotes.after.java index 27bc42b397cf..96863469e5ec 100644 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterWithEndQuotes.java +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithEndQuotes.after.java @@ -1,4 +1,3 @@ -// "Fix all 'Trailing whitespace in text block' problems in file" "true" class Foo { void test() { String text = """ diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithEndQuotes.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithEndQuotes.java new file mode 100644 index 000000000000..99a9b7ec1693 --- /dev/null +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithEndQuotes.java @@ -0,0 +1,32 @@ +class Foo { + void test() { + String text = """ + text" """; + String text2 = """ + " """; + String text3 = """ + test\" """; + String text4 = """ + test\\" """; + String text5 = """ + \" """; + String text6 = """ + \\" """; + String text7 = """ + \\\" """; + String text8 = """ + \\\\" """; + String text9 = """ + \\\\\" """; + String text10 = """ + \u005C" """; + String text11 = """ + \u005C\u005C" """; + String text12 = """ + \u005C\u005C\u005C" """; + String text13 = """ + \u005C " """; + String text14 = """ + \u005C\u005C\u005C\u005C" """; + } +} diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterWithUnicodeEscapes.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithUnicodeEscapes.after.java similarity index 65% rename from java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterWithUnicodeEscapes.java rename to java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithUnicodeEscapes.after.java index 5c11d157ad1c..4b9e949400f0 100644 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/afterWithUnicodeEscapes.java +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithUnicodeEscapes.after.java @@ -1,5 +1,3 @@ -// "Escape trailing whitespace characters" "true" - class Foo { void test() { String colors = """ diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithUnicodeEscapes.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithUnicodeEscapes.java new file mode 100644 index 000000000000..8be2c8fd6df5 --- /dev/null +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithUnicodeEscapes.java @@ -0,0 +1,8 @@ +class Foo { + void test() { + String colors = """ + red\040\t + green +"""; + } +} diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeWithoutTrailingSpaces.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithoutTrailingSpaces.java similarity index 55% rename from java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeWithoutTrailingSpaces.java rename to java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithoutTrailingSpaces.java index 6dda3353de07..69ca9c39809a 100644 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeWithoutTrailingSpaces.java +++ b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/WithoutTrailingSpaces.java @@ -1,5 +1,3 @@ -// "Fix all 'Trailing whitespace in text block' problems in file" "false" - class Foo { void test() { String colors = """ diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeEmptyLastLine.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeEmptyLastLine.java deleted file mode 100644 index ca5a6710f18d..000000000000 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeEmptyLastLine.java +++ /dev/null @@ -1,10 +0,0 @@ -// "Remove trailing whitespace characters" "true" - -class Foo { - void test() { - String colors = """ - red - """; - } -} - diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeOneLineBlock.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeOneLineBlock.java deleted file mode 100644 index 589b68b6a7b9..000000000000 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeOneLineBlock.java +++ /dev/null @@ -1,9 +0,0 @@ -// "Remove trailing whitespace characters" "true" - -class Foo { - void test() { - String colors = """ - red """; - } -} - diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeReplaceAtTheEnd.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeReplaceAtTheEnd.java deleted file mode 100644 index 8762469a7a4c..000000000000 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeReplaceAtTheEnd.java +++ /dev/null @@ -1,8 +0,0 @@ -// "Escape trailing whitespace characters" "true" - -class Foo { - void test() { - String text = """ - hello """; - } -} diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeStringTemplate1Java21Preview.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeStringTemplate1Java21Preview.java deleted file mode 100644 index af9c468385d9..000000000000 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeStringTemplate1Java21Preview.java +++ /dev/null @@ -1,8 +0,0 @@ -// "Escape trailing whitespace characters" "true" - -class StringTemplate1 { - String s = STR.""" - \{}one - two - four" """; -} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeStringTemplate2Java21Preview.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeStringTemplate2Java21Preview.java deleted file mode 100644 index 9c8bb576691c..000000000000 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeStringTemplate2Java21Preview.java +++ /dev/null @@ -1,7 +0,0 @@ -// "Escape trailing whitespace characters" "true" - -class StringTemplate2 { - String s = STR.""" - yes - \{}one"""; -} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeStringTemplate4Java21Preview.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeStringTemplate4Java21Preview.java deleted file mode 100644 index 0a56ffb6d1a4..000000000000 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeStringTemplate4Java21Preview.java +++ /dev/null @@ -1,7 +0,0 @@ -// "Escape trailing whitespace characters" "true" - -class StringTemplate1 { - String s = STR.""" -\{}one -"""; -} \ No newline at end of file diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeTrailingSpaces.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeTrailingSpaces.java deleted file mode 100644 index 1fbc6728cb68..000000000000 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeTrailingSpaces.java +++ /dev/null @@ -1,11 +0,0 @@ -// "Remove trailing whitespace characters" "true" - -class Foo { - void test() { - String colors = """ - red - green -"""; - } -} - diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeTrailingTabs.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeTrailingTabs.java deleted file mode 100644 index a4081bc05433..000000000000 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeTrailingTabs.java +++ /dev/null @@ -1,10 +0,0 @@ -// "Remove trailing whitespace characters" "true" - -class Foo { - void test() { - String colors = """ - red - green -"""; - } -} diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeWithBlankLines.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeWithBlankLines.java deleted file mode 100644 index 1997f0404965..000000000000 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeWithBlankLines.java +++ /dev/null @@ -1,21 +0,0 @@ -// "Remove trailing whitespace characters" "true" - -class Foo { - void test() { - String colors = """ - - - - red - - - - green - - - - blue - - - orange """; - diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeWithEndQuotes.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeWithEndQuotes.java deleted file mode 100644 index e41b4dcdf7a7..000000000000 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeWithEndQuotes.java +++ /dev/null @@ -1,33 +0,0 @@ -// "Fix all 'Trailing whitespace in text block' problems in file" "true" -class Foo { - void test() { - String text = """ - text" """; - String text2 = """ - " """; - String text3 = """ - test\" """; - String text4 = """ - test\\" """; - String text5 = """ - \" """; - String text6 = """ - \\" """; - String text7 = """ - \\\" """; - String text8 = """ - \\\\" """; - String text9 = """ - \\\\\" """; - String text10 = """ - \u005C" """; - String text11 = """ - \u005C\u005C" """; - String text12 = """ - \u005C\u005C\u005C" """; - String text13 = """ - \u005C " """; - String text14 = """ - \u005C\u005C\u005C\u005C" """; - } -} diff --git a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeWithUnicodeEscapes.java b/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeWithUnicodeEscapes.java deleted file mode 100644 index 45c63d1d2fab..000000000000 --- a/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock/beforeWithUnicodeEscapes.java +++ /dev/null @@ -1,10 +0,0 @@ -// "Escape trailing whitespace characters" "true" - -class Foo { - void test() { - String colors = """ - red\040\t - green -"""; - } -} diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/TrailingWhitespacesInTextBlockInspectionTest.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/TrailingWhitespacesInTextBlockInspectionTest.java index 7067e44507ca..1231a69afbd9 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/TrailingWhitespacesInTextBlockInspectionTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/TrailingWhitespacesInTextBlockInspectionTest.java @@ -1,19 +1,51 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.java.codeInspection; -import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase; -import com.intellij.codeInspection.LocalInspectionTool; +import com.intellij.codeInspection.InspectionProfileEntry; import com.intellij.codeInspection.TrailingWhitespacesInTextBlockInspection; +import com.intellij.testFramework.LightProjectDescriptor; +import com.siyeh.ig.LightJavaInspectionTestCase; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +public class TrailingWhitespacesInTextBlockInspectionTest extends LightJavaInspectionTestCase { + + public void testEmptyLastLine() { doTestAll(); } + public void testOneLineBlock() { doTestAll(); } + public void testReplaceAtTheEnd() { doTestEscape(); } + public void testStringTemplate1Java21Preview() { doTestEscape(); } + public void testStringTemplate2Java21Preview() { doTestEscape(); } + public void testStringTemplate3Java21Preview() { doTestEscape(); } + public void testStringTemplate4Java21Preview() { doTestEscape(); } + public void testTrailingSpaces() { doTestAll(); } + public void testTrailingTabs() { doTestAll(); } + public void testWithBlankLines() { doTestAll(); } + public void testWithEndQuotes() { doTestAll(); } + public void testWithoutTrailingSpaces() { doTest(); } + public void testWithUnicodeEscapes() { doTestEscape(); } -public class TrailingWhitespacesInTextBlockInspectionTest extends LightQuickFixParameterizedTestCase { @Override - protected LocalInspectionTool @NotNull [] configureLocalInspectionTools() { - return new LocalInspectionTool[]{new TrailingWhitespacesInTextBlockInspection()}; + protected @Nullable InspectionProfileEntry getInspection() { + return new TrailingWhitespacesInTextBlockInspection(); } @Override protected String getBasePath() { - return "/inspection/trailingWhitespacesInTextBlock"; + return "/java/java-tests/testData/inspection/trailingWhitespacesInTextBlock"; + } + + private void doTestEscape() { + doTest(); + checkQuickFix("Escape trailing whitespace characters"); + } + + private void doTestAll() { + doTest(); + checkQuickFixAll(); + } + + @Override + protected @NotNull LightProjectDescriptor getProjectDescriptor() { + return JAVA_21; } }