From 7d59ffde38d6b63ace7b21fc2b91be7e9a3d4bd2 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Wed, 13 May 2020 15:04:08 +0700
Subject: [PATCH] Fixed unnecessarily escaped character

GitOrigin-RevId: 9532833be54e94cfe74dee90f4ca815790d7f5be
---
 .../ui/tree/render/PrimitiveRenderer.java       |  2 +-
 .../ModuleNameLocationComponent.java            |  2 +-
 .../modes/CreateModuleFromSourcesMode.java      |  4 ++--
 .../quickfix/QualifyThisOrSuperArgumentFix.java |  2 +-
 .../CodeStyleGenerationConfigurable.java        |  2 +-
 .../impl/quickfix/PullAsAbstractUpFix.java      |  8 ++++----
 .../StringLiteralCopyPasteProcessor.java        |  2 +-
 .../editorActions/smartEnter/LiteralFixer.java  |  2 +-
 .../extractclass/ExtractClassDialog.java        |  4 ++--
 .../extractclass/ExtractClassProcessor.java     |  4 ++--
 .../InheritanceToDelegationDialog.java          |  4 ++--
 .../InlineSuperClassRefactoringProcessor.java   |  2 +-
 .../usageInfo/ReplaceWithSubtypeUsageInfo.java  |  6 +++---
 .../IntroduceParameterDialog.java               |  2 +-
 .../IntroduceParameterObjectDialog.java         | 14 ++++++++------
 .../usageInfo/AppendAccessorsUsageInfo.java     |  2 +-
 .../JavaMoveClassesOrPackagesHandler.java       |  4 ++--
 .../rename/RenamePsiPackageProcessor.java       |  2 +-
 .../ReplaceConstructorWithBuilderDialog.java    | 17 +++++++++++------
 .../ReplaceConstructorWithFactoryDialog.java    |  2 +-
 .../typeMigration/ui/TypeMigrationDialog.java   |  4 ++--
 .../wrapreturnvalue/WrapReturnValueDialog.java  | 10 +++++-----
 .../highlighter/custom/CustomFileTypeLexer.java |  2 +-
 .../intellij/psi/impl/source/CharTableImpl.java |  2 +-
 .../generation/CommentByLineCommentHandler.java |  2 +-
 .../actions/CodeInspectionAction.java           |  2 +-
 .../ide/util/gotoByName/ChooseByNameBase.java   |  2 +-
 .../actions/ModuleDeleteProvider.java           |  2 +-
 .../templates/TemplateModuleBuilder.java        |  2 +-
 .../psi/search/DefaultSearchScopeProviders.java |  2 +-
 .../rename/AutomaticRenamingDialog.java         |  2 +-
 .../com/intellij/execution/CommandLineUtil.java |  2 +-
 .../LengthOneStringInIndexOfInspection.java     |  2 +-
 .../siyeh/ig/junit/MakePublicStaticVoidFix.java |  6 +++---
 ...zedParametersStaticCollectionInspection.java |  4 ++--
 .../copyright/ui/CopyrightProfilesPanel.java    |  2 +-
 .../TestDataGuessByExistingFilesUtil.java       |  2 +-
 .../config/EclipseClasspathStorageProvider.java | 12 ++++++------
 .../idea/eclipse/conversion/EPathUtil.java      |  2 +-
 .../commands/GitHttpGuiAuthenticator.java       |  2 +-
 .../DefaultUnresolvedExternalDependency.java    |  2 +-
 .../ConvertStringToMultilineIntention.java      |  2 +-
 .../modules/decompiler/exps/ConstExprent.java   |  2 +-
 .../JavaFxBuiltInAttributeDescriptor.java       |  2 +-
 .../descriptors/JavaFxBuiltInTagDescriptor.java |  2 +-
 .../intellij/execution/junit/TestDirectory.java |  2 +-
 .../intellij/junit3/JUnit3IdeaTestRunner.java   | 14 +++++++-------
 .../maven/server/MavenEffectivePomDumper.java   |  2 +-
 .../editor/PropertiesCopyHandler.java           |  2 +-
 .../CombinePropertiesFilesAction.java           |  2 +-
 .../rename/RenamePropertyProcessor.java         |  2 +-
 .../idea/svn/revert/CmdRevertClient.java        |  2 +-
 .../idea/svn/upgrade/CmdUpgradeClient.java      |  2 +-
 .../intellij/tasks/actions/GotoTaskAction.java  |  2 +-
 .../intentions/PyQuotedStringIntention.java     |  2 +-
 .../PyStringConcatenationToFormatIntention.java |  2 +-
 .../inspections/PyStringFormatInspection.java   |  2 +-
 .../smartEnter/fixers/PyStringLiteralFixer.java | 12 ++++++------
 .../debugger/array/AsyncArrayTableModel.java    |  2 +-
 .../completion/XmlAttributeInsertHandler.java   |  2 +-
 .../editorActions/XmlEqTypedHandler.java        |  2 +-
 .../lang/html/HtmlQuotesFormatPreprocessor.java |  2 +-
 .../psi/impl/source/xml/XmlDoctypeImpl.java     |  2 +-
 63 files changed, 114 insertions(+), 107 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/PrimitiveRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/PrimitiveRenderer.java
index 32e27e48b8c5..13604b89abc0 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/PrimitiveRenderer.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/PrimitiveRenderer.java
@@ -85,7 +85,7 @@ public class PrimitiveRenderer extends NodeRendererImpl {
   static void appendCharValue(CharValue value, StringBuilder buf) {
     buf.append('\'');
     String s = value.toString();
-    StringUtil.escapeStringCharacters(s.length(), s, "\'", buf);
+    StringUtil.escapeStringCharacters(s.length(), s, "'", buf);
     buf.append('\'');
   }
 
diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ModuleNameLocationComponent.java b/java/idea-ui/src/com/intellij/ide/projectWizard/ModuleNameLocationComponent.java
index b3743f1c091f..ecfda21c2b7c 100644
--- a/java/idea-ui/src/com/intellij/ide/projectWizard/ModuleNameLocationComponent.java
+++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ModuleNameLocationComponent.java
@@ -212,7 +212,7 @@ public class ModuleNameLocationComponent implements ModuleNameLocationSettings {
       module = ModuleManager.getInstance(project).findModuleByName(moduleName);
     }
     if (module != null) {
-      throw new ConfigurationException("Module \'" + moduleName + "\' already exist in project. Please, specify another name.");
+      throw new ConfigurationException("Module '" + moduleName + "' already exist in project. Please, specify another name.");
     }
   }
 
diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateModuleFromSourcesMode.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateModuleFromSourcesMode.java
index 13e7e780f35d..310d12780828 100644
--- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateModuleFromSourcesMode.java
+++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateModuleFromSourcesMode.java
@@ -55,10 +55,10 @@ public class CreateModuleFromSourcesMode extends CreateFromSourcesMode {
     final String path = myPathPanel.getText().trim();
     final File file = new File(path);
     if (!file.exists()) {
-      throw new ConfigurationException("File \'" + path + "\' doesn't exist");
+      throw new ConfigurationException("File '" + path + "' doesn't exist");
     }
     if (!file.isDirectory()) {
-      throw new ConfigurationException("\'" + path + "\' is not a directory");
+      throw new ConfigurationException("'" + path + "' is not a directory");
     }
     return super.validate();
   }
diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyThisOrSuperArgumentFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyThisOrSuperArgumentFix.java
index 76722a86c378..0b650dbf7342 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyThisOrSuperArgumentFix.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyThisOrSuperArgumentFix.java
@@ -58,7 +58,7 @@ public abstract class QualifyThisOrSuperArgumentFix implements IntentionAction {
   public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
     if (!myExpression.isValid()) return false;
     if (!myPsiClass.isValid()) return false;
-    myText = "Qualify " + getQualifierText() + " expression with \'" + myPsiClass.getQualifiedName() + "\'";
+    myText = "Qualify " + getQualifierText() + " expression with '" + myPsiClass.getQualifiedName() + "'";
     return true;
   }
 
