Removes GraphQL schema from scratch file formats (#14)

Author: jimkyndemeyer

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.3.2 (2016-06-23)
+
+Changes:
+
+- Closes #14 Remove GraphQL schema from scratch file formats
+
 ## 1.3.1 (2016-06-09)
 
 Changes:

resources/META-INF/plugin.xml

@@ -10,7 +10,7 @@
 <idea-plugin version="2">
   <id>com.intellij.lang.jsgraphql</id>
   <name>JS GraphQL</name>
-  <version>1.3.1</version>
+  <version>1.3.2</version>
   <vendor>Jim Kynde Meyer - [email protected]</vendor>
 
   <description><![CDATA[
@@ -29,6 +29,7 @@
 
   <change-notes><![CDATA[
     <ul>
+      <li>1.3.2: Removes GraphQL schema from scratch file formats.</li>
       <li>1.3.1: Fixes compatibility issue with WebStorm 2016.2 EAP.</li>
       <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>

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

@@ -305,12 +305,14 @@ private void insertEditorHeaderComponentIfApplicable(@NotNull FileEditorManager
                 if(editor.getHeaderComponent() instanceof JSGraphQLEditorHeaderComponent) {
                     return;
                 }
-                final JComponent headerComponent = createHeaderComponent(fileEditor, editor);
-                editor.setHeaderComponent(headerComponent);
-                if(editor instanceof EditorEx) {
-                    ((EditorEx) editor).setPermanentHeaderComponent(headerComponent);
-                }
-                editor.getScrollingModel().scrollVertically(-1000);
+                UIUtil.invokeLaterIfNeeded(() -> { // ensure components are created on the swing thread
+                    final JComponent headerComponent = createHeaderComponent(fileEditor, editor);
+                    editor.setHeaderComponent(headerComponent);
+                    if(editor instanceof EditorEx) {
+                        ((EditorEx) editor).setPermanentHeaderComponent(headerComponent);
+                    }
+                    editor.getScrollingModel().scrollVertically(-1000);
+                });
             }
         }
     }

src/main/com/intellij/lang/jsgraphql/schema/JSGraphQLSchemaFileType.java

@@ -7,8 +7,13 @@
  */
 package com.intellij.lang.jsgraphql.schema;
 
+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.GraphQLSchema;
     }
+
+    /**
+     * Scratch virtual files don't return their actual file type, so we need to find the PsiFile to determine
+     * whether it's a GraphQL schema scratch file
+     * @return true if the scratch file contains a GraphQL Schema 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() == JSGraphQLSchemaFileType.INSTANCE) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

src/main/com/intellij/lang/jsgraphql/schema/JSGraphQLSchemaLanguage.java

@@ -7,9 +7,12 @@
  */
 package com.intellij.lang.jsgraphql.schema;
 
+import com.intellij.lang.DependentLanguage;
 import com.intellij.lang.Language;
 
-public class JSGraphQLSchemaLanguage extends Language {
+// implement DependentLanguage to prevent Scratch files
+// (see com.intellij.ide.scratch.ScratchFileServiceImpl.MyLanguages.getAvailableValues())
+public class JSGraphQLSchemaLanguage extends Language implements DependentLanguage {
     public static final JSGraphQLSchemaLanguage INSTANCE = new JSGraphQLSchemaLanguage();
     public static final String LANGUAGE_ID = "GraphQL Schema";
 

src/main/com/intellij/lang/jsgraphql/schema/ide/project/JSGraphQLSchemaLanguageProjectService.java

@@ -71,6 +71,12 @@ public JSGraphQLSchemaLanguageProjectService(@NotNull final Project project) {
         final MessageBusConnection connection = project.getMessageBus().connect(this);
         connection.subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, this);
         connection.subscribe(JSGraphQLLanguageServiceListener.TOPIC, this);
+
+        // mark restored schema files as viewers
+        final FileEditorManager fileEditorManager = FileEditorManager.getInstance(project);
+        for (VirtualFile virtualFile : fileEditorManager.getOpenFiles()) {
+            markSchemaFileAsViewer(fileEditorManager, virtualFile);
+        }
     }
 
 
@@ -174,27 +180,34 @@ public PsiElement getReference(PsiElement element) {
 
     @Override
     public void fileOpened(@NotNull FileEditorManager source, @NotNull VirtualFile file) {
-        if(file.getFileType() == JSGraphQLSchemaFileType.INSTANCE) {
-            // mark the schema editor as viewer only
-            final FileEditor fileEditor = source.getSelectedEditor(file);
-            if (fileEditor instanceof TextEditor) {
-                final Editor editor = ((TextEditor) fileEditor).getEditor();
-                if (editor instanceof EditorEx) {
-                    ((EditorEx) editor).setViewer(true);
-                }
-            }
-        }
+        markSchemaFileAsViewer(source, file);
     }
 
     @Override
     public void fileClosed(@NotNull FileEditorManager source, @NotNull VirtualFile file) {}
 
     @Override
-    public void selectionChanged(@NotNull FileEditorManagerEvent event) {}
+    public void selectionChanged(@NotNull FileEditorManagerEvent event) {
+        if(event.getNewFile() != null) {
+            markSchemaFileAsViewer(event.getManager(), event.getNewFile());
+        }
+    }
 
     @Override
     public void dispose() {}
 
+    private void markSchemaFileAsViewer(@NotNull FileEditorManager source, @NotNull VirtualFile file) {
+        if(file.getFileType() == JSGraphQLSchemaFileType.INSTANCE || JSGraphQLSchemaFileType.isGraphQLScratchFile(project, file)) {
+            // mark the schema editor as viewer only
+            final FileEditor fileEditor = source.getSelectedEditor(file);
+            if (fileEditor instanceof TextEditor) {
+                final Editor editor = ((TextEditor) fileEditor).getEditor();
+                if (editor instanceof EditorEx) {
+                    ((EditorEx) editor).setViewer(true);
+                }
+            }
+        }
+    }
 
     // ---- JSGraphQLLanguageServiceListener ----