Merge pull request #400 from jimkyndemeyer/caret-listener-exception-fix

Fixes caret listener causing an exception (#397)

Author: vepanimas

resources/META-INF/plugin.xml

@@ -64,6 +64,7 @@
     <projectService serviceImplementation="com.intellij.lang.jsgraphql.ide.editor.GraphQLIntrospectionService" />
     <projectService serviceInterface="com.intellij.lang.jsgraphql.ide.project.graphqlconfig.GraphQLConfigGlobMatcher" serviceImplementation="com.intellij.lang.jsgraphql.ide.project.graphqlconfig.GraphQLConfigGlobMatcherImpl" />
     <projectService serviceImplementation="com.intellij.lang.jsgraphql.ide.GraphQLRelayModernAnnotationFilter" />
+    <projectService serviceImplementation="com.intellij.lang.jsgraphql.v1.ide.editor.JSGraphQLQueryContextCaretListener" />
 
     <!-- Indexing -->
     <fileBasedIndex implementation="com.intellij.lang.jsgraphql.ide.project.indexing.GraphQLIdentifierIndex" />
@@ -73,7 +74,6 @@
     <postStartupActivity implementation="com.intellij.lang.jsgraphql.endpoint.ide.startup.GraphQLStartupActivity" />
     <postStartupActivity implementation="com.intellij.lang.jsgraphql.ide.project.graphqlconfig.GraphQLConfigProjectStartupActivity" />
     <postStartupActivity implementation="com.intellij.lang.jsgraphql.ide.project.relay.GraphQLRelayModernEnableStartupActivity" />
-    <postStartupActivity implementation="com.intellij.lang.jsgraphql.v1.ide.editor.JSGraphQLQueryContextCaretListener" />
 
     <!-- Syntax and error highlighting -->
     <lang.syntaxHighlighterFactory language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.GraphQLSyntaxHighlighterFactory"/>

src/main/com/intellij/lang/jsgraphql/v1/ide/editor/JSGraphQLQueryContextCaretListener.java

@@ -8,6 +8,7 @@
 package com.intellij.lang.jsgraphql.v1.ide.editor;
 
 import com.intellij.lang.jsgraphql.psi.GraphQLFile;
+import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.EditorFactory;
 import com.intellij.openapi.editor.event.CaretEvent;
@@ -24,25 +25,38 @@
 /**
  * Updates the current caret position in GraphQL files to enable contextual queries and highlighting of included fragments
  */
-public class JSGraphQLQueryContextCaretListener implements StartupActivity, DumbAware {
+public class JSGraphQLQueryContextCaretListener implements Disposable {
 
     static final Key<Integer> CARET_OFFSET = Key.create("JSGraphQL.QueryContext.CaretOffset");
 
-    @Override
-    public void runActivity(@NotNull Project project) {
-        if (!ApplicationManager.getApplication().isHeadlessEnvironment()) {
-            final EditorEventMulticaster eventMulticaster = EditorFactory.getInstance().getEventMulticaster();
-            final PsiDocumentManager psiDocumentManager = PsiDocumentManager.getInstance(project);
-            eventMulticaster.addCaretListener(new CaretListener() {
-                @Override
-                public void caretPositionChanged(CaretEvent e) {
-                    final PsiFile psiFile = psiDocumentManager.getPsiFile(e.getEditor().getDocument());
-                    if (psiFile instanceof GraphQLFile) {
-                        int offset = e.getEditor().logicalPositionToOffset(e.getNewPosition());
-                        psiFile.putUserData(CARET_OFFSET, offset);
-                    }
-                }
-            }, project);
+    public JSGraphQLQueryContextCaretListener(@NotNull Project project) {
+        listen(project);
+    }
+
+    private void listen(@NotNull Project project) {
+        if (ApplicationManager.getApplication().isHeadlessEnvironment()) {
+            return;
         }
+
+        final EditorEventMulticaster eventMulticaster = EditorFactory.getInstance().getEventMulticaster();
+        final PsiDocumentManager psiDocumentManager = PsiDocumentManager.getInstance(project);
+        eventMulticaster.addCaretListener(new CaretListener() {
+            @Override
+            public void caretPositionChanged(@NotNull CaretEvent e) {
+                if (project.isDisposed() || project != e.getEditor().getProject()) {
+                    return;
+                }
+
+                final PsiFile psiFile = psiDocumentManager.getPsiFile(e.getEditor().getDocument());
+                if (psiFile instanceof GraphQLFile) {
+                    int offset = e.getEditor().logicalPositionToOffset(e.getNewPosition());
+                    psiFile.putUserData(CARET_OFFSET, offset);
+                }
+            }
+        }, this);
+    }
+
+    @Override
+    public void dispose() {
     }
 }