From 29acb3c08a2118cd4fe5029c81d10fa9037724e6 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Fri, 14 Apr 2017 15:53:49 +0300 Subject: [PATCH] honor output file encoding when using writer (IDEA-171453) --- .../src/org/jetbrains/jps/javac/OutputFileObject.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jps/jps-builders-6/src/org/jetbrains/jps/javac/OutputFileObject.java b/jps/jps-builders-6/src/org/jetbrains/jps/javac/OutputFileObject.java index 2c3b103b1cd6..0a93a947f9ad 100644 --- a/jps/jps-builders-6/src/org/jetbrains/jps/javac/OutputFileObject.java +++ b/jps/jps-builders-6/src/org/jetbrains/jps/javac/OutputFileObject.java @@ -143,6 +143,12 @@ public final class OutputFileObject extends SimpleJavaFileObject { return FileUtilRt.loadFile(myFile, encoding, false); } + @Override + public Writer openWriter() throws IOException { + final String encoding = myEncodingName; + return encoding != null? new OutputStreamWriter(openOutputStream(), encoding) : super.openWriter(); + } + @Nullable public BinaryContent getContent() { return myContent;