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-inspections] TextBlockMigration: do not report if there are comments in-between

Browse Source 
GitOrigin-RevId: 970d43e2694bccc0ca98c7ad3abb61477e4d937f
This commit is contained in:
Tagir Valeev
2022-09-27 18:02:25 +00:00
committed by intellij-monorepo-bot
parent 6bef5e0cbe
commit c3f0e4decd
25 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl-inspections/src/com/intellij/codeInspection/TextBlockMigrationInspection.java
+6 -2
View File
@@ -12,6 +12,7 @@ import com.intellij.profile.codeInspection.InspectionProjectProfileManager;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiLiteralUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.containers.ContainerUtil;
import com.siyeh.ig.psiutils.CommentTracker;
import com.siyeh.ig.psiutils.ExpressionUtils;
import org.jetbrains.annotations.Nls;
@@ -62,13 +63,16 @@ public class TextBlockMigrationInspection extends AbstractBaseJavaLocalInspectio
newLineIdx = getNewLineIndex(text, newLineIdx + 1);
}
}
if (nNewLines > 1) {
boolean hasComments = ContainerUtil.exists(expression.getChildren(), child -> child instanceof PsiComment);
boolean reportWarning = nNewLines > 1 && !hasComments;
boolean reportInfo = isOnTheFly && (hasEscapedQuotes || hasComments);
if (reportWarning) {
boolean quickFixOnly = isOnTheFly && InspectionProjectProfileManager.isInformationLevel(getShortName(), expression);
holder.registerProblem(expression, quickFixOnly ? null : firstNewLineTextRange,
JavaBundle.message("inspection.text.block.migration.concatenation.message"),
new ReplaceWithTextBlockFix());
}
else if (isOnTheFly && hasEscapedQuotes) {
else if (reportInfo) {
holder.registerProblem(expression,
JavaBundle.message("inspection.text.block.migration.string.message"),
ProblemHighlightType.INFORMATION, new ReplaceWithTextBlockFix());
java/java-tests/testData/inspection/textBlockMigration/afterConcatenationNoNewLineInTheEnd.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/afterConcatenationWithEscapedNewLine.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/afterConcatenationWithEscapedQuotesWithoutLineBreaks.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/afterConcatenationWithIndentAndBlankLine.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/afterConcatenationWithIndentAndLineSplitOnWhitespace.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/afterConcatenationWithMultipleNewLines.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/afterConcatenationWithNonStrings.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/afterConcatenationWithSpacesAtTheBeginning.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "INFORMATION-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/afterConcatenationWithSpacesInTheEnd.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/afterConcatenationWithThreeQuotesInText.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/afterLiteralWithEscapedQuotes.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/afterLiteralWithInjection.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
import org.intellij.lang.annotations.Language;
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/beforeConcatenationNoNewLineInTheEnd.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/beforeConcatenationWithEscapedNewLine.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/beforeConcatenationWithEscapedQuotesWithoutLineBreaks.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/beforeConcatenationWithIndentAndBlankLine.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/beforeConcatenationWithIndentAndLineSplitOnWhitespace.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/beforeConcatenationWithMultipleNewLines.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/beforeConcatenationWithNonStrings.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/beforeConcatenationWithSpacesAtTheBeginning.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "INFORMATION-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/beforeConcatenationWithSpacesInTheEnd.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/beforeConcatenationWithThreeQuotesInText.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/beforeLiteralWithEscapedQuotes.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
class TextBlockMigration {
java/java-tests/testData/inspection/textBlockMigration/beforeLiteralWithInjection.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Replace with text block" "true"
// "Replace with text block" "true-preview"
import org.intellij.lang.annotations.Language;
class TextBlockMigration {