ConflictsDialog: use appendRaw, as HTMLis possible in conflict descriptions
authorTagir Valeev <Tagir.Valeev@jetbrains.com>
Wed, 12 Aug 2020 01:10:03 +0000 (08:10 +0700)
committerintellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
Wed, 12 Aug 2020 01:10:03 +0000 (01:10 +0000)
GitOrigin-RevId: 3e011c159ba38ad2cb8aec978f8f56177edf79c1

platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java

index 42b47d75f5f26e356d4485ecf5795ea76ae59f3c..4726e3113f0fefeff208e1d72935305832e4d33a 100644 (file)
@@ -113,7 +113,7 @@ public class ConflictsDialog extends DialogWrapper{
     HtmlBuilder buf = new HtmlBuilder();
 
     for (int i = 0; i < Math.min(myConflictDescriptions.length, MAX_CONFLICTS_SHOWN); i++) {
     HtmlBuilder buf = new HtmlBuilder();
 
     for (int i = 0; i < Math.min(myConflictDescriptions.length, MAX_CONFLICTS_SHOWN); i++) {
-      buf.append(myConflictDescriptions[i]).br().br();
+      buf.appendRaw(myConflictDescriptions[i]).br().br();
     }
 
     if (myConflictDescriptions.length > MAX_CONFLICTS_SHOWN) {
     }
 
     if (myConflictDescriptions.length > MAX_CONFLICTS_SHOWN) {