Merge pull request #90 from welovecoding/patch-for-issue75

Fixed encoding problem

Author: bennycode

src/main/java/com/welovecoding/nbeditorconfig/io/writer/StyledDocumentWriter.java

@@ -11,6 +11,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.Reader;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -135,7 +136,9 @@ public static void writeWithEditorKit(FileInfo info)
               LOG.log(Level.INFO, "Write to \"document\": {0}", cookie.getDocument());
 
               // Read input stream into the document (which is a "write" operation)
-              kit.read(is, cookie.getDocument(), 0);
+              try (Reader reader = new InputStreamReader(is, info.getCharset())) {
+                kit.read(reader, cookie.getDocument(), 0);
+              }
               cookie.saveDocument();
 
               info.getFileObject().setAttribute(ENCODING_SETTING, info.getCharset().name());

src/main/java/com/welovecoding/nbeditorconfig/processor/EditorConfigProcessor.java

@@ -13,12 +13,14 @@
 import com.welovecoding.nbeditorconfig.processor.operation.TrimTrailingWhiteSpaceOperation;
 import com.welovecoding.nbeditorconfig.processor.operation.tobedone.CharsetOperation;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
 import org.netbeans.api.project.Project;
+import org.netbeans.api.queries.FileEncodingQuery;
 import org.netbeans.modules.editor.indent.spi.CodeStylePreferences;
 import org.openide.cookies.EditorCookie;
 import org.openide.filesystems.FileObject;
@@ -117,8 +119,11 @@ protected FileInfo excuteOperations(DataObject dataObject, MappedEditorConfig co
     FileObject primaryFile = dataObject.getPrimaryFile();
     StringBuilder content;
 
+    MappedCharset mappedCharset = config.getCharset();
+    Charset defaultCharset = FileEncodingQuery.getEncoding(primaryFile);
     try {
-      content = new StringBuilder(primaryFile.asText());
+      String charset = mappedCharset != null ? mappedCharset.getCharset().name() : defaultCharset.name();
+      content = new StringBuilder(primaryFile.asText(charset));
     } catch (IOException ex) {
       LOG.log(Level.WARNING, "Failed to get the text of the file");
       content = new StringBuilder("");
@@ -136,15 +141,13 @@ protected FileInfo excuteOperations(DataObject dataObject, MappedEditorConfig co
     info.setCookie(cookie);
 
     // 1. "charset"
-    MappedCharset mappedCharset = config.getCharset();
-
     if (mappedCharset != null) {
       logOperation(EditorConfigConstant.CHARSET, mappedCharset.getName());
       boolean changedCharset = new CharsetOperation().run(dataObject, mappedCharset);
       fileChangeNeeded = fileChangeNeeded || changedCharset;
       info.setCharset(mappedCharset.getCharset());
     } else {
-      info.setCharset(StandardCharsets.UTF_8);
+      info.setCharset(defaultCharset);
     }
 
     // 2. "end_of_line"
@@ -191,11 +194,6 @@ protected FileInfo excuteOperations(DataObject dataObject, MappedEditorConfig co
       fileChangeNeeded = fileChangeNeeded || trimmedWhiteSpaces;
     }
 
-    if (mappedCharset != null) {
-    } else {
-      info.setCharset(StandardCharsets.UTF_8);
-    }
-
     info.setFileChangeNeeded(fileChangeNeeded);
     info.setStyleFlushNeeded(styleFlushNeeded);