New GraphQL input type should not be inserted between current type and its documentation (#15)

Author: jimmeyer-els

src/main/com/intellij/lang/jsgraphql/endpoint/doc/psi/JSGraphQLEndpointDocPsiUtil.java

@@ -103,6 +103,20 @@ public static boolean isDocumentationComment(PsiElement element) {
 		return false;
 	}
 
+	/**
+	 * Gets the PSI comment that starts the documentation for the specified element, or <code>null</code> if no documentation is available
+	 */
+	public static PsiComment getDocumentationStartElement(PsiElement element) {
+		final PsiComment comment = PsiTreeUtil.getPrevSiblingOfType(element, PsiComment.class);
+		if(isDocumentationComment(comment)) {
+			final List<PsiComment> siblings = Lists.newArrayList(comment);
+			getDocumentationCommentSiblings(comment, siblings, PsiElement::getPrevSibling);
+			Collections.reverse(siblings);
+			return siblings.get(0);
+		}
+		return null;
+	}
+
 	/**
 	 * Gets the text of the continuous comments placed directly above the specified element
 	 * @param element element whose previous siblings are enumerated and included if they're documentation comments

src/main/com/intellij/lang/jsgraphql/endpoint/ide/intentions/JSGraphQLEndpointCreateDefinitionIntention.java

@@ -11,6 +11,7 @@
 import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
 import com.intellij.ide.impl.DataManagerImpl;
 import com.intellij.lang.jsgraphql.endpoint.JSGraphQLEndpointTokenTypes;
+import com.intellij.lang.jsgraphql.endpoint.doc.psi.JSGraphQLEndpointDocPsiUtil;
 import com.intellij.lang.jsgraphql.endpoint.psi.*;
 import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.ActionPlaces;
@@ -20,7 +21,7 @@
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Ref;
-import com.intellij.openapi.util.TextRange;
+import com.intellij.psi.PsiComment;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
@@ -77,8 +78,17 @@ public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement
                     indent = true;
                 }
                 final Document document = editor.getDocument();
-	            final TextRange definitionTextRange = definition.getTextRange();
-	            final int insertOffset = insertBefore ? definitionTextRange.getStartOffset() : definitionTextRange.getEndOffset();
+                final int insertOffset;
+                if(insertBefore) {
+                    final PsiComment documentationStartElement = JSGraphQLEndpointDocPsiUtil.getDocumentationStartElement(definition);
+                    if(documentationStartElement != null) {
+                        insertOffset = documentationStartElement.getTextRange().getStartOffset();
+                    } else {
+                        insertOffset = definition.getTextRange().getStartOffset();
+                    }
+                } else {
+                    insertOffset = definition.getTextRange().getEndOffset();
+                }
                 document.insertString(insertOffset, definitionText);
                 if (caretOffsetAfterInsert.get() != null) {
                     // move caret to new position