Remove a few workarounds/hacks (#49)

* Simplify icons

* Minor tweaks in plugin.xml

* Simplify stripping Apollo client directives when executing query

* Simplify adding 'Open in Sandbox' button

Author: BoD

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

@@ -43,7 +43,7 @@ private GraphQLFileType() {
 
   @Override
   public @NotNull Icon getIcon() {
-    return GraphQLIcons.FILE;
+    return GraphQLIcons.Files.GraphQL;
   }
 
   /**

jsgraphql/src/main/java/com/intellij/lang/jsgraphql/icons/GraphQLIconProvider.java

@@ -13,77 +13,31 @@ import com.intellij.ui.LayeredIcon
 import javax.swing.Icon
 
 object GraphQLIcons {
-  @JvmField
-  val FILE: Icon = load("/icons/graphql.svg")
-
   object Logos {
-    @JvmField
-    val GraphQL: Icon = FILE
-
-    @JvmField
-    val Relay: Icon = load("/icons/relay.svg")
-
-    @JvmField
-    val Apollo: Icon = load("/icons/apollo.svg")
+    val GraphQL: Icon = load("/icons/graphql.svg")
   }
 
   object Files {
     @JvmField
-    val GraphQL: Icon = FILE
+    val GraphQL: Icon = Logos.GraphQL
 
     @JvmField
     val GraphQLConfig: Icon = load("/icons/graphqlConfig.svg")
 
-    @JvmField
     val GraphQLSchema: Icon = load("/icons/graphqlSchema.svg")
 
-    @JvmField
     val GraphQLScratch: Icon = LayeredIcon.layeredIcon { arrayOf(GraphQL, AllIcons.Actions.Scratch) }
   }
 
   object UI {
     @JvmField
     val GraphQLToolWindow: Icon = load("/icons/graphqlToolWindow.svg")
 
-    @JvmField
     val GraphQLVariables: Icon = load("/icons/variable.svg")
 
-    @JvmField
     val GraphQLNode: Icon = load("/icons/graphqlNode.svg")
   }
 
-  object Schema {
-    @JvmField
-    val Field: Icon = load("/icons/field.svg")
-
-    @JvmField
-    val Scalar: Icon = load("/icons/scalar.svg")
-
-    @JvmField
-    val Enum: Icon = load("/icons/enum.svg")
-
-    @JvmField
-    val Type: Icon = load("/icons/type.svg")
-
-    @JvmField
-    val Interface: Icon = load("/icons/interface.svg")
-
-    @JvmField
-    val Query: Icon = load("/icons/query.svg")
-
-    @JvmField
-    val Attribute: Icon = load("/icons/attribute.svg")
-
-    @JvmField
-    val Subscription: Icon = load("/icons/subscription.svg")
-
-    @JvmField
-    val Mutation: Icon = load("/icons/mutation.svg")
-
-    @JvmField
-    val Fragment: Icon = load("/icons/fragment.svg")
-  }
-
   private fun load(path: String): Icon {
     return IconLoader.getIcon(path, GraphQLIcons::class.java)
   }

jsgraphql/src/main/java/com/intellij/lang/jsgraphql/icons/GraphQLIcons.kt

@@ -35,7 +35,7 @@ class GraphQLConfigStatusEditorNotificationProvider : EditorNotificationProvider
       fileEditor.putUserData(RELOAD_TIMESTAMP_KEY, null)
       EditorNotificationPanel(fileEditor, JBUI.CurrentTheme.Notification.Error.BACKGROUND).apply {
         text = GraphQLBundle.message("graphql.config.evaluation.error")
-        icon(GraphQLIcons.FILE)
+        icon(GraphQLIcons.Logos.GraphQL)
         val cause = state.error?.cause
         if (cause != null) {
           createActionLabel(

jsgraphql/src/main/java/com/intellij/lang/jsgraphql/ide/config/GraphQLConfigStatusEditorNotificationProvider.kt

@@ -18,7 +18,7 @@ class GraphQLMigrateLegacyConfigEditorNotificationProvider : EditorNotificationP
 
       EditorNotificationPanel().apply {
         text = GraphQLBundle.message("graphql.notification.migrate.config.text")
-        icon(GraphQLIcons.FILE)
+        icon(GraphQLIcons.Logos.GraphQL)
         createActionLabel(
           GraphQLBundle.message("graphql.notification.migrate.config.action"),
           GraphQLMigrateLegacyConfigAction.ACTION_ID

jsgraphql/src/main/java/com/intellij/lang/jsgraphql/ide/config/migration/GraphQLMigrateLegacyConfigEditorNotificationProvider.kt

@@ -82,8 +82,8 @@ public final class GraphQLColorSettingsPage implements ColorSettingsPage {
   }
 
   @Override
-  public @Nullable Icon getIcon() {
-    return GraphQLIcons.FILE;
+  public Icon getIcon() {
+    return GraphQLIcons.Logos.INSTANCE.getGraphQL();
   }
 
   @Override

jsgraphql/src/main/java/com/intellij/lang/jsgraphql/ide/highlighting/GraphQLColorSettingsPage.java

@@ -35,7 +35,7 @@ class GraphQLGeneratedSourcesEditorNotificationProvider : EditorNotificationProv
         else {
           GraphQLBundle.message("graphql.notification.sdl.generation.error.text")
         }
-        icon(GraphQLIcons.FILE)
+        icon(GraphQLIcons.Logos.GraphQL)
         createActionLabel(
           GraphQLBundle.message("graphql.notification.sdl.generation.stack.trace.action"), {
           val stackTrace = ExceptionUtil.getThrowableText(error)

jsgraphql/src/main/java/com/intellij/lang/jsgraphql/ide/introspection/source/GraphQLGeneratedSourcesEditorNotificationProvider.kt

@@ -4,8 +4,18 @@ import com.intellij.ide.projectView.PresentationData
 import com.intellij.lang.jsgraphql.GraphQLFileType
 import com.intellij.lang.jsgraphql.GraphQLLanguage
 import com.intellij.lang.jsgraphql.icons.GraphQLIcons
-import com.intellij.lang.jsgraphql.psi.*
-import com.intellij.microservices.endpoints.*
+import com.intellij.lang.jsgraphql.psi.GraphQLElement
+import com.intellij.lang.jsgraphql.psi.GraphQLFieldDefinition
+import com.intellij.lang.jsgraphql.psi.GraphQLFile
+import com.intellij.lang.jsgraphql.psi.GraphQLNamedTypeDefinition
+import com.intellij.lang.jsgraphql.psi.GraphQLObjectTypeDefinition
+import com.intellij.lang.jsgraphql.psi.GraphQLTypeNameDefinition
+import com.intellij.microservices.endpoints.EndpointType
+import com.intellij.microservices.endpoints.EndpointsFilter
+import com.intellij.microservices.endpoints.EndpointsProvider
+import com.intellij.microservices.endpoints.FrameworkPresentation
+import com.intellij.microservices.endpoints.GRAPH_QL_TYPE
+import com.intellij.microservices.endpoints.ModuleEndpointsFilter
 import com.intellij.navigation.ItemPresentation
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
@@ -27,21 +37,21 @@ internal class FieldDefinitionEndpoint(val field: GraphQLFieldDefinition) : Grap
   override fun getEndpointPresentation(group: GraphQLFile): ItemPresentation {
     val name = field.name ?: "Unknown"
     val typeName = field.parentOfType<GraphQLNamedTypeDefinition>()?.typeNameDefinition?.name ?: "Unknown"
-    return PresentationData("$typeName.$name", group.name, GraphQLIcons.FILE, null)
+    return PresentationData("$typeName.$name", group.name, GraphQLIcons.Logos.GraphQL, null)
   }
 }
 
 internal class TypeNameDefinitionEndpoint(val type: GraphQLTypeNameDefinition) : GraphQLEndpoint(type) {
   override fun getEndpointPresentation(group: GraphQLFile): ItemPresentation {
     val typeName = type.parentOfType<GraphQLNamedTypeDefinition>()?.typeNameDefinition?.name ?: "Unknown"
-    return PresentationData(typeName, group.name, GraphQLIcons.FILE, null)
+    return PresentationData(typeName, group.name, GraphQLIcons.Logos.GraphQL, null)
   }
 }
 
 internal class GraphQLEndpointsProvider<E : GraphQLElement> : EndpointsProvider<GraphQLFile, GraphQLEndpoint> {
   override val endpointType: EndpointType = GRAPH_QL_TYPE
 
-  override val presentation: FrameworkPresentation = FrameworkPresentation("GraphQL", "GraphQL", GraphQLIcons.FILE)
+  override val presentation: FrameworkPresentation = FrameworkPresentation("GraphQL", "GraphQL", GraphQLIcons.Logos.GraphQL)
 
   override fun getStatus(project: Project): EndpointsProvider.Status =
     if (getGraphQLFiles(project).isNotEmpty()) EndpointsProvider.Status.HAS_ENDPOINTS

jsgraphql/src/main/java/com/intellij/lang/jsgraphql/ide/microservices/GraphQLEndpointsProvider.kt

@@ -35,7 +35,7 @@ public GraphQLLibrary(@NotNull GraphQLLibraryDescriptor libraryDescriptor,
 
   @Override
   public @Nullable Icon getIcon(boolean unused) {
-    return GraphQLIcons.Logos.GraphQL;
+    return GraphQLIcons.Logos.INSTANCE.getGraphQL();
   }
 
   @Override