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

Java: add missing newline error on text block fragment (IJ-CR-113878)

Browse Source 
GitOrigin-RevId: a62cddecc6b6974ffedbcfcd179fe675aa74112e
This commit is contained in:
Bas Leijdekkers
2023-08-31 12:47:15 +02:00
committed by intellij-monorepo-bot
parent bf4ea53ca5
commit 0aebe230e8
3 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
View File

@@ -1455,21 +1455,10 @@ public final class HighlightUtil {
return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(p, p).endOfLine().descriptionAndTooltip(message);
}
else if (text.length() > 3) {
int i = 3;
char c = text.charAt(i);
while (PsiLiteralUtil.isTextBlockWhiteSpace(c)) {
i++;
c = text.charAt(i);
}
if (c != '\n' && c != '\r') {
String message = JavaErrorBundle.message("text.block.new.line");
if (description != null) {
description.set(message);
}
return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(expression).descriptionAndTooltip(message);
}
final HighlightInfo.Builder info = checkStringTemplateEscapes(expression, text, level, file, description);
if (info != null) return info;
final HighlightInfo.Builder info1 = checkTextBlockNewlineAfterOpeningQuotes(expression, text, description);
if (info1 != null) return info1;
final HighlightInfo.Builder info2 = checkStringTemplateEscapes(expression, text, level, file, description);
if (info2 != null) return info2;
final int rawLength = rawText.length();
StringBuilder chars = new StringBuilder(rawLength);
int[] offsets = new int[rawLength + 1];
@@ -1525,8 +1514,31 @@ public final class HighlightUtil {
return null;
}
private static HighlightInfo.Builder checkTextBlockNewlineAfterOpeningQuotes(@NotNull PsiElement expression,
String text,
@Nullable Ref<? super String> description) {
int i = 3;
char c = text.charAt(i);
while (PsiLiteralUtil.isTextBlockWhiteSpace(c)) {
i++;
c = text.charAt(i);
}
if (c != '\n' && c != '\r') {
String message = JavaErrorBundle.message("text.block.new.line");
if (description != null) {
description.set(message);
}
return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(expression, TextRange.from(0, 3)).descriptionAndTooltip(message);
}
return null;
}
public static HighlightInfo.Builder checkFragmentError(PsiFragment fragment) {
String text = fragment.getText();
if (fragment.getTokenType() == JavaTokenType.TEXT_BLOCK_TEMPLATE_BEGIN) {
final HighlightInfo.Builder info1 = checkTextBlockNewlineAfterOpeningQuotes(fragment, text, null);
if (info1 != null) return info1;
}
int length = text.length();
if (fragment.getTokenType() == JavaTokenType.STRING_TEMPLATE_END) {
if (!StringUtil.endsWithChar(text, '\"') || length == 1) {

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingStringTemplates/StringTemplates.java
View File

@@ -104,4 +104,8 @@ class X {
public static void testCapturedWilcard(StringTemplate.Processor<?, ?> str) {
Object s = <error descr="Unhandled exception: java.lang.Throwable">str."";</error>
}
public static void noNewlineAfterTextBlockOpeningQuotes() {
System.out.println(STR.<error descr="Illegal text block start: missing new line after opening quotes">"""</error>\{}""");
}
}

6
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/textBlocks/TextBlocks.java
View File

@@ -1,9 +1,9 @@
class C {
String empty = """
""";
String invalid1 = <error descr="Illegal text block start: missing new line after opening quotes">""""""</error>;
String invalid2 = <error descr="Illegal text block start: missing new line after opening quotes">""" """</error>;
String invalid3 = <error descr="Illegal text block start: missing new line after opening quotes">"""\\n """</error>;
String invalid1 = <error descr="Illegal text block start: missing new line after opening quotes">"""</error>""";
String invalid2 = <error descr="Illegal text block start: missing new line after opening quotes">"""</error> """;
String invalid3 = <error descr="Illegal text block start: missing new line after opening quotes">"""</error>\\n """;
String s9 = "\s";
String s10 = " <error descr="Illegal escape character in string literal">\ </error>";