diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertStringLiteralToRawAction.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertStringLiteralToRawAction.java index 1f12005af483..00c56ad85a23 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertStringLiteralToRawAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertStringLiteralToRawAction.java @@ -67,11 +67,11 @@ public class ConvertStringLiteralToRawAction implements IntentionAction, LowPrio prefix = "\"" + StringUtil.repeat("`", startingSeq) + "\" + "; } String suffix = ""; - int tailingSequence = PsiRawStringLiteralUtil.getTailingTicsSequence(text); - if (tailingSequence > 0) { - suffix = "+ \"" + StringUtil.repeat("`", tailingSequence) + "\""; + int trailingSequence = PsiRawStringLiteralUtil.getTrailingTicsSequence(text); + if (trailingSequence > 0) { + suffix = "+ \"" + StringUtil.repeat("`", trailingSequence) + "\""; } - String textTicsTrimmed = text.substring(Math.max(startingSeq, 0), text.length() - Math.max(tailingSequence, 0)); + String textTicsTrimmed = text.substring(Math.max(startingSeq, 0), text.length() - Math.max(trailingSequence, 0)); String additionalQuotes = PsiRawStringLiteralUtil.getAdditionalTics(textTicsTrimmed, "`"); PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(project); CodeStyleManager.getInstance(project).reformat( diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/RawStringLiteralPasteProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/RawStringLiteralPasteProcessor.java index 000406ff1184..280abcf24384 100644 --- a/java/java-impl/src/com/intellij/codeInsight/editorActions/RawStringLiteralPasteProcessor.java +++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/RawStringLiteralPasteProcessor.java @@ -43,7 +43,7 @@ public class RawStringLiteralPasteProcessor implements PasteProvider { if (stringLiteral == null) return; int leadingTicsSequence = PsiRawStringLiteralUtil.getLeadingTicsSequence(text); - int tailingTicsSequence = PsiRawStringLiteralUtil.getTailingTicsSequence(text); + int trailingTicsSequence = PsiRawStringLiteralUtil.getTrailingTicsSequence(text); String prefix = ""; TextRange textRange = stringLiteral.getTextRange(); @@ -53,9 +53,9 @@ public class RawStringLiteralPasteProcessor implements PasteProvider { } String suffix = ""; - if (offset == textRange.getEndOffset() - 1 && tailingTicsSequence > 0) { - suffix = "+ \"" + StringUtil.repeat("`", tailingTicsSequence) + "\""; - text = text.substring(0, text.length() - tailingTicsSequence); + if (offset == textRange.getEndOffset() - 1 && trailingTicsSequence > 0) { + suffix = "+ \"" + StringUtil.repeat("`", trailingTicsSequence) + "\""; + text = text.substring(0, text.length() - trailingTicsSequence); } String literalText = stringLiteral.getText(); diff --git a/java/java-psi-api/src/com/intellij/psi/PsiRawStringLiteralUtil.java b/java/java-psi-api/src/com/intellij/psi/PsiRawStringLiteralUtil.java index 71a25bf6bae1..a2cd0694a36f 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiRawStringLiteralUtil.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiRawStringLiteralUtil.java @@ -35,9 +35,9 @@ public class PsiRawStringLiteralUtil { } /** - * Return number of tailing tics in the text + * Return number of trailing tics in the text */ - public static int getTailingTicsSequence(String text) { + public static int getTrailingTicsSequence(String text) { int length = text.length(); while (length > 0 && text.charAt(length - 1) == '`') length--; return text.length() - length;