diff --git a/platform/lang-impl/src/com/intellij/openapi/editor/richcopy/view/HtmlTransferableData.java b/platform/lang-impl/src/com/intellij/openapi/editor/richcopy/view/HtmlTransferableData.java index e9780b732eec..7db4e418f569 100644 --- a/platform/lang-impl/src/com/intellij/openapi/editor/richcopy/view/HtmlTransferableData.java +++ b/platform/lang-impl/src/com/intellij/openapi/editor/richcopy/view/HtmlTransferableData.java @@ -32,7 +32,7 @@ import java.awt.datatransfer.DataFlavor; */ public class HtmlTransferableData extends AbstractSyntaxAwareReaderTransferableData implements MarkupHandler { - @NotNull public static final DataFlavor FLAVOR = new DataFlavor("text/html;class=java.io.Reader", "HTML text"); + @NotNull public static final DataFlavor FLAVOR = new DataFlavor("text/html; class=java.io.Reader; charset=UTF-8", "HTML text"); private StringBuilder myResultBuffer; private ColorRegistry myColorRegistry; @@ -64,7 +64,8 @@ public class HtmlTransferableData extends AbstractSyntaxAwareReaderTransferableD myMaxLength = maxLength; try { buildColorMap(); - myResultBuffer.append("
")
+                    .append("
");
+      myResultBuffer.append("
"); } finally { myResultBuffer = null; diff --git a/platform/platform-tests/testData/editor/richcopy/BlockSelection.html b/platform/platform-tests/testData/editor/richcopy/BlockSelection.html index 55a7dbc0558a..6d79208d30e3 100644 --- a/platform/platform-tests/testData/editor/richcopy/BlockSelection.html +++ b/platform/platform-tests/testData/editor/richcopy/BlockSelection.html @@ -1,3 +1,3 @@ -
 int field;
+
 int field;
 
- public static void main(String[] args) {
\ No newline at end of file + public static void main(String[] args) {
\ No newline at end of file diff --git a/platform/platform-tests/testData/editor/richcopy/NormalSelection.html b/platform/platform-tests/testData/editor/richcopy/NormalSelection.html index 8805dfd28b21..6c4f8dc96153 100644 --- a/platform/platform-tests/testData/editor/richcopy/NormalSelection.html +++ b/platform/platform-tests/testData/editor/richcopy/NormalSelection.html @@ -1,8 +1,8 @@ -
public class Basic {
+
public class Basic {
   int field;
 
   public static void main(String[] args) {
     System.out.println("Hello\tworld!");
   }
 }
-
\ No newline at end of file +
\ No newline at end of file