diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractEnumTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractEnumTest.java index 7382e0c610f3..38b5a7073c8e 100644 --- a/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractEnumTest.java +++ b/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractEnumTest.java @@ -112,7 +112,7 @@ public class ExtractEnumTest extends MultiFileTestCase { } public void testCantChangeReturnType() { - doTest("Unable to migrate statement to enum constant. Field <b><code>length</code></b> is out of project", false, + doTest("Unable to migrate statement to enum constant. Field length is out of project", false, new RefactoringTestUtil.MemberDescriptor("FOO", PsiField.class, true), new RefactoringTestUtil.MemberDescriptor("BAR", PsiField.class, true)); } diff --git a/platform/lang-impl/src/com/intellij/refactoring/util/FixableUsagesRefactoringProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/util/FixableUsagesRefactoringProcessor.java index 89ab205063d1..db69ac3f8835 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/util/FixableUsagesRefactoringProcessor.java +++ b/platform/lang-impl/src/com/intellij/refactoring/util/FixableUsagesRefactoringProcessor.java @@ -18,7 +18,6 @@ package com.intellij.refactoring.util; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Ref; -import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.refactoring.BaseRefactoringProcessor; import com.intellij.usageView.UsageInfo; @@ -67,7 +66,7 @@ public abstract class FixableUsagesRefactoringProcessor extends BaseRefactoringP for (UsageInfo info : refUsages.get()) { final String conflict = ((FixableUsageInfo)info).getConflictMessage(); if (conflict != null) { - conflicts.putValue(info.getElement(), StringUtil.escapeXml(conflict)); + conflicts.putValue(info.getElement(), conflict); } } }