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

IDEA-179890 'Copy as rich text' doesn't work when pasting to Keynote

Browse Source
This commit is contained in:
Dmitry Batrak
2017-10-16 20:22:37 +03:00
parent 5204395bdc
commit c80418fcdb
4 changed files with 46 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/editor/richcopy/view/HtmlTransferableData.java
+7 -16
View File
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.editor.richcopy.view;
import com.intellij.openapi.editor.richcopy.model.ColorRegistry;
@@ -32,7 +18,7 @@ import java.awt.datatransfer.DataFlavor;
* @since 3/28/13 1:06 PM
*/
public class HtmlTransferableData extends AbstractSyntaxAwareReaderTransferableData implements MarkupHandler {
public static final int PRIORITY = 200;
@NotNull public static final DataFlavor FLAVOR = new DataFlavor("text/html; class=java.io.Reader; charset=UTF-8", "HTML text");
private final int myTabSize;
@@ -215,4 +201,9 @@ public class HtmlTransferableData extends AbstractSyntaxAwareReaderTransferableD
}
return true;
}
@Override
public int getPriority() {
return PRIORITY;
}
}
platform/lang-impl/src/com/intellij/openapi/editor/richcopy/view/RtfTransferableData.java
+7 -16
View File
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.editor.richcopy.view;
import com.intellij.ide.MacOSApplicationProvider;
@@ -28,7 +14,7 @@ import java.awt.color.ColorSpace;
import java.awt.datatransfer.DataFlavor;
public class RtfTransferableData extends AbstractSyntaxAwareInputStreamTransferableData {
public static final int PRIORITY = 100;
@NotNull public static final DataFlavor FLAVOR = new DataFlavor("text/rtf;class=java.io.InputStream", "RTF text");
@NotNull private static final String HEADER_PREFIX = "{\\rtf1\\ansi\\deff0";
@@ -107,6 +93,11 @@ public class RtfTransferableData extends AbstractSyntaxAwareInputStreamTransfera
buffer.append("\\fs").append(Math.round(fontSize * 2));
}
@Override
public int getPriority() {
return PRIORITY;
}
private static class MyVisitor implements MarkupHandler {
@NotNull private final StringBuilder myBuffer;
platform/platform-impl/src/com/intellij/codeInsight/editorActions/TextBlockTransferable.java
+21 -24
View File
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.codeInsight.editorActions;
@@ -21,6 +7,7 @@ import com.intellij.openapi.editor.RawText;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -29,10 +16,7 @@ import java.awt.datatransfer.Transferable;
import java.awt.datatransfer.UnsupportedFlavorException;
import java.io.IOException;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.*;
public class TextBlockTransferable implements Transferable {
private final Collection<TextBlockTransferableData> myExtraData;
@@ -45,19 +29,22 @@ public class TextBlockTransferable implements Transferable {
myExtraData = extraData;
myRawText = rawText;
List<DataFlavor> dataFlavors = new ArrayList<>();
Collections.addAll(dataFlavors, DataFlavor.stringFlavor, DataFlavor.plainTextFlavor);
List<DataFlavorWithPriority> dataFlavors = new ArrayList<>();
Collections.addAll(dataFlavors,
new DataFlavorWithPriority(DataFlavor.stringFlavor, TextBlockTransferableData.PLAIN_TEXT_PRIORITY),
new DataFlavorWithPriority(DataFlavor.plainTextFlavor, TextBlockTransferableData.PLAIN_TEXT_PRIORITY));
final DataFlavor flavor = RawText.getDataFlavor();
if (myRawText != null && flavor != null) {
dataFlavors.add(flavor);
dataFlavors.add(new DataFlavorWithPriority(flavor, TextBlockTransferableData.PLAIN_TEXT_PRIORITY));
}
for(TextBlockTransferableData data: extraData) {
final DataFlavor blockFlavor = data.getFlavor();
if (blockFlavor != null) {
dataFlavors.add(blockFlavor);
dataFlavors.add(new DataFlavorWithPriority(blockFlavor, data.getPriority()));
}
}
myTransferDataFlavors = dataFlavors.toArray(new DataFlavor[dataFlavors.size()]);
dataFlavors.sort(Comparator.comparingInt(value -> -value.priority));
myTransferDataFlavors = ContainerUtil.map2Array(dataFlavors, DataFlavor.class, value -> value.flavor);
}
@NotNull
@@ -146,4 +133,14 @@ public class TextBlockTransferable implements Transferable {
return StringUtil.convertLineSeparators(text, newSeparator);
}
}
private static class DataFlavorWithPriority {
private final DataFlavor flavor;
private final int priority;
private DataFlavorWithPriority(DataFlavor flavor, int priority) {
this.flavor = flavor;
this.priority = priority;
}
}
}
platform/platform-impl/src/com/intellij/codeInsight/editorActions/TextBlockTransferableData.java
+11 -15
View File
@@ -1,30 +1,26 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.codeInsight.editorActions;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.Transferable;
/**
* @author yole
*/
public interface TextBlockTransferableData {
int PLAIN_TEXT_PRIORITY = 0;
DataFlavor getFlavor();
int getOffsetCount();
int getOffsets(final int[] offsets, final int index);
int setOffsets(final int[] offsets, final int index);
/**
* Priority defines an order in which resulting transferable will mention available DataFlavor-s.
*
* @see Transferable#getTransferDataFlavors()
*/
default int getPriority() { return PLAIN_TEXT_PRIORITY; }
}