MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts escaping (IDEA-191188)

Browse Source
This commit is contained in:
Anna Kozlova
2018-05-02 20:06:11 +02:00
parent ef1a26388f
commit 330cb9b87e
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/java/refactoring/ExtractEnumTest.java
+1 -1
View File
@@ -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 <b><code>length</code></b> is out of project", false,
new RefactoringTestUtil.MemberDescriptor("FOO", PsiField.class, true),
new RefactoringTestUtil.MemberDescriptor("BAR", PsiField.class, true));
}
platform/lang-impl/src/com/intellij/refactoring/util/FixableUsagesRefactoringProcessor.java
+1 -2
View File
@@ -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);
}
}
}