Replacing StringUtil.[un]escapeStringCharacters with more optimized StringEscapeUtil.[un]escape. Some refactoring

python-impl/src/main/java/com/jetbrains/python/impl/buildout/BuildoutFacet.java

@@ -19,8 +19,8 @@
 /**
  * Facet for buildout support.
  * Knows which script in bin/ contains paths we want to add.
- * User: dcheryasov
- * Date: Jul 25, 2010 3:23:50 PM
+ * @author dcheryasov
+ * @since 2010-07-25
  */
 public class BuildoutFacet /*extends Facet<BuildoutFacetConfiguration> implements PythonPathContributingFacet, LibraryContributingFacet */{
 
@@ -201,8 +201,8 @@ public static List<String> extractFromScript(@NotNull VirtualFile script) throws
       if (line.endsWith(",")) {
         line = line.substring(0, line.length() - 1);
       }
-      if (line.startsWith("'") && line.endsWith("'")) {
-        result.add(StringUtil.unescapeStringCharacters(line.substring(1, line.length() - 1)));
+      if (StringEscapeUtil.isQuoted(line, '\'')) {
+        result.add(StringEscapeUtil.unescape(line, 1, line.length() - 1));
       }
       index++;
     }

python-impl/src/main/java/com/jetbrains/python/impl/codeInsight/intentions/PyConvertTripleQuotedStringIntention.java

@@ -17,6 +17,8 @@
 
 import com.jetbrains.python.impl.psi.impl.PyStringLiteralExpressionImpl;
 import com.jetbrains.python.psi.*;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.codeEditor.Editor;
 import consulo.language.editor.intention.BaseIntentionAction;
 import consulo.language.psi.PsiElement;
@@ -26,6 +28,7 @@
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import consulo.python.impl.localize.PyLocalize;
+import consulo.util.lang.StringEscapeUtil;
 import consulo.util.lang.StringUtil;
 import jakarta.annotation.Nonnull;
 
@@ -55,6 +58,8 @@ public LocalizeValue getText() {
         return PyLocalize.intnTripleQuotedString();
     }
 
+    @Override
+    @RequiredReadAction
     public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
         if (!(file instanceof PyFile)) {
             return false;
@@ -82,6 +87,8 @@ public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file
         return false;
     }
 
+    @Override
+    @RequiredWriteAction
     public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
         PyStringLiteralExpression string =
             PsiTreeUtil.getParentOfType(file.findElementAt(editor.getCaretModel().getOffset()), PyStringLiteralExpression.class);
@@ -142,9 +149,7 @@ else if (s.endsWith("'''") || s.endsWith("\"\"\"")) {
             subString = convertToValidSubString(trimmed.substring(0, trimmed.length() - 3), firstQuote);
         }
         else {
-            StringBuilder stringBuilder = new StringBuilder();
-            stringBuilder = StringUtil.escapeStringCharacters(s.length(), s, String.valueOf(firstQuote), true, stringBuilder);
-            subString = stringBuilder.toString();
+            subString = StringEscapeUtil.escape(s, firstQuote);
         }
         return subString;
     }