diff --git a/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.java b/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.java
index e2e165b712c3..6da91a0f4a63 100644
--- a/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.java
+++ b/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.java
@@ -191,7 +191,7 @@ public class CodeStyleGenerationConfigurable implements CodeStyleConfigurable {
     text = text.trim();
     if (text.isEmpty()) return text;
     if (!StringUtil.isJavaIdentifier(text)) {
-      throw new ConfigurationException("Not a valid java identifier part in " + (prefix ? "prefix" : "suffix") + " \'" + text + "\'");
+      throw new ConfigurationException("Not a valid java identifier part in " + (prefix ? "prefix" : "suffix") + " '" + text + "'");
     }
     return text;
   }
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PullAsAbstractUpFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PullAsAbstractUpFix.java
index ccdde96dc454..ebde5fddf86d 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PullAsAbstractUpFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PullAsAbstractUpFix.java
@@ -143,25 +143,25 @@ public class PullAsAbstractUpFix extends LocalQuickFixAndIntentionActionOnPsiEle
     final PsiManager manager = containingClass.getManager();
 
     boolean canBePulledUp = true;
-    String name = "Pull method \'" + methodWithOverrides.getName() + "\' up";
+    String name = "Pull method '" + methodWithOverrides.getName() + "' up";
     if (containingClass instanceof PsiAnonymousClass) {
       final PsiClassType baseClassType = ((PsiAnonymousClass)containingClass).getBaseClassType();
       final PsiClass baseClass = baseClassType.resolve();
       if (baseClass == null) return;
       if (!BaseIntentionAction.canModify(baseClass)) return;
       if (!baseClass.hasModifierProperty(PsiModifier.ABSTRACT)) {
-        name = "Pull method \'" + methodWithOverrides.getName() + "\' up and make it abstract";
+        name = "Pull method '" + methodWithOverrides.getName() + "' up and make it abstract";
       }
     } else {
       final LinkedHashSet<PsiClass> classesToPullUp = new LinkedHashSet<>();
       collectClassesToPullUp(manager, classesToPullUp, containingClass.getExtendsListTypes());
       collectClassesToPullUp(manager, classesToPullUp, containingClass.getImplementsListTypes());
       if (classesToPullUp.isEmpty()) {
-        name = "Extract method \'" + methodWithOverrides.getName() + "\' to new interface";
+        name = "Extract method '" + methodWithOverrides.getName() + "' to new interface";
         canBePulledUp = false;
       } else if (classesToPullUp.size() == 1) {
         final PsiClass baseClass = classesToPullUp.iterator().next();
-        name = "Pull method \'" + methodWithOverrides.getName() + "\' to \'" + baseClass.getName() + "\'";
+        name = "Pull method '" + methodWithOverrides.getName() + "' to '" + baseClass.getName() + "'";
         if (!baseClass.hasModifierProperty(PsiModifier.ABSTRACT)) {
            name+= " and make it abstract";
         }
diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/StringLiteralCopyPasteProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/StringLiteralCopyPasteProcessor.java
index 820e7e8dcc20..262d60c5a7af 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/StringLiteralCopyPasteProcessor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/StringLiteralCopyPasteProcessor.java
@@ -250,7 +250,7 @@ public class StringLiteralCopyPasteProcessor implements CopyPastePreProcessor {
   @NotNull
   protected String escapeCharCharacters(@NotNull String s, @NotNull PsiElement token) {
     StringBuilder buffer = new StringBuilder();
-    StringUtil.escapeStringCharacters(s.length(), s, isStringLiteral(token) ? "\"" : "\'", buffer);
+    StringUtil.escapeStringCharacters(s.length(), s, isStringLiteral(token) ? "\"" : "'", buffer);
     return buffer.toString();
   }
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/LiteralFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/LiteralFixer.java
index 7070f30a1b4e..e6bee08d0509 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/LiteralFixer.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/LiteralFixer.java
@@ -32,7 +32,7 @@ public class LiteralFixer implements Fixer {
         editor.getDocument().insertString(psiElement.getTextRange().getEndOffset(), "\"");
       } else if (((PsiJavaToken) psiElement).getTokenType() == JavaTokenType.CHARACTER_LITERAL &&
                  !StringUtil.endsWithChar(psiElement.getText(), '\'')) {
-        editor.getDocument().insertString(psiElement.getTextRange().getEndOffset(), "\'");
+        editor.getDocument().insertString(psiElement.getTextRange().getEndOffset(), "'");
       }
     }
   }
diff --git a/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassDialog.java b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassDialog.java
index 1e609f19d9de..96f0878313d7 100644
--- a/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassDialog.java
@@ -159,7 +159,7 @@ class ExtractClassDialog extends RefactoringDialog implements MemberInfoChangeLi
 
     final String className = getClassName();
     if (className.length() == 0 || !nameHelper.isIdentifier(className)) {
-      throw new ConfigurationException("\'" + className + "\' is invalid extracted class name");
+      throw new ConfigurationException("'" + className + "' is invalid extracted class name");
     }
 
     /*final String packageName = getPackageName();
@@ -169,7 +169,7 @@ class ExtractClassDialog extends RefactoringDialog implements MemberInfoChangeLi
     for (PsiClass innerClass : innerClasses) {
       if (className.equals(innerClass.getName())) {
         throw new ConfigurationException(
-          "Extracted class should have unique name. Name " + "\'" + className + "\' is already in use by one of the inner classes");
+          "Extracted class should have unique name. Name " + "'" + className + "' is already in use by one of the inner classes");
       }
     }
   }
diff --git a/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java
index 0035cfa6bd7c..b79cf84e97a3 100644
--- a/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java
@@ -175,13 +175,13 @@ public class ExtractClassProcessor extends FixableUsagesRefactoringProcessor {
       fieldsNeedingGetter.addAll(visitor.getFieldsNeedingGetter());
       fieldsNeedingGetter.addAll(srcVisitor.getFieldsNeedingGetter());
       for (PsiField field : fieldsNeedingGetter) {
-        conflicts.putValue(field, "Field \'" + field.getName() + "\' needs getter");
+        conflicts.putValue(field, "Field '" + field.getName() + "' needs getter");
       }
       final Set<PsiField> fieldsNeedingSetter = new LinkedHashSet<>();
       fieldsNeedingSetter.addAll(visitor.getFieldsNeedingSetter());
       fieldsNeedingSetter.addAll(srcVisitor.getFieldsNeedingSetter());
       for (PsiField field : fieldsNeedingSetter) {
-        conflicts.putValue(field, "Field \'" + field.getName() + "\' needs setter");
+        conflicts.putValue(field, "Field '" + field.getName() + "' needs setter");
       }
     }
     checkConflicts(refUsages, conflicts);
diff --git a/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationDialog.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationDialog.java
index 284d1a75e9cc..589084471f4a 100644
--- a/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationDialog.java
@@ -98,12 +98,12 @@ public class InheritanceToDelegationDialog extends RefactoringDialog {
     final String fieldName = getFieldName();
     final PsiNameHelper helper = PsiNameHelper.getInstance(myProject);
     if (!helper.isIdentifier(fieldName)){
-      throw new ConfigurationException("\'" + fieldName + "\' is invalid field name for delegation");
+      throw new ConfigurationException("'" + fieldName + "' is invalid field name for delegation");
     }
     if (myInnerClassNameField != null) {
       final String className = myInnerClassNameField.getEnteredName();
       if (!helper.isIdentifier(className)) {
-        throw new ConfigurationException("\'" + className + "\' is invalid inner class name");
+        throw new ConfigurationException("'" + className + "' is invalid inner class name");
       }
     }
   }
diff --git a/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java
index da89cc41326f..f292ca1990e7 100644
--- a/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java
@@ -238,7 +238,7 @@ public class InlineSuperClassRefactoringProcessor extends FixableUsagesRefactori
         conflicts.putValue(targetClass, "Cannot inline into anonymous class.");
       }
       else if (PsiTreeUtil.isAncestor(mySuperClass, targetClass, false)) {
-        conflicts.putValue(targetClass, "Cannot inline into the inner class. Move \'" + targetClass.getName() + "\' to upper level");
+        conflicts.putValue(targetClass, "Cannot inline into the inner class. Move '" + targetClass.getName() + "' to upper level");
       }
       else {
         for (MemberInfo info : myMemberInfos) {
diff --git a/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceWithSubtypeUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceWithSubtypeUsageInfo.java
index 236fcf73ef0e..3ddbe1e375c1 100644
--- a/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceWithSubtypeUsageInfo.java
+++ b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceWithSubtypeUsageInfo.java
@@ -59,11 +59,11 @@ public class ReplaceWithSubtypeUsageInfo extends FixableUsageInfo {
     if (!TypeConversionUtil.isAssignable(myOriginalType, myTargetClassType)) {
       final String conflict = "No consistent substitution found for " +
                               getElement().getText() +
-                              ". Expected \'" +
+                              ". Expected '" +
                               myOriginalType.getPresentableText() +
-                              "\' but found \'" +
+                              "' but found '" +
                               myTargetClassType.getPresentableText() +
-                              "\'.";
+                              "'.";
       if (myConflict == null) {
         myConflict = conflict;
       } else {
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java
index 9c2afd54d518..72454181c5d7 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java
@@ -290,7 +290,7 @@ public class IntroduceParameterDialog extends RefactoringDialog {
   protected void canRun() throws ConfigurationException {
     String name = getParameterName();
     if (!PsiNameHelper.getInstance(myProject).isIdentifier(name)) {
-      throw new ConfigurationException("\'" + name + "\' is invalid parameter name");
+      throw new ConfigurationException("'" + name + "' is invalid parameter name");
     }
   }
 
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectDialog.java
index 8ffa410007a4..84a2804bfcf7 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectDialog.java
@@ -203,26 +203,28 @@ public class IntroduceParameterObjectDialog extends AbstractIntroduceParameterOb
     final PsiNameHelper nameHelper = PsiNameHelper.getInstance(project);
     if (myCreateInnerClassRadioButton.isSelected()) {
       final String innerClassName = getInnerClassName();
-      if (!nameHelper.isIdentifier(innerClassName)) throw new ConfigurationException("\'" + innerClassName + "\' is invalid inner class name");
-      if (mySourceMethod.getContainingClass().findInnerClassByName(innerClassName, false) != null) throw new ConfigurationException("Inner class with name \'" + innerClassName + "\' already exist");
+      if (!nameHelper.isIdentifier(innerClassName)) throw new ConfigurationException("'" + innerClassName + "' is invalid inner class name");
+      if (mySourceMethod.getContainingClass().findInnerClassByName(innerClassName, false) != null) throw new ConfigurationException(
+        "Inner class with name '" + innerClassName +
+        "' already exist");
     } else if (!useExistingClass()) {
       final String className = getClassName();
       if (className.length() == 0 || !nameHelper.isIdentifier(className)) {
-        throw new ConfigurationException("\'" + className + "\' is invalid parameter class name");
+        throw new ConfigurationException("'" + className + "' is invalid parameter class name");
       }
       final String packageName = getPackageName();
 
       if (packageName.length() == 0 || !nameHelper.isQualifiedName(packageName)) {
-        throw new ConfigurationException("\'" + packageName + "\' is invalid parameter class package name");
+        throw new ConfigurationException("'" + packageName + "' is invalid parameter class package name");
       }
     }
     else {
       final String className = getExistingClassName();
       if (className.length() == 0 || !nameHelper.isQualifiedName(className)) {
-        throw new ConfigurationException("\'" + className + "\' is invalid qualified parameter class name");
+        throw new ConfigurationException("'" + className + "' is invalid qualified parameter class name");
       }
       if (JavaPsiFacade.getInstance(getProject()).findClass(className, GlobalSearchScope.allScope(getProject())) == null) {
-        throw new ConfigurationException("\'" + className + "\' does not exist");
+        throw new ConfigurationException("'" + className + "' does not exist");
       }
     }
   }
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/usageInfo/AppendAccessorsUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/usageInfo/AppendAccessorsUsageInfo.java
index e2e72c2b2a89..5bf1715ac294 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/usageInfo/AppendAccessorsUsageInfo.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/usageInfo/AppendAccessorsUsageInfo.java
@@ -69,7 +69,7 @@ public class AppendAccessorsUsageInfo extends FixableUsageInfo{
       if (myField != null) {
         fieldName = myField.getName();
       }
-      return (myGetter ? "Getter" : "Setter") + " for field \'" + fieldName + "\' is required";
+      return (myGetter ? "Getter" : "Setter") + " for field '" + fieldName + "' is required";
     }
     return null;
   }
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/JavaMoveClassesOrPackagesHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/JavaMoveClassesOrPackagesHandler.java
index c3bf6f59bc99..014fe436a18a 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/JavaMoveClassesOrPackagesHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/JavaMoveClassesOrPackagesHandler.java
@@ -332,9 +332,9 @@ public class JavaMoveClassesOrPackagesHandler extends MoveHandlerDelegate {
       inLib |= !fileIndex.isInContent(psiDirectory.getVirtualFile());
     }
 
-    return inLib ? "Package \'" +
+    return inLib ? "Package '" +
                    aPackage.getName() +
-                   "\' contains directories in libraries which cannot be moved. Do you want to move current directory" : null;
+                   "' contains directories in libraries which cannot be moved. Do you want to move current directory" : null;
   }
 
   private static boolean canMoveOrRearrangePackages(PsiElement[] elements) {
diff --git a/java/java-impl/src/com/intellij/refactoring/rename/RenamePsiPackageProcessor.java b/java/java-impl/src/com/intellij/refactoring/rename/RenamePsiPackageProcessor.java
index f918e691e2cd..510636e2b7b1 100644
--- a/java/java-impl/src/com/intellij/refactoring/rename/RenamePsiPackageProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/rename/RenamePsiPackageProcessor.java
@@ -146,7 +146,7 @@ public class RenamePsiPackageProcessor extends RenamePsiElementProcessor {
     final String qualifiedNameAfterRename = getPackageQualifiedNameAfterRename(aPackage, newName, true);
     final PsiClass psiClass = JavaPsiFacade.getInstance(project).findClass(qualifiedNameAfterRename, GlobalSearchScope.allScope(project));
     if (psiClass != null) {
-      conflicts.putValue(psiClass, "Class with qualified name \'" + qualifiedNameAfterRename + "\'  already exist");
+      conflicts.putValue(psiClass, "Class with qualified name '" + qualifiedNameAfterRename + "'  already exist");
     }
   }
 
diff --git a/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderDialog.java b/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderDialog.java
index aa6fd23c90db..8831e6381d0d 100644
--- a/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderDialog.java
@@ -198,17 +198,22 @@ public class ReplaceConstructorWithBuilderDialog extends RefactoringDialog {
   protected void canRun() throws ConfigurationException {
     final PsiNameHelper nameHelper = PsiNameHelper.getInstance(myProject);
     for (ParameterData parameterData : myParametersMap.values()) {
-      if (!nameHelper.isIdentifier(parameterData.getFieldName())) throw new ConfigurationException("\'" + parameterData.getFieldName() + "\' is not a valid field name");
-      if (!nameHelper.isIdentifier(parameterData.getSetterName())) throw new ConfigurationException("\'" + parameterData.getSetterName() + "\' is not a valid setter name");
+      if (!nameHelper.isIdentifier(parameterData.getFieldName())) throw new ConfigurationException("'" + parameterData.getFieldName() +
+                                                                                                   "' is not a valid field name");
+      if (!nameHelper.isIdentifier(parameterData.getSetterName())) throw new ConfigurationException("'" + parameterData.getSetterName() +
+                                                                                                    "' is not a valid setter name");
     }
     if (myCreateBuilderClassRadioButton.isSelected()) {
       final String className = myNewClassName.getText().trim();
-      if (className.length() == 0 || !nameHelper.isQualifiedName(className)) throw new ConfigurationException("\'" + className + "\' is invalid builder class name");
+      if (className.length() == 0 || !nameHelper.isQualifiedName(className)) throw new ConfigurationException("'" + className +
+                                                                                                              "' is invalid builder class name");
       final String packageName = myPackageTextField.getText().trim();
-      if (packageName.length() > 0 && !nameHelper.isQualifiedName(packageName)) throw new ConfigurationException("\'" + packageName + "\' is invalid builder package name");
+      if (packageName.length() > 0 && !nameHelper.isQualifiedName(packageName)) throw new ConfigurationException("'" + packageName +
+                                                                                                                 "' is invalid builder package name");
     } else {
       final String qualifiedName = myExistentClassTF.getText().trim();
-      if (qualifiedName.length() == 0 || !nameHelper.isQualifiedName(qualifiedName)) throw new ConfigurationException("\'" + qualifiedName + "\' is invalid builder qualified class name");
+      if (qualifiedName.length() == 0 || !nameHelper.isQualifiedName(qualifiedName)) throw new ConfigurationException("'" + qualifiedName +
+                                                                                                                      "' is invalid builder qualified class name");
     }
   }
 
@@ -397,7 +402,7 @@ public class ReplaceConstructorWithBuilderDialog extends RefactoringDialog {
         return null;
       }
       return !PsiNameHelper.getInstance(myProject).isIdentifier(inputString)
-             ? "Identifier \'" + inputString + "\' is invalid" : null;
+             ? "Identifier '" + inputString + "' is invalid" : null;
     }
   }
 }
diff --git a/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithFactory/ReplaceConstructorWithFactoryDialog.java b/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithFactory/ReplaceConstructorWithFactoryDialog.java
index 99dc3005a673..c8a29d7f275a 100644
--- a/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithFactory/ReplaceConstructorWithFactoryDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithFactory/ReplaceConstructorWithFactoryDialog.java
@@ -191,7 +191,7 @@ public class ReplaceConstructorWithFactoryDialog extends RefactoringDialog {
     final String name = myNameField.getEnteredName();
     final PsiNameHelper nameHelper = PsiNameHelper.getInstance(myContainingClass.getProject());
     if (!nameHelper.isIdentifier(name)) {
-      throw new ConfigurationException("\'" + name + "\' is invalid factory method name");
+      throw new ConfigurationException("'" + name + "' is invalid factory method name");
     }
   }
 }
\ No newline at end of file
diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/TypeMigrationDialog.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/TypeMigrationDialog.java
index abf5d4ba68f5..acd83d4cdb53 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/TypeMigrationDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/TypeMigrationDialog.java
@@ -181,8 +181,8 @@ public abstract class TypeMigrationDialog extends RefactoringDialog {
     protected void canRun() throws ConfigurationException {
       super.canRun();
       if (!checkType(getMigrationType()))
-        throw new ConfigurationException("\'" + StringUtil.escapeXmlEntities(myTypeCodeFragment.getText()) + "\' is an invalid type");
-      if (isVoidVariableMigration()) throw new ConfigurationException("\'void\' is not applicable");
+        throw new ConfigurationException("'" + StringUtil.escapeXmlEntities(myTypeCodeFragment.getText()) + "' is an invalid type");
+      if (isVoidVariableMigration()) throw new ConfigurationException("'void' is not applicable");
     }
 
     @Override
diff --git a/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueDialog.java b/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueDialog.java
index e89b5faf0fef..fd66f9c276ed 100644
--- a/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueDialog.java
@@ -96,15 +96,15 @@ class WrapReturnValueDialog extends RefactoringDialog {
     final PsiNameHelper nameHelper = PsiNameHelper.getInstance(project);
     if (myCreateInnerClassButton.isSelected()) {
       final String innerClassName = getInnerClassName().trim();
-      if (!nameHelper.isIdentifier(innerClassName)) throw new ConfigurationException("\'" + innerClassName + "\' is invalid inner class name");
+      if (!nameHelper.isIdentifier(innerClassName)) throw new ConfigurationException("'" + innerClassName + "' is invalid inner class name");
       final PsiClass containingClass = sourceMethod.getContainingClass();
       if (containingClass != null && containingClass.findInnerClassByName(innerClassName, false) != null) {
-        throw new ConfigurationException("Inner class with name \'" + innerClassName + "\' already exist");
+        throw new ConfigurationException("Inner class with name '" + innerClassName + "' already exist");
       }
     } else if (useExistingClassButton.isSelected()) {
       final String className = existingClassField.getText().trim();
       if (className.length() == 0 || !nameHelper.isQualifiedName(className)) {
-        throw new ConfigurationException("\'" + className + "\' is invalid qualified wrapper class name");
+        throw new ConfigurationException("'" + className + "' is invalid qualified wrapper class name");
       }
       final Object item = myFieldsCombo.getSelectedItem();
       if (item == null) {
@@ -113,12 +113,12 @@ class WrapReturnValueDialog extends RefactoringDialog {
     } else {
       final String className = getClassName();
       if (className.length() == 0 || !nameHelper.isIdentifier(className)) {
-        throw new ConfigurationException("\'" + className + "\' is invalid wrapper class name");
+        throw new ConfigurationException("'" + className + "' is invalid wrapper class name");
       }
       final String packageName = getPackageName();
 
       if (packageName.length() == 0 || !nameHelper.isQualifiedName(packageName)) {
-        throw new ConfigurationException("\'" + packageName + "\' is invalid wrapper class package name");
+        throw new ConfigurationException("'" + packageName + "' is invalid wrapper class package name");
       }
     }
   }
diff --git a/platform/core-impl/src/com/intellij/ide/highlighter/custom/CustomFileTypeLexer.java b/platform/core-impl/src/com/intellij/ide/highlighter/custom/CustomFileTypeLexer.java
index 9cc15eb5d470..096a263fc35a 100644
--- a/platform/core-impl/src/com/intellij/ide/highlighter/custom/CustomFileTypeLexer.java
+++ b/platform/core-impl/src/com/intellij/ide/highlighter/custom/CustomFileTypeLexer.java
@@ -52,7 +52,7 @@ public final class CustomFileTypeLexer extends AbstractCustomLexer {
     final QuotedStringParser quotedStringParser = new QuotedStringParser("\"", CustomHighlighterTokenType.STRING, table.isHasStringEscapes());
 
     final QuotedStringParser quotedStringParser2 = new QuotedStringParser(
-        "\'",
+      "'",
         forHighlighting ? CustomHighlighterTokenType.SINGLE_QUOTED_STRING:CustomHighlighterTokenType.STRING,
         table.isHasStringEscapes()
     );
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/CharTableImpl.java b/platform/core-impl/src/com/intellij/psi/impl/source/CharTableImpl.java
index 4f6c0ec679f1..71e0ef1d7d2a 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/CharTableImpl.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/CharTableImpl.java
@@ -165,7 +165,7 @@ public class CharTableImpl implements CharTable {
     r.add("</");
     r.add("/>");
     r.add("\"");
-    r.add("\'");
+    r.add("'");
     r.add("<![CDATA[");
     r.add("]]>");
     r.add("<!--");
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java
index 06c122401ad3..cb0df5899b5a 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java
@@ -142,7 +142,7 @@ public final class CommentByLineCommentHandler extends MultiCaretCodeInsightActi
     }
     if (context.textContains('\'') || context.textContains('\"') || context.textContains('/')) {
       final String s = context.getText();
-      return StringUtil.startsWith(s, "\"") || StringUtil.startsWith(s, "\'") || StringUtil.startsWith(s, "/");
+      return StringUtil.startsWith(s, "\"") || StringUtil.startsWith(s, "'") || StringUtil.startsWith(s, "/");
     }
     return false;
   }
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionAction.java b/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionAction.java
index 3e0139f372b6..ddff695cc0df 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionAction.java
@@ -214,7 +214,7 @@ public class CodeInspectionAction extends BaseAnalysisAction {
         final InspectionProfileImpl profile = appProfileManager.getProfile(lastSelectedProfileName, false);
         if (profile != null) return profile;
       } else {
-        LOG.assertTrue(type == 'p', "Unexpected last selected profile: \'" + lastSelectedProfile + "\'");
+        LOG.assertTrue(type == 'p', "Unexpected last selected profile: '" + lastSelectedProfile + "'");
         final InspectionProfileImpl profile = projectProfileManager.getProfile(lastSelectedProfileName, false);
         if (profile != null && profile.isProjectLevel()) return profile;
       }
diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
index bacf337502eb..727a0547d314 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
@@ -1532,7 +1532,7 @@ public abstract class ChooseByNameBase implements ChooseByNameViewModel {
 
       final UsageViewPresentation presentation = new UsageViewPresentation();
       final String text = getTrimmedText();
-      final String prefixPattern = myFindUsagesTitle + " \'" + text + "\'";
+      final String prefixPattern = myFindUsagesTitle + " '" + text + "'";
       presentation.setCodeUsagesString(prefixPattern);
       presentation.setUsagesInGeneratedCodeString(prefixPattern + " in generated code");
       presentation.setTabName(prefixPattern);
diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/actions/ModuleDeleteProvider.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/actions/ModuleDeleteProvider.java
index 0a3bf7527840..92f702496b5b 100644
--- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/actions/ModuleDeleteProvider.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/actions/ModuleDeleteProvider.java
@@ -76,7 +76,7 @@ public class ModuleDeleteProvider  implements DeleteProvider, TitledHandler  {
       moduleDescriptions.addAll(unloadedModules);
     }
 
-    String names = StringUtil.join(moduleDescriptions, description -> "\'" + description.getName() + "\'", ", ");
+    String names = StringUtil.join(moduleDescriptions, description -> "'" + description.getName() + "'", ", ");
     int ret = Messages.showOkCancelDialog(getConfirmationText(names, moduleDescriptions.size()), getActionTitle(), CommonBundle.message("button.remove"), CommonBundle.getCancelButtonText(), Messages.getQuestionIcon());
     if (ret != Messages.OK) return;
     CommandProcessor.getInstance().executeCommand(project, () -> {
diff --git a/platform/lang-impl/src/com/intellij/platform/templates/TemplateModuleBuilder.java b/platform/lang-impl/src/com/intellij/platform/templates/TemplateModuleBuilder.java
index 33ec5310b056..ea8bedd58df9 100644
--- a/platform/lang-impl/src/com/intellij/platform/templates/TemplateModuleBuilder.java
+++ b/platform/lang-impl/src/com/intellij/platform/templates/TemplateModuleBuilder.java
@@ -267,7 +267,7 @@ public class TemplateModuleBuilder extends ModuleBuilder {
           for (Trinity<String, String, VelocityException> failure : myFailures) {
             reportBuilder.append("File: ").append(failure.getFirst()).append("\n");
             reportBuilder.append("Exception:\n").append(ExceptionUtil.getThrowableText(failure.getThird())).append("\n");
-            reportBuilder.append("File content:\n\'").append(failure.getSecond()).append("\'\n");
+            reportBuilder.append("File content:\n'").append(failure.getSecond()).append("'\n");
             reportBuilder.append("\n===========================================\n");
           }
 
diff --git a/platform/lang-impl/src/com/intellij/psi/search/DefaultSearchScopeProviders.java b/platform/lang-impl/src/com/intellij/psi/search/DefaultSearchScopeProviders.java
index b7f67e697905..0383bb9d4e05 100644
--- a/platform/lang-impl/src/com/intellij/psi/search/DefaultSearchScopeProviders.java
+++ b/platform/lang-impl/src/com/intellij/psi/search/DefaultSearchScopeProviders.java
@@ -49,7 +49,7 @@ public class DefaultSearchScopeProviders {
           @NotNull
           @Override
           public String getDisplayName() {
-            return "Favorite \'" + favorite + "\'";
+            return "Favorite '" + favorite + "'";
           }
 
           @Override
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/AutomaticRenamingDialog.java b/platform/lang-impl/src/com/intellij/refactoring/rename/AutomaticRenamingDialog.java
index 781ba769cfad..b5ba5e65c272 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/AutomaticRenamingDialog.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/AutomaticRenamingDialog.java
@@ -407,7 +407,7 @@ public class AutomaticRenamingDialog extends DialogWrapper {
         public String getErrorText(String inputString) {
           final int selectedRow = myTable.getSelectedRow();
           if (!isValidName(inputString, selectedRow)) {
-            return "Identifier \'" + inputString + "\' is invalid";
+            return "Identifier '" + inputString + "' is invalid";
           }
           return null;
         }
diff --git a/platform/util/src/com/intellij/execution/CommandLineUtil.java b/platform/util/src/com/intellij/execution/CommandLineUtil.java
index 641611a187a1..1d4aef4ca402 100644
--- a/platform/util/src/com/intellij/execution/CommandLineUtil.java
+++ b/platform/util/src/com/intellij/execution/CommandLineUtil.java
@@ -20,7 +20,7 @@ public final class CommandLineUtil {
 
   private static final Pattern WIN_BACKSLASHES_PRECEDING_QUOTE = Pattern.compile("(\\\\+)(?=\"|$)");
   private static final Pattern WIN_CARET_SPECIAL = Pattern.compile("[&<>()@^|!%]");
-  private static final Pattern WIN_QUOTE_SPECIAL = Pattern.compile("[ \t\"*?\\[{}~()\']");  // + glob [*?] + Cygwin glob [*?\[{}~] + [()']
+  private static final Pattern WIN_QUOTE_SPECIAL = Pattern.compile("[ \t\"*?\\[{}~()']");  // + glob [*?] + Cygwin glob [*?\[{}~] + [()']
   private static final Pattern WIN_QUIET_COMMAND = Pattern.compile("((?:@\\s*)++)(.*)", Pattern.CASE_INSENSITIVE);
 
   private static final String SHELL_WHITELIST_CHARACTERS = "-._/@=";
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/LengthOneStringInIndexOfInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/LengthOneStringInIndexOfInspection.java
index 6a6bc94876b4..5247b72ce419 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/LengthOneStringInIndexOfInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/LengthOneStringInIndexOfInspection.java
@@ -82,7 +82,7 @@ public class LengthOneStringInIndexOfInspection
     final int length = text.length();
     final String character = text.substring(1, length - 1);
     switch (character) {
-      case "\'":
+      case "'":
         return "'\\''";
       case "\\\"":
         return "'\"'";
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/MakePublicStaticVoidFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/MakePublicStaticVoidFix.java
index b30059453b43..99cad6793349 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/MakePublicStaticVoidFix.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/MakePublicStaticVoidFix.java
@@ -47,12 +47,12 @@ class MakePublicStaticVoidFix extends InspectionGadgetsFix {
 
   MakePublicStaticVoidFix(PsiMethod method, boolean makeStatic, @PsiModifier.ModifierConstant String newVisibility) {
     String presentableVisibility = VisibilityUtil.getVisibilityString(newVisibility);
-    myName = "Change signature of \'" +
+    myName = "Change signature of '" +
              PsiFormatUtil.formatMethod(method, PsiSubstitutor.EMPTY,
                                         PsiFormatUtilBase.SHOW_NAME | PsiFormatUtilBase.SHOW_MODIFIERS |
                                         PsiFormatUtilBase.SHOW_PARAMETERS | PsiFormatUtilBase.SHOW_TYPE, PsiFormatUtilBase.SHOW_TYPE) +
-             "\' to \'" + (presentableVisibility.isEmpty() ? "" : presentableVisibility + " ") + (makeStatic ? "static " : "") +
-             "void " + method.getName() + "()\'";
+             "' to '" + (presentableVisibility.isEmpty() ? "" : presentableVisibility + " ") + (makeStatic ? "static " : "") +
+             "void " + method.getName() + "()'";
     myMakeStatic = makeStatic;
     myNewVisibility = newVisibility;
   }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/ParameterizedParametersStaticCollectionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/ParameterizedParametersStaticCollectionInspection.java
index 98b346fc79a7..342fc6846bba 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/ParameterizedParametersStaticCollectionInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/ParameterizedParametersStaticCollectionInspection.java
@@ -110,8 +110,8 @@ public class ParameterizedParametersStaticCollectionInspection extends BaseInspe
                     JavaPsiFacade.getInstance(project).findClass(Collection.class.getName(), GlobalSearchScope.allScope(project));
                   if (AnnotationUtil.isAnnotated(method, PARAMETERS_FQN, 0)) {
                     final PsiModifierList modifierList = method.getModifierList();
-                    String fixMessage = "Make method \'" + method.getName() + "\' ";
-                    String errorString = "Method \'#ref()\' should";
+                    String fixMessage = "Make method '" + method.getName() + "' ";
+                    String errorString = "Method '#ref()' should";
                     String signatureDescription = "";
                     if (!modifierList.hasModifierProperty(PsiModifier.PUBLIC)) {
                       signatureDescription += PsiModifier.PUBLIC;
diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java
index 546168cdd52a..e938a0567de7 100644
--- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java
+++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java
@@ -139,7 +139,7 @@ class CopyrightProfilesPanel extends MasterDetailsComponent implements Searchabl
       final String profileName = ((CopyrightConfigurable)node.getConfigurable()).getEditableObject().getName();
       if (profiles.contains(profileName)) {
         selectNodeInTree(profileName);
-        throw new ConfigurationException("Duplicate copyright profile name: \'" + profileName + "\'");
+        throw new ConfigurationException("Duplicate copyright profile name: '" + profileName + "'");
       }
       profiles.add(profileName);
     }
diff --git a/plugins/devkit/devkit-core/src/testAssistant/TestDataGuessByExistingFilesUtil.java b/plugins/devkit/devkit-core/src/testAssistant/TestDataGuessByExistingFilesUtil.java
index 53149b23f36a..d04a3423ff84 100644
--- a/plugins/devkit/devkit-core/src/testAssistant/TestDataGuessByExistingFilesUtil.java
+++ b/plugins/devkit/devkit-core/src/testAssistant/TestDataGuessByExistingFilesUtil.java
@@ -184,7 +184,7 @@ public class TestDataGuessByExistingFilesUtil {
     Module module = ReadAction.compute(() -> ModuleUtilCore.findModuleForPsiElement(psiClass));
     Collection<String> fileNames = getAllFileNames(possibleFileName, gotoModel);
     ProgressIndicator indicator = EmptyProgressIndicator.notNullize(ProgressManager.getInstance().getProgressIndicator());
-    indicator.setText("Searching for \'" + test + "\' test data files...");
+    indicator.setText("Searching for '" + test + "' test data files...");
     indicator.setIndeterminate(false);
     int fileNamesCount = fileNames.size();
     double currentIndex = 0;
diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseClasspathStorageProvider.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseClasspathStorageProvider.java
index 36c576634b44..806a53d3b113 100644
--- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseClasspathStorageProvider.java
+++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseClasspathStorageProvider.java
@@ -70,26 +70,26 @@ public class EclipseClasspathStorageProvider implements ClasspathStorageProvider
               libraryEntry.getRootUrls(OrderRootType.CLASSES).length != 1 ||
               library.isJarDirectory(library.getUrls(OrderRootType.CLASSES)[0])) {
             throw new ConfigurationException(
-              "Library \'" +
+              "Library '" +
               entry.getPresentableName() +
-              "\' from module \'" +
+              "' from module '" +
               moduleName +
-              "\' dependencies is incompatible with eclipse format which supports only one library content root");
+              "' dependencies is incompatible with eclipse format which supports only one library content root");
           }
         }
       }
     }
     if (model.getContentRoots().length == 0) {
-      throw new ConfigurationException("Module \'" + moduleName + "\' has no content roots thus is not compatible with eclipse format");
+      throw new ConfigurationException("Module '" + moduleName + "' has no content roots thus is not compatible with eclipse format");
     }
     final String output = model.getModuleExtension(CompilerModuleExtension.class).getCompilerOutputUrl();
     final String contentRoot = getContentRoot(model);
     if (output == null ||
         !StringUtil.startsWith(VfsUtilCore.urlToPath(output), contentRoot) &&
         PathMacroManager.getInstance(model.getModule()).collapsePath(output).equals(output)) {
-      throw new ConfigurationException("Module \'" +
+      throw new ConfigurationException("Module '" +
                                        moduleName +
-                                       "\' output path is incompatible with eclipse format which supports output under content root only.\nPlease make sure that \"Inherit project compile output path\" is not selected");
+                                       "' output path is incompatible with eclipse format which supports output under content root only.\nPlease make sure that \"Inherit project compile output path\" is not selected");
     }
   }
 
diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EPathUtil.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EPathUtil.java
index 601cb9c5e709..047517ffba1c 100644
--- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EPathUtil.java
+++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EPathUtil.java
@@ -181,7 +181,7 @@ public class EPathUtil {
       if (file.getFileSystem() instanceof JarFileSystem) {
         final VirtualFile jarFile = JarFileSystem.getInstance().getVirtualFileForJar(file);
         if (jarFile == null) {
-          LOG.error("Url: \'" + url + "\'; file: " + file);
+          LOG.error("Url: '" + url + "'; file: " + file);
           return ProjectRootManagerImpl.extractLocalPath(url);
         }
         file = jarFile;
diff --git a/plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java b/plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java
index 003097645b81..1aff28e95b9b 100644
--- a/plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java
+++ b/plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java
@@ -582,7 +582,7 @@ class GitHttpGuiAuthenticator implements GitHttpAuthenticator {
 
     @Override
     public String toString() {
-      return "provider=\'" + myProvider.getName() + "\', login='" + myLogin + '\'';
+      return "provider='" + myProvider.getName() + "', login='" + myLogin + '\'';
     }
   }
 }
diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultUnresolvedExternalDependency.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultUnresolvedExternalDependency.java
index 36fc2350a91b..96fc90510c3a 100644
--- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultUnresolvedExternalDependency.java
+++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultUnresolvedExternalDependency.java
@@ -44,6 +44,6 @@ public class DefaultUnresolvedExternalDependency extends AbstractExternalDepende
 
   @Override
   public String toString() {
-    return "Unresolved dependency '" + getId() + "\':" + failureMessage;
+    return "Unresolved dependency '" + getId() + "':" + failureMessage;
   }
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/strings/ConvertStringToMultilineIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/strings/ConvertStringToMultilineIntention.java
index 4c0a562355ed..7db893db79df 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/strings/ConvertStringToMultilineIntention.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/strings/ConvertStringToMultilineIntention.java
@@ -224,7 +224,7 @@ public class ConvertStringToMultilineIntention extends Intention {
       @Override
       public boolean satisfiedBy(@NotNull PsiElement element) {
         return element instanceof GrLiteral && ("\"".equals(GrStringUtil.getStartQuote(element.getText())) ||
-                                                "\'".equals(GrStringUtil.getStartQuote(element.getText())))
+                                                "'".equals(GrStringUtil.getStartQuote(element.getText())))
                || element instanceof GrBinaryExpression && isAppropriateBinary((GrBinaryExpression)element, null);
       }
     };
diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
index d250db958936..9fa581252895 100644
--- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -28,7 +28,7 @@ public class ConstExprent extends Exprent {
     CHAR_ESCAPES.put(0xC, "\\f");   /* \u000c: form feed FF */
     CHAR_ESCAPES.put(0xD, "\\r");   /* \u000d: carriage return CR */
     //CHAR_ESCAPES.put(0x22, "\\\""); /* \u0022: double quote " */
-    CHAR_ESCAPES.put(0x27, "\\\'"); /* \u0027: single quote ' */
+    CHAR_ESCAPES.put(0x27, "\\'"); /* \u0027: single quote ' */
     CHAR_ESCAPES.put(0x5C, "\\\\"); /* \u005c: backslash \ */
   }
 
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxBuiltInAttributeDescriptor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxBuiltInAttributeDescriptor.java
index f124f23f2fad..10c09b38f45a 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxBuiltInAttributeDescriptor.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxBuiltInAttributeDescriptor.java
@@ -97,7 +97,7 @@ public class JavaFxBuiltInAttributeDescriptor extends JavaFxPropertyAttributeDes
         if (tagClass != null) {
           final PsiField field = controllerClass.findFieldByName(value, true);
           if (field != null && !InheritanceUtil.isInheritorOrSelf(tagClass, PsiUtil.resolveClassInType(field.getType()), true)) {
-            return "Cannot set " + tagClass.getQualifiedName() + " to field \'" + field.getName() + "\'";
+            return "Cannot set " + tagClass.getQualifiedName() + " to field '" + field.getName() + "'";
           }
         }
       }
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxBuiltInTagDescriptor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxBuiltInTagDescriptor.java
index d13d5fcb6fc6..9187bdeacb64 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxBuiltInTagDescriptor.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxBuiltInTagDescriptor.java
@@ -247,7 +247,7 @@ public class JavaFxBuiltInTagDescriptor implements XmlElementDescriptor, Validat
               }
             }
             if (!copyConstructorFound) {
-              host.addMessage(context.getNavigationElement(), "Copy constructor not found for \'" + psiClass.getName() + "\'",
+              host.addMessage(context.getNavigationElement(), "Copy constructor not found for '" + psiClass.getName() + "'",
                               ValidationHost.ErrorType.ERROR);
             }
           }
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestDirectory.java b/plugins/junit/src/com/intellij/execution/junit/TestDirectory.java
index 9b77fffcc152..d972ed5aae09 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestDirectory.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestDirectory.java
@@ -84,7 +84,7 @@ class TestDirectory extends TestPackage {
     }
     final VirtualFile file = LocalFileSystem.getInstance().findFileByPath(FileUtil.toSystemIndependentName(dirName));
     if (file == null) {
-      throw new RuntimeConfigurationError("Directory \'" + dirName + "\' is not found");
+      throw new RuntimeConfigurationError("Directory '" + dirName + "' is not found");
     }
     final Module module = getConfiguration().getConfigurationModule().getModule();
     if (module == null) {
diff --git a/plugins/junit_rt/src/com/intellij/junit3/JUnit3IdeaTestRunner.java b/plugins/junit_rt/src/com/intellij/junit3/JUnit3IdeaTestRunner.java
index 14f51306e4d2..d2de60bb3c69 100644
--- a/plugins/junit_rt/src/com/intellij/junit3/JUnit3IdeaTestRunner.java
+++ b/plugins/junit_rt/src/com/intellij/junit3/JUnit3IdeaTestRunner.java
@@ -205,8 +205,8 @@ public class JUnit3IdeaTestRunner extends TestRunner implements IdeaTestRunner {
 
     public void endTest(Test test) {
       final long duration = System.currentTimeMillis() - myCurrentTestStart;
-      System.out.println("\n##teamcity[testFinished name=\'" + escapeName(getMethodName(test)) +
-                         (duration > 0 ? "\' duration=\'" + duration : "") + "\']");
+      System.out.println("\n##teamcity[testFinished name='" + escapeName(getMethodName(test)) +
+                         (duration > 0 ? "' duration='" + duration : "") + "']");
     }
 
     public void startTest(Test test) {
@@ -215,17 +215,17 @@ public class JUnit3IdeaTestRunner extends TestRunner implements IdeaTestRunner {
       if (className != null && !className.equals(myClassName)) {
         finishSuite();
         myClassName = className;
-        System.out.println("##teamcity[testSuiteStarted name =\'" + escapeName(myClassName) + 
-                           "\' locationHint=\'java:suite://" + escapeName(className) + "\']");
+        System.out.println("##teamcity[testSuiteStarted name ='" + escapeName(myClassName) +
+                           "' locationHint='java:suite://" + escapeName(className) + "']");
       }
       final String methodName = getMethodName(test);
-      System.out.println("##teamcity[testStarted name=\'" + escapeName(methodName) + 
-                         "\' locationHint=\'java:test://" + escapeName(className + "/" + methodName) + "\']");
+      System.out.println("##teamcity[testStarted name='" + escapeName(methodName) +
+                         "' locationHint='java:test://" + escapeName(className + "/" + methodName) + "']");
     }
 
     protected void finishSuite() {
       if (myClassName != null) {
-        System.out.println("##teamcity[testSuiteFinished name=\'" + escapeName(myClassName) + "\']");
+        System.out.println("##teamcity[testSuiteFinished name='" + escapeName(myClassName) + "']");
       }
     }
 
diff --git a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenEffectivePomDumper.java b/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenEffectivePomDumper.java
index 1323e63e855b..62cc828d9fcb 100644
--- a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenEffectivePomDumper.java
+++ b/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenEffectivePomDumper.java
@@ -104,7 +104,7 @@ public class MavenEffectivePomDumper {
 
     effectivePom = addMavenNamespace(sWriter.toString(), true);
 
-    writeComment(writer, "Effective POM for project \'" + project.getId() + "\'");
+    writeComment(writer, "Effective POM for project '" + project.getId() + "'");
 
     writer.writeMarkup(effectivePom);
   }
diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/PropertiesCopyHandler.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/PropertiesCopyHandler.java
index 3ce1f47109a5..81fe2b89b0d8 100644
--- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/PropertiesCopyHandler.java
+++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/PropertiesCopyHandler.java
@@ -181,7 +181,7 @@ public class PropertiesCopyHandler extends CopyHandlerDelegateBase {
         return new ValidationInfo("Property name must be not empty");
       }
       return PropertiesUtil.containsProperty(myCurrentResourceBundle, myCurrentPropertyName)
-             ? new ValidationInfo(String.format("Property with name \'%s\' already exists", myCurrentPropertyName))
+             ? new ValidationInfo(String.format("Property with name '%s' already exists", myCurrentPropertyName))
              : null;
     }
 
diff --git a/plugins/properties/src/com/intellij/lang/properties/customizeActions/CombinePropertiesFilesAction.java b/plugins/properties/src/com/intellij/lang/properties/customizeActions/CombinePropertiesFilesAction.java
index 173c1d1454ce..b0e940fe2052 100644
--- a/plugins/properties/src/com/intellij/lang/properties/customizeActions/CombinePropertiesFilesAction.java
+++ b/plugins/properties/src/com/intellij/lang/properties/customizeActions/CombinePropertiesFilesAction.java
@@ -148,7 +148,7 @@ public class CombinePropertiesFilesAction extends AnAction {
     @Nullable
     @Override
     public String getErrorText(String inputString) {
-      return checkInput(inputString) ? null : String.format("Base name must be valid for file \'%s\'", checkBaseName(inputString).getFailedFile());
+      return checkInput(inputString) ? null : String.format("Base name must be valid for file '%s'", checkBaseName(inputString).getFailedFile());
     }
 
     @Nullable
diff --git a/plugins/properties/src/com/intellij/lang/properties/refactoring/rename/RenamePropertyProcessor.java b/plugins/properties/src/com/intellij/lang/properties/refactoring/rename/RenamePropertyProcessor.java
index c9a1e24ba857..5966a4f88c05 100644
--- a/plugins/properties/src/com/intellij/lang/properties/refactoring/rename/RenamePropertyProcessor.java
+++ b/plugins/properties/src/com/intellij/lang/properties/refactoring/rename/RenamePropertyProcessor.java
@@ -57,7 +57,7 @@ public class RenamePropertyProcessor extends RenamePsiElementProcessor {
           result.add(new UnresolvableCollisionUsageInfo(property.getPsiElement(), key) {
             @Override
             public String getDescription() {
-              return "New property name \'" + value + "\' hides existing property";
+              return "New property name '" + value + "' hides existing property";
             }
           });
         }
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/revert/CmdRevertClient.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/revert/CmdRevertClient.java
index b1bab9bc36da..89e28f491c34 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/revert/CmdRevertClient.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/revert/CmdRevertClient.java
@@ -21,7 +21,7 @@ import java.util.regex.Pattern;
 public class CmdRevertClient extends BaseSvnClient implements RevertClient {
 
   private static final String STATUS = "\\s*(.+?)\\s*";
-  private static final String PATH = "\\s*\'(.*?)\'\\s*";
+  private static final String PATH = "\\s*'(.*?)'\\s*";
   private static final String OPTIONAL_COMMENT = "(.*)";
   private static final Pattern CHANGED_PATH = Pattern.compile(STATUS + PATH + OPTIONAL_COMMENT);
 
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/CmdUpgradeClient.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/CmdUpgradeClient.java
index 526a07879e75..020f3875c036 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/CmdUpgradeClient.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/CmdUpgradeClient.java
@@ -23,7 +23,7 @@ import java.util.regex.Pattern;
 public class CmdUpgradeClient extends BaseSvnClient implements UpgradeClient {
 
   private static final String STATUS = "\\s*(.+?)\\s*";
-  private static final String PATH = "\\s*\'(.*?)\'\\s*";
+  private static final String PATH = "\\s*'(.*?)'\\s*";
   private static final Pattern CHANGED_PATH = Pattern.compile(STATUS + PATH);
 
   @Override
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/GotoTaskAction.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/GotoTaskAction.java
index ec5071814835..f6d58d49801a 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/GotoTaskAction.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/GotoTaskAction.java
@@ -209,7 +209,7 @@ public class GotoTaskAction extends GotoActionBase implements DumbAware {
     private String taskName;
 
     public String getActionText() {
-      return "Create New Task \'" + taskName + "\'";
+      return "Create New Task '" + taskName + "'";
     }
 
     public void setTaskName(final String taskName) {
diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyQuotedStringIntention.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyQuotedStringIntention.java
index 86b80693d27d..4bc7621b2367 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyQuotedStringIntention.java
+++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyQuotedStringIntention.java
@@ -93,7 +93,7 @@ public class PyQuotedStringIntention extends PyBaseIntentionAction {
         stringBuilder.append('\'');
       }
       else if (ch == '\'') {
-        stringBuilder.append("\\\'");
+        stringBuilder.append("\\'");
       }
       else if (ch == '\\' && charArr[i+1] == '\"' && !(i+2 == charArr.length)) {
         skipNext = true;
diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyStringConcatenationToFormatIntention.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyStringConcatenationToFormatIntention.java
index 4d649a0632c5..d1d7a2ccdba1 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyStringConcatenationToFormatIntention.java
+++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyStringConcatenationToFormatIntention.java
@@ -119,7 +119,7 @@ public class PyStringConcatenationToFormatIntention extends PyBaseIntentionActio
     final LanguageLevel languageLevel = LanguageLevel.forElement(element);
     final boolean useFormatMethod = languageLevel.isAtLeast(LanguageLevel.PYTHON27);
 
-    NotNullFunction<String,String> escaper = StringUtil.escaper(false, "\"\'\\");
+    NotNullFunction<String,String> escaper = StringUtil.escaper(false, "\"'\\");
     StringBuilder stringLiteral = new StringBuilder();
     List<String> parameters = new ArrayList<>();
     Pair<String, String> quotes = Pair.create("\"", "\"");
diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyStringFormatInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyStringFormatInspection.java
index 47f3ca25976d..255968bd32ae 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyStringFormatInspection.java
+++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyStringFormatInspection.java
@@ -408,7 +408,7 @@ public class PyStringFormatInspection extends PyInspection {
         if ("*".equals(width)) {
           ++myExpectedArguments;
           if (myUsedMappingKeys.size() > 0) {
-            registerProblem(formatExpression, "Can't use \'*\' in formats when using a mapping");
+            registerProblem(formatExpression, "Can't use '*' in formats when using a mapping");
           }
         }
       }
diff --git a/python/src/com/jetbrains/python/codeInsight/editorActions/smartEnter/fixers/PyStringLiteralFixer.java b/python/src/com/jetbrains/python/codeInsight/editorActions/smartEnter/fixers/PyStringLiteralFixer.java
index 7633ab28dedb..a08da95bc78d 100644
--- a/python/src/com/jetbrains/python/codeInsight/editorActions/smartEnter/fixers/PyStringLiteralFixer.java
+++ b/python/src/com/jetbrains/python/codeInsight/editorActions/smartEnter/fixers/PyStringLiteralFixer.java
@@ -41,10 +41,10 @@ public class PyStringLiteralFixer extends PyFixer<PyStringLiteralExpression> {
         editor.getDocument().insertString(psiElement.getTextRange().getEndOffset(), "\"\"\"".substring(suffixLength));
       }
     }
-    else if (StringUtil.startsWith(text, "\'\'\'")) {
-      final int suffixLength = StringUtil.commonSuffixLength(text, "\'\'\'");
+    else if (StringUtil.startsWith(text, "'''")) {
+      final int suffixLength = StringUtil.commonSuffixLength(text, "'''");
       if (suffixLength != 3) {
-        editor.getDocument().insertString(psiElement.getTextRange().getEndOffset(), "\'\'\'".substring(suffixLength));
+        editor.getDocument().insertString(psiElement.getTextRange().getEndOffset(), "'''".substring(suffixLength));
       }
     }
     else if (StringUtil.startsWith(text, "\"")) {
@@ -52,9 +52,9 @@ public class PyStringLiteralFixer extends PyFixer<PyStringLiteralExpression> {
         editor.getDocument().insertString(psiElement.getTextRange().getEndOffset(), "\"");
       }
     }
-    else if (StringUtil.startsWith(text, "\'")) {
-      if (!StringUtil.endsWith(text, "\'")) {
-        editor.getDocument().insertString(psiElement.getTextRange().getEndOffset(), "\'");
+    else if (StringUtil.startsWith(text, "'")) {
+      if (!StringUtil.endsWith(text, "'")) {
+        editor.getDocument().insertString(psiElement.getTextRange().getEndOffset(), "'");
       }
     }
   }
diff --git a/python/src/com/jetbrains/python/debugger/array/AsyncArrayTableModel.java b/python/src/com/jetbrains/python/debugger/array/AsyncArrayTableModel.java
index b039ca5d1614..6e46d59460d2 100644
--- a/python/src/com/jetbrains/python/debugger/array/AsyncArrayTableModel.java
+++ b/python/src/com/jetbrains/python/debugger/array/AsyncArrayTableModel.java
@@ -107,7 +107,7 @@ public class AsyncArrayTableModel extends AbstractTableModel {
     if (value instanceof String) {
       String corrected = (String)value;
       if (myStrategy.isNumeric(myDebugValue.getType())) {
-        if (corrected.startsWith("\'") || corrected.startsWith("\"")) {
+        if (corrected.startsWith("'") || corrected.startsWith("\"")) {
           corrected = corrected.substring(1, corrected.length() - 1);
         }
       }
diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlAttributeInsertHandler.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlAttributeInsertHandler.java
index ad33b44d5870..3d88b235efd3 100644
--- a/xml/impl/src/com/intellij/codeInsight/completion/XmlAttributeInsertHandler.java
+++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlAttributeInsertHandler.java
@@ -68,7 +68,7 @@ public class XmlAttributeInsertHandler implements InsertHandler<LookupElement> {
 
       if(fileContext != null) {
         if (fileContext.getText().startsWith("\"")) toInsert = "=''";
-        if (fileContext.getText().startsWith("\'")) toInsert = "=\"\"";
+        if (fileContext.getText().startsWith("'")) toInsert = "=\"\"";
       }
       if (toInsert == null) {
         toInsert = "=" + quote + quote;
diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlEqTypedHandler.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlEqTypedHandler.java
index e3e8c6a4a472..7cb5b158fb5e 100644
--- a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlEqTypedHandler.java
+++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlEqTypedHandler.java
@@ -89,7 +89,7 @@ public class XmlEqTypedHandler extends TypedHandlerDelegate {
   private static String tryCompleteQuotes(@Nullable PsiElement fileContext) {
     if (fileContext != null) {
       if (fileContext.getText().startsWith("\"")) return "''";
-      if (fileContext.getText().startsWith("\'")) return "\"\"";
+      if (fileContext.getText().startsWith("'")) return "\"\"";
     }
     return null;
   }
diff --git a/xml/impl/src/com/intellij/lang/html/HtmlQuotesFormatPreprocessor.java b/xml/impl/src/com/intellij/lang/html/HtmlQuotesFormatPreprocessor.java
index b1e33abbceb4..e8550ee1c871 100644
--- a/xml/impl/src/com/intellij/lang/html/HtmlQuotesFormatPreprocessor.java
+++ b/xml/impl/src/com/intellij/lang/html/HtmlQuotesFormatPreprocessor.java
@@ -88,7 +88,7 @@ public class HtmlQuotesFormatPreprocessor implements PreFormatProcessor {
       myDocument = file.getViewProvider().getDocument();
       switch (style) {
         case Single:
-          myNewQuote = "\'";
+          myNewQuote = "'";
           break;
         case Double:
           myNewQuote = "\"";
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlDoctypeImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlDoctypeImpl.java
index 83c911683d88..83d4dad485fe 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlDoctypeImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlDoctypeImpl.java
@@ -77,7 +77,7 @@ public class XmlDoctypeImpl extends XmlElementImpl implements XmlDoctype {
   private static String extractValue(PsiElement element) {
     String text = element.getText();
 
-    if (!text.startsWith("\"") && !text.startsWith("\'")) {
+    if (!text.startsWith("\"") && !text.startsWith("'")) {
       if (hasInjectedEscapingQuotes(element, text)) return stripInjectedEscapingQuotes(text);
     }
     return StringUtil.stripQuotesAroundValue(text);