From d588e48c0d896d5b99d50f01c12e9da3d4cd8ca1 Mon Sep 17 00:00:00 2001
From: Denis Fokin <Denis.Fokin@jetbrains.com>
Date: Mon, 24 Aug 2015 14:57:03 +0300
Subject: [PATCH] IDEA-144229 HTML tags in project compiler output path chooser

---
 .../ui/mac/MacFileChooserDialogImpl.java      |  2 +-
 .../openapi/util/text/StringUtil.java         | 35 +++++++++++++++++++
 .../vcs/log/ui/frame/DetailsPanel.java        | 23 +-----------
 3 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java b/platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java
index ba54fd98bab4..c29a29c2454d 100644
--- a/platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java
@@ -242,7 +242,7 @@ public class MacFileChooserDialogImpl implements PathChooserDialog {
 
       String description = chooserDescriptor.getDescription();
       if (!StringUtil.isEmpty(description)) {
-        invoke(chooser, "setMessage:", Foundation.nsString(description));
+        invoke(chooser, "setMessage:", Foundation.nsString(StringUtil.removeHtmlTags(description)));
       }
 
       if (Foundation.isClassRespondsToSelector(nsOpenPanel, Foundation.createSelector("setCanCreateDirectories:"))) {
diff --git a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
index 87da0e7db2e7..7748c3e26404 100644
--- a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
@@ -29,8 +29,12 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.swing.text.html.HTMLEditorKit;
+import javax.swing.text.html.parser.ParserDelegator;
 import java.beans.Introspector;
 import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -46,6 +50,27 @@ public class StringUtil extends StringUtilRt {
   @NonNls private static final Pattern EOL_SPLIT_PATTERN_WITH_EMPTY = Pattern.compile(" *(\r|\n|\r\n) *");
   @NonNls private static final Pattern EOL_SPLIT_DONT_TRIM_PATTERN = Pattern.compile("(\r|\n|\r\n)+");
 
+  private static class MyHtml2Text extends HTMLEditorKit.ParserCallback {
+    @NotNull private final StringBuilder myBuffer = new StringBuilder();
+
+    public void parse(Reader in) throws IOException {
+      myBuffer.setLength(0);
+      new ParserDelegator().parse(in, this, Boolean.TRUE);
+    }
+
+    public void handleText(char[] text, int pos) {
+      if (myBuffer.length() > 0) myBuffer.append(SystemProperties.getLineSeparator());
+
+      myBuffer.append(text);
+    }
+
+    public String getText() {
+      return myBuffer.toString();
+    }
+  };
+
+  private static MyHtml2Text html2TextParser = new MyHtml2Text();
+
   public static final NotNullFunction<String, String> QUOTER = new NotNullFunction<String, String>() {
     @Override
     @NotNull
@@ -2115,6 +2140,16 @@ public class StringUtil extends StringUtilRt {
     return replace(text, REPLACES_DISP, REPLACES_REFS);
   }
 
+  public static String removeHtmlTags (@NotNull String htmlString) {
+    try {
+      html2TextParser.parse(new StringReader(htmlString));
+    }
+    catch (IOException e) {
+        LOG.error(e);
+    }
+    return html2TextParser.getText();
+  }
+
   @NonNls private static final String[] MN_QUOTED = {"&&", "__"};
   @NonNls private static final String[] MN_CHARS = {"&", "_"};
 
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java
index 758adab67df7..279a4360a61b 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java
@@ -443,9 +443,7 @@ class DetailsPanel extends JPanel implements ListSelectionListener {
         StringWriter sw = new StringWriter(p1.getOffset() - p0.getOffset());
         getEditorKit().write(sw, doc, p0.getOffset(), p1.getOffset() - p0.getOffset());
 
-        MyHtml2Text parser = new MyHtml2Text();
-        parser.parse(new StringReader(sw.toString()));
-        return parser.getText();
+        return StringUtil.removeHtmlTags(sw.toString());
       }
       catch (BadLocationException e) {
         LOG.warn(e);
@@ -456,25 +454,6 @@ class DetailsPanel extends JPanel implements ListSelectionListener {
       return super.getSelectedText();
     }
 
-    private static class MyHtml2Text extends HTMLEditorKit.ParserCallback {
-      @NotNull private final StringBuilder myBuffer = new StringBuilder();
-
-      public void parse(Reader in) throws IOException {
-        myBuffer.setLength(0);
-        new ParserDelegator().parse(in, this, Boolean.TRUE);
-      }
-
-      public void handleText(char[] text, int pos) {
-        if (myBuffer.length() > 0) myBuffer.append(SystemProperties.getLineSeparator());
-
-        myBuffer.append(text);
-      }
-
-      public String getText() {
-        return myBuffer.toString();
-      }
-    }
-
     @Override
     public Color getBackground() {
       return getDetailsBackground();