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

TextBlockBackwardMigrationInspection: better formatting, moved escapeQuotes method to PsiLiteralUtil (IDEA-CR-52057)

Browse Source 
GitOrigin-RevId: 3f14ac5682f2839f0fc69f9db82be3c545d0a149
This commit is contained in:
Artemiy Sartakov
2019-09-06 07:32:52 +00:00
committed by intellij-monorepo-bot
parent 3dcf4c488b
commit 5e36548e0e
6 changed files with 97 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/TextBlockBackwardMigrationInspection.java
+15 -68
View File
@@ -1,14 +1,15 @@
// Copyright 2000-2019 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.
package com.intellij.codeInspection;
import com.intellij.application.options.CodeStyle;
import com.intellij.codeInsight.daemon.impl.analysis.HighlightUtil;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.project.Project;
import com.intellij.psi.JavaElementVisitor;
import com.intellij.psi.JavaTokenType;
import com.intellij.psi.PsiElementVisitor;
import com.intellij.psi.PsiLiteralExpression;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.impl.source.tree.java.PsiLiteralExpressionImpl;
import com.siyeh.ig.PsiReplacementUtil;
import com.intellij.psi.util.PsiLiteralUtil;
import com.siyeh.ig.psiutils.CommentTracker;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
@@ -53,7 +54,14 @@ public class TextBlockBackwardMigrationInspection extends AbstractBaseJavaLocalI
String text = literalExpression.getTextBlockText();
if (text == null) return;
String replacement = convertToConcatenation(text);
PsiReplacementUtil.replaceExpression(literalExpression, replacement, new CommentTracker());
PsiFile file = descriptor.getPsiElement().getContainingFile();
if (file == null) return;
CodeStyleSettings tempSettings = CodeStyle.getSettings(file);
tempSettings.getCommonSettings(JavaLanguage.INSTANCE).ALIGN_MULTILINE_BINARY_OPERATION = true;
CodeStyle.doWithTemporarySettings(project, tempSettings, () -> {
PsiElement result = new CommentTracker().replaceAndRestoreComments(literalExpression, replacement);
CodeStyleManager.getInstance(literalExpression.getProject()).reformat(result);
});
}
@NotNull
@@ -65,70 +73,9 @@ public class TextBlockBackwardMigrationInspection extends AbstractBaseJavaLocalI
String line = lines[i];
boolean addNewLine = i != lines.length - 1;
if (!addNewLine && line.isEmpty()) break;
joiner.add("\"" + escapeQuotes(line) + (addNewLine ? "\\n\"" : "\""));
joiner.add("\"" + PsiLiteralUtil.escapeQuotes(line) + (addNewLine ? "\\n\"" : "\""));
}
return joiner.toString();
}
@NotNull
private static String escapeQuotes(@NotNull String str) {
StringBuilder sb = new StringBuilder(str.length());
int nSlashes = 0;
int idx = 0;
while (idx < str.length()) {
char c = str.charAt(idx);
int nextIdx = parseBackSlash(str, idx);
if (nextIdx > 0) {
nSlashes++;
}
else {
if (c == '\"' && nSlashes % 2 == 0) {
sb.append('\\');
}
nSlashes = 0;
nextIdx = idx + 1;
}
sb.append(c);
idx = nextIdx;
}
return sb.toString();
}
private static int parseBackSlash(@NotNull String str, int idx) {
char c = str.charAt(idx);
if (c != '\\') return -1;
int nextIdx = parseHexBackSlash(str, idx);
if (nextIdx > 0) return nextIdx;
nextIdx = parseOctalBackSlash(str, idx);
return nextIdx > 0 ? nextIdx : idx + 1;
}
private static int parseHexBackSlash(@NotNull String str, int idx) {
int next = idx + 1;
if (next >= str.length() || str.charAt(next) != 'u') return -1;
while (str.charAt(next) == 'u') {
next++;
}
if (next + 3 >= str.length()) return -1;
try {
int code = Integer.parseInt(str.substring(next, next + 4), 16);
if (code == '\\') return next + 4;
}
catch (NumberFormatException ignored) {
}
return -1;
}
private static int parseOctalBackSlash(@NotNull String str, int idx) {
int next = idx + 1;
if (next + 2 >= str.length()) return -1;
try {
int code = Integer.parseInt(str.substring(next, next + 3), 8);
if (code == '\\') return next + 3;
}
catch (NumberFormatException ignored) {
}
return -1;
}
}
}
java/java-impl/src/inspectionDescriptions/TextBlockBackwardMigration.html
+1 -1
View File
@@ -20,7 +20,7 @@ Example:
"\n" +
"hello();\n");
</code></pre>
<p>This inspection only reports if the language level is 13 Preview</p>
<p>This inspection works if the language level is 13 Preview.</p>
<p><small>New in 2019.3</small></p>
</body>
</html>
java/java-psi-api/src/com/intellij/psi/util/PsiLiteralUtil.java
+66
View File
@@ -186,4 +186,70 @@ public class PsiLiteralUtil {
q -= 3;
}
}
/**
* Replaces all unescaped quotes with escaped ones.
* If text contains backslash escape sequence it's replaced with a regular backslash.
* The rest of the symbols are left unchanged.
*/
@NotNull
public static String escapeQuotes(@NotNull String str) {
StringBuilder sb = new StringBuilder(str.length());
int nSlashes = 0;
int idx = 0;
while (idx < str.length()) {
char c = str.charAt(idx);
int nextIdx = parseBackSlash(str, idx);
if (nextIdx > 0) {
nSlashes++;
}
else {
if (c == '\"' && nSlashes % 2 == 0) {
sb.append('\\');
}
nSlashes = 0;
nextIdx = idx + 1;
}
sb.append(c);
idx = nextIdx;
}
return sb.toString();
}
private static int parseBackSlash(@NotNull String str, int idx) {
char c = str.charAt(idx);
if (c != '\\') return -1;
int nextIdx = parseHexBackSlash(str, idx);
if (nextIdx > 0) return nextIdx;
nextIdx = parseOctalBackSlash(str, idx);
return nextIdx > 0 ? nextIdx : idx + 1;
}
private static int parseHexBackSlash(@NotNull String str, int idx) {
int next = idx + 1;
if (next >= str.length() || str.charAt(next) != 'u') return -1;
while (str.charAt(next) == 'u') {
next++;
}
if (next + 3 >= str.length()) return -1;
try {
int code = Integer.parseInt(str.substring(next, next + 4), 16);
if (code == '\\') return next + 4;
}
catch (NumberFormatException ignored) {
}
return -1;
}
private static int parseOctalBackSlash(@NotNull String str, int idx) {
int next = idx + 1;
if (next + 2 >= str.length()) return -1;
try {
int code = Integer.parseInt(str.substring(next, next + 3), 8);
if (code == '\\') return next + 3;
}
catch (NumberFormatException ignored) {
}
return -1;
}
}
java/java-tests/testData/inspection/textBlockBackwardMigration/afterMultiLine.java
-14
View File
@@ -1,14 +0,0 @@
// "Replace with regular string literal" "true"
class TextBlockMigration {
String multiLine() {
return "public static void print(Object o) {\n" +
" System.out.println(o);\n" +
"}\n" +
"\n" +
"public static void main(String[] args) {\n" +
" print(\"test\");\n" +
"}\n";
}
}
java/java-tests/testData/inspection/textBlockBackwardMigration/afterMultipleStringLiterals.java
+14
View File
@@ -0,0 +1,14 @@
// "Replace with regular string literal" "true"
class TextBlockMigration {
String multipleLiterals() {
return "public static void print(Object o) {\n" +
" System.out.println(o);\n" +
"}\n" +
"\n" +
"public static void main(String[] args) {\n" +
" print(\"test\");\n" +
"}\n";
}
}
java/java-tests/testData/inspection/textBlockBackwardMigration/beforeMultiLine.java → java/java-tests/testData/inspection/textBlockBackwardMigration/beforeMultipleStringLiterals.java
+1 -1
View File
@@ -2,7 +2,7 @@
class TextBlockMigration {
String multiLine() {
String multipleLiterals() {
return """<caret>
public static void print(Object o) {
System.out.println(o);