Adopted query result viewer fixes from v1 branch (#164)

Author: jimkyndemeyer

src/main/com/intellij/lang/jsgraphql/v1/ide/project/JSGraphQLLanguageUIProjectService.java

@@ -72,6 +72,7 @@
 import com.intellij.util.containers.ImmutableList;
 import com.intellij.util.messages.MessageBusConnection;
 import com.intellij.util.ui.UIUtil;
+import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.StringRequestEntity;
@@ -384,7 +385,9 @@ public void executeGraphQL(Editor editor, VirtualFile virtualFile) {
                     return;
                 }
                 final String requestJson = "{\"query\":\"" + StringEscapeUtils.escapeJavaScript(context.query) + "\", \"variables\":" + variables + "}";
-                final HttpClient httpClient = new HttpClient(new HttpClientParams());
+                final HttpClientParams params = new HttpClientParams();
+                params.setContentCharset("UTF-8"); // set fallback charset to align with JSON spec
+                final HttpClient httpClient = new HttpClient(params);
                 final String url = endpoint.getUrl();
                 try {
                     final PostMethod method = new PostMethod(url);
@@ -399,11 +402,13 @@ public void executeGraphQL(Editor editor, VirtualFile virtualFile) {
                                 httpClient.executeMethod(method);
                                 final String responseJson = Optional.fromNullable(method.getResponseBodyAsString()).or("");
                                 sw.stop();
+                                final Header responseHeader = method.getResponseHeader("Content-Type");
+                                final boolean reformatJson = responseHeader != null && "application/json".equals(responseHeader.getValue());
                                 final Integer errorCount = getErrorCount(responseJson);
                                 if (fileEditor instanceof TextEditor) {
                                     final TextEditor textEditor = (TextEditor) fileEditor;
                                     UIUtil.invokeLaterIfNeeded(() -> {
-                                        updateQueryResultEditor(responseJson, textEditor);
+                                        updateQueryResultEditor(responseJson, textEditor, reformatJson);
                                         final StringBuilder queryResultText = new StringBuilder(virtualFile.getName()).
                                                 append(": ").
                                                 append(sw.getTime()).
@@ -455,7 +460,7 @@ public void executeGraphQL(Editor editor, VirtualFile virtualFile) {
     public void showQueryResult(String jsonResponse) {
         if (fileEditor instanceof TextEditor) {
             final TextEditor fileEditor = (TextEditor) this.fileEditor;
-            updateQueryResultEditor(jsonResponse, fileEditor);
+            updateQueryResultEditor(jsonResponse, fileEditor, true);
             showQueryResultEditor(fileEditor);
         }
     }
@@ -465,15 +470,17 @@ private void showQueryResultEditor(TextEditor textEditor) {
         textEditor.getEditor().getScrollingModel().scrollVertically(0);
     }
 
-    private void updateQueryResultEditor(String responseJson, TextEditor textEditor) {
+    private void updateQueryResultEditor(String responseJson, TextEditor textEditor, boolean reformatJson) {
         ApplicationManager.getApplication().runWriteAction(() -> {
             final Document document = textEditor.getEditor().getDocument();
-            document.setText(responseJson);
-            if (responseJson.startsWith("{")) {
-                final PsiFile psiFile = PsiDocumentManager.getInstance(myProject).getPsiFile(document);
-                if (psiFile != null) {
-                    new ReformatCodeProcessor(psiFile, false).run();
-                }
+            document.setText(responseJson.replace("\r\n", "\n"));
+            if(reformatJson) {
+                PsiDocumentManager.getInstance(myProject).performForCommittedDocument(document, () -> {
+                    final PsiFile psiFile = PsiDocumentManager.getInstance(myProject).getPsiFile(document);
+                    if (psiFile != null) {
+                        new ReformatCodeProcessor(psiFile, false).run();
+                    }
+                }); // wait for doc to update PSI before reformat
             }
         });
     }