Skip to content

Fix encoding for 'compare with clipboard' if default encoding is not UTF-8 #2307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laeubi merged 2 commits into from
Dec 11, 2025
+8 −3
Merged

Fix encoding for 'compare with clipboard' if default encoding is not UTF-8 #2307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eea8d93
Fix encoding for 'compare with clipboard' if default encoding is not
wahlbrink Dec 10, 2025
cb4a4f7
Version bump(s) for 4.39 stream
eclipse-platform-bot Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.compare; singleton:=true
Bundle-Version: 3.11.600.qualifier
Bundle-Version: 3.11.700.qualifier
Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
9 changes: 7 additions & 2 deletions team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ClipboardCompare.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.eclipse.compare.CompareConfiguration;
import org.eclipse.compare.CompareEditorInput;
import org.eclipse.compare.CompareUI;
import org.eclipse.compare.IStreamContentAccessor;
import org.eclipse.compare.IEncodedStreamContentAccessor;
import org.eclipse.compare.ITypedElement;
import org.eclipse.compare.structuremergeviewer.DiffNode;
import org.eclipse.core.resources.IFile;
Expand Down Expand Up @@ -125,7 +125,7 @@ private void processComparison(IFile file, Shell parentShell) throws IOException
* @param parentShell The shell containing this window's controls
*/
private void showComparison(String source, String fileName, String clipboardContents, Shell parentShell) {
class ClipboardTypedElement implements ITypedElement, IStreamContentAccessor {
class ClipboardTypedElement implements ITypedElement, IEncodedStreamContentAccessor {
private final String name;
private final String content;

Expand All @@ -149,6 +149,11 @@ public String getType() {
return null;
}

@Override
public String getCharset() throws CoreException {
return "UTF-8"; //$NON-NLS-1$
}

@Override
public InputStream getContents() throws CoreException {
return new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8));
Expand Down
Loading