Merge pull request #1 from andreymukha/cyrillic_symbols

fix issue johna1203#17
andreymukha · Dec 16, 2015 · cb99c26 · cb99c26 · Kontrael · May 31, 2017
2 parents 7dc4555 + b0fff6b
commit cb99c26
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/com/kodokux/github/GithubGetGistAction.java b/src/com/kodokux/github/GithubGetGistAction.java
@@ -23,13 +23,12 @@
 import com.kodokux.github.util.GetGistSettings;
 import icons.GithubIcons;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.plugins.github.util.GithubAuthDataHolder;
 import org.jetbrains.plugins.github.util.GithubSettings;
-import org.jetbrains.plugins.github.util.GithubUtil;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.util.Map;
 import java.util.Set;
 
@@ -75,6 +74,12 @@ public void consume(JsonElement jsonElement) {
                 if (jsonElement != null) {
                     for (JsonElement jsonElement1 : jsonElement.getAsJsonArray()) {
                         String name = jsonElement1.getAsJsonObject().get("description").getAsString();
+                        try {
+                            byte b[] = name.getBytes("Windows-1251");
+                            name = new String(b, "UTF-8");
+                        } catch (UnsupportedEncodingException e1) {
+                            e1.printStackTrace();
+                        }
                         DefaultMutableTreeNode node = new DefaultMutableTreeNode(name);
                         root.add(node);
                         if (jsonElement1.getAsJsonObject().has("files")) {

diff --git a/src/com/kodokux/github/ui/GithubGetGistToolWindowView.java b/src/com/kodokux/github/ui/GithubGetGistToolWindowView.java
@@ -33,7 +33,6 @@
 import com.intellij.ui.treeStructure.Tree;
 import com.kodokux.github.EditorManager;
 import com.kodokux.github.GitHubGistFileTreeNode;
-import icons.GithubIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -48,6 +47,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.URL;
 
@@ -251,6 +251,12 @@ public void onSuccess() {
                         ApplicationManager.getApplication().runWriteAction(new Runnable() {
                             @Override
                             public void run() {
+                                try {
+                                    byte[] b = fileSource.getBytes("Windows-1251");
+                                    fileSource = new String(b, "UTF-8");
+                                } catch (UnsupportedEncodingException e) {
+                                    e.printStackTrace();
+                                }
                                 getEditor().getDocument().setText(fileSource);
                                 //GithubGetGistCache.setCache(project, fileNode.getFilename(), fileSource);
                             }