From eef0fdab89060226f1790fbd7b895e151cf2756d Mon Sep 17 00:00:00 2001 From: Dmitry Trofimov Date: Tue, 3 Apr 2012 14:31:53 +0200 Subject: [PATCH] Fixed django file completion in unicode strings (PY-5998). --- .../src/com/intellij/openapi/util/text/StringUtil.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java index cc4a6340f6ac..229a7012f90e 100644 --- a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java +++ b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java @@ -151,7 +151,7 @@ public class StringUtil extends StringUtilRt { i = i1 + oldS.length(); } } - return newText!= null ? newText.toString():""; + return newText != null ? newText.toString() : ""; } /** @@ -1917,13 +1917,14 @@ public class StringUtil extends StringUtilRt { int slashRIndex = -1; if (chars != null) { - for(int i = 0, len = s.length(); i < len; ++i) { + for (int i = 0, len = s.length(); i < len; ++i) { if (chars[i] == '\r') { slashRIndex = i; break; } } - } else { + } + else { for (int i = 0, len = s.length(); i < len; i++) { if (s.charAt(i) == '\r') { slashRIndex = i; @@ -1933,7 +1934,8 @@ public class StringUtil extends StringUtilRt { } if (slashRIndex != -1) { - String context = String.valueOf(last(s.subSequence(0, slashRIndex), 10, true)) + first(s.subSequence(slashRIndex, s.length()), 10, true); + String context = + String.valueOf(last(s.subSequence(0, slashRIndex), 10, true)) + first(s.subSequence(slashRIndex, s.length()), 10, true); context = escapeStringCharacters(context); LOG.error("Wrong line separators: '" + context + "' at offset " + slashRIndex); }