Query result enhancements (#11)

- Support for GraphQL scratch files
- Invoke reformat code action on query result

Author: jimkyndemeyer

.idea/misc.xml

@@ -1,3 +1,10 @@
+## 1.3.0 (2016-05-21)
+
+Features:
+
+- Support for GraphQL scratch files
+- Invoke reformat code action on query result
+
 ## 1.2.0 (2016-03-14)
 
 Features:

CHANGELOG.md

@@ -10,7 +10,7 @@
 <idea-plugin version="2">
   <id>com.intellij.lang.jsgraphql</id>
   <name>JS GraphQL</name>
-  <version>1.2.0</version>
+  <version>1.3.0</version>
   <vendor>Jim Kynde Meyer - [email protected]</vendor>
 
   <description><![CDATA[
@@ -29,6 +29,7 @@
 
   <change-notes><![CDATA[
     <ul>
+      <li>1.3.0: Adds support for GraphQL Scratch Files. Query results are now formatted.</li>
       <li>1.2.0: Contextual query support: Execute buffer, selection, or named operations at the caret position in the GraphQL editor</li>
       <li>1.1.1: Completion after ... fragment spread operator. Language Service 1.1.1 based on graphql 0.4.16 and codemirror-graphql 0.2.2</li>
       <li>1.1.0: Find usages, schema viewer, structure view</li>

resources/META-INF/plugin.xml

@@ -7,8 +7,13 @@
  */
 package com.intellij.lang.jsgraphql;
 
+import com.intellij.ide.scratch.ScratchFileType;
 import com.intellij.lang.jsgraphql.icons.JSGraphQLIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -45,4 +50,20 @@ public String getDefaultExtension() {
     public Icon getIcon() {
         return JSGraphQLIcons.Files.GraphQL;
     }
+
+    /**
+     * Scratch virtual files don't return their actual file type, so we need to find the PsiFile to determine
+     * whether it's a GraphQL scratch file
+     * @return true if the scratch file contains a GraphQL PsiFile
+     */
+    public static boolean isGraphQLScratchFile(Project project, VirtualFile file) {
+        if(file.getFileType() instanceof ScratchFileType) {
+            final PsiManager psiManager = PsiManager.getInstance(project);
+            final PsiFile psiFile = psiManager.findFile(file);
+            if(psiFile != null && psiFile.getFileType() == JSGraphQLFileType.INSTANCE) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

src/main/com/intellij/lang/jsgraphql/JSGraphQLFileType.java

@@ -43,8 +43,8 @@ public void update(AnActionEvent e) {
     @Override
     public void actionPerformed(AnActionEvent e) {
         VirtualFile virtualFile = e.getData(CommonDataKeys.VIRTUAL_FILE);
-        if(isQueryableFile(virtualFile)) {
-            final Project project = e.getData(CommonDataKeys.PROJECT);
+        final Project project = e.getData(CommonDataKeys.PROJECT);
+        if(isQueryableFile(project, virtualFile)) {
             Editor editor = e.getData(CommonDataKeys.EDITOR);
             if(project != null && editor instanceof EditorEx) {
                 final Boolean querying = Boolean.TRUE.equals(editor.getUserData(JSGraphQLLanguageUIProjectService.JS_GRAPH_QL_EDITOR_QUERYING));
@@ -63,11 +63,14 @@ public void actionPerformed(AnActionEvent e) {
         }
     }
 
-    private boolean isQueryableFile(VirtualFile virtualFile) {
+    private boolean isQueryableFile(Project project, VirtualFile virtualFile) {
         if(virtualFile != null) {
             if(virtualFile.getFileType() == JSGraphQLFileType.INSTANCE) {
                 return true;
             }
+            if(JSGraphQLFileType.isGraphQLScratchFile(project, virtualFile)) {
+                return true;
+            }
             if(virtualFile.getFileType() == JsonFileType.INSTANCE && Boolean.TRUE.equals(virtualFile.getUserData(JSGraphQLLanguageUIProjectService.IS_GRAPH_QL_VARIABLES_VIRTUAL_FILE))) {
                 return true;
             }

src/main/com/intellij/lang/jsgraphql/ide/actions/JSGraphQLExecuteEditorAction.java

@@ -11,6 +11,7 @@
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
+import com.intellij.codeInsight.actions.ReformatCodeProcessor;
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
 import com.intellij.execution.filters.UrlFilter;
 import com.intellij.execution.process.OSProcessHandler;
@@ -49,6 +50,7 @@
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.editor.impl.EditorHeaderComponent;
@@ -63,6 +65,7 @@
 import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowManager;
+import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.testFramework.LightVirtualFile;
@@ -295,7 +298,7 @@ private void reloadEndpoints(List<JSGraphQLEndpoint> newEndpoints) {
     // -- editor header component --
 
     private void insertEditorHeaderComponentIfApplicable(@NotNull FileEditorManager source, @NotNull VirtualFile file) {
-        if(file.getFileType() == JSGraphQLFileType.INSTANCE) {
+        if(file.getFileType() == JSGraphQLFileType.INSTANCE || JSGraphQLFileType.isGraphQLScratchFile(source.getProject(), file)) {
             FileEditor fileEditor = source.getSelectedEditor(file);
             if (fileEditor instanceof TextEditor) {
                 final Editor editor = ((TextEditor) fileEditor).getEditor();
@@ -424,7 +427,14 @@ public void executeGraphQL(Editor editor, VirtualFile virtualFile) {
                                     final TextEditor textEditor = (TextEditor) fileEditor;
                                     UIUtil.invokeLaterIfNeeded(() -> {
                                         ApplicationManager.getApplication().runWriteAction(() -> {
-                                            textEditor.getEditor().getDocument().setText(responseJson);
+                                            final Document document = textEditor.getEditor().getDocument();
+                                            document.setText(responseJson);
+                                            if(requestJson.startsWith("{")) {
+                                                final PsiFile psiFile = PsiDocumentManager.getInstance(myProject).getPsiFile(document);
+                                                if (psiFile != null) {
+                                                    new ReformatCodeProcessor(psiFile, false).run();
+                                                }
+                                            }
                                         });
                                         final StringBuilder queryResultText = new StringBuilder(virtualFile.getName()).
                                                 append(": ").

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

@@ -10,11 +10,8 @@
  import com.intellij.lang.jsgraphql.languageservice.CodeMirrorNodeLanguageServiceClientTest;
  import com.intellij.lang.jsgraphql.languageservice.JSGraphQLNodeLanguageServiceInstance;
  import com.intellij.openapi.command.WriteCommandAction;
- import com.intellij.openapi.module.impl.ModuleImpl;
- import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
  import com.intellij.psi.codeStyle.CodeStyleManager;
  import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
- import com.intellij.testFramework.PsiTestUtil;
  import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
  import org.junit.Test;
 
@@ -24,7 +21,6 @@
  public class JSGraphQLCodeInsightTest extends LightCodeInsightFixtureTestCase {
     @Override
     protected void setUp() throws Exception {
-        VfsRootAccess.SHOULD_PERFORM_ACCESS_CHECK = false; // TODO: a workaround for v15
 
         // TODO: This test depends on a running JS GraphQL Language service at http://localhost:3000
         // TODO: Fix: This test requires comments around <depends>JavaScript</depends> and <depends>NodeJS</depends> in plugin.xml as a work-around to IDEA's complaint about missing 'NodeJS' and 'JavaScriptDebugger' plugins