Deprecated usages of DataManagerImpl removed

vepanimas · vepanimas · commit 7bbecabf1b70 · 2021-07-16T22:35:44.000+03:00
diff --git a/src/main/com/intellij/lang/jsgraphql/endpoint/ide/editor/JSGraphQLEndpointEnterHandlerDelegate.java b/src/main/com/intellij/lang/jsgraphql/endpoint/ide/editor/JSGraphQLEndpointEnterHandlerDelegate.java
@@ -7,17 +7,11 @@
  */
 package com.intellij.lang.jsgraphql.endpoint.ide.editor;
 
-import org.jetbrains.annotations.NotNull;
-
 import com.intellij.codeInsight.editorActions.enter.EnterHandlerDelegateAdapter;
-import com.intellij.ide.impl.DataManagerImpl;
+import com.intellij.ide.DataManager;
 import com.intellij.injected.editor.EditorWindow;
 import com.intellij.lang.jsgraphql.endpoint.doc.psi.JSGraphQLEndpointDocFile;
-import com.intellij.openapi.actionSystem.ActionManager;
-import com.intellij.openapi.actionSystem.ActionPlaces;
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.WriteCommandAction;
@@ -31,6 +25,7 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.util.DocumentUtil;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Adds  '# ' on enter in comments
@@ -64,26 +59,21 @@ public Result preprocessEnter(@NotNull PsiFile file, @NotNull Editor editor, @No
 							application.invokeLater(() -> {
 								final PsiFile parentPsiFile = PsiDocumentManager.getInstance(project).getPsiFile(parentEditor.getDocument());
 								if (parentPsiFile != null) {
-									application.runWriteAction(() -> {
-										new WriteCommandAction.Simple(project) {
-											@Override
-											protected void run() throws Throwable {
-												if(!parentPsiFile.isValid()) {
-													return;
-												}
-												CodeStyleManager.getInstance(project).adjustLineIndent(parentPsiFile, parentEditor.getCaretModel().getOffset());
-												AnAction editorLineEnd = ActionManager.getInstance().getAction("EditorLineEnd");
-												if (editorLineEnd != null) {
-													final AnActionEvent actionEvent = AnActionEvent.createFromDataContext(
-															ActionPlaces.UNKNOWN,
-															null,
-															new DataManagerImpl.MyDataContext(parentEditor.getComponent())
-													);
-													editorLineEnd.actionPerformed(actionEvent);
-												}
-											}
-										}.execute();
-									});
+								    WriteCommandAction.runWriteCommandAction(project, () -> {
+                                        if(!parentPsiFile.isValid()) {
+                                            return;
+                                        }
+                                        CodeStyleManager.getInstance(project).adjustLineIndent(parentPsiFile, parentEditor.getCaretModel().getOffset());
+                                        AnAction editorLineEnd = ActionManager.getInstance().getAction("EditorLineEnd");
+                                        if (editorLineEnd != null) {
+                                            final AnActionEvent actionEvent = AnActionEvent.createFromDataContext(
+                                                ActionPlaces.UNKNOWN,
+                                                null,
+                                                DataManager.getInstance().getDataContext(parentEditor.getComponent())
+                                            );
+                                            editorLineEnd.actionPerformed(actionEvent);
+                                        }
+                                    });
 								}
 							});
 						}
diff --git a/src/main/com/intellij/lang/jsgraphql/endpoint/ide/intentions/JSGraphQLEndpointCreateDefinitionIntention.java b/src/main/com/intellij/lang/jsgraphql/endpoint/ide/intentions/JSGraphQLEndpointCreateDefinitionIntention.java
@@ -9,7 +9,7 @@
 
 import com.google.common.collect.Sets;
 import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
-import com.intellij.ide.impl.DataManagerImpl;
+import com.intellij.ide.DataManager;
 import com.intellij.lang.jsgraphql.endpoint.JSGraphQLEndpointTokenTypes;
 import com.intellij.lang.jsgraphql.endpoint.doc.psi.JSGraphQLEndpointDocPsiUtil;
 import com.intellij.lang.jsgraphql.endpoint.psi.*;
@@ -21,11 +21,7 @@
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Ref;
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiDocumentManager;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.PsiWhiteSpace;
+import com.intellij.psi.*;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
@@ -43,9 +39,7 @@ public String getFamilyName() {
         return getText();
     }
 
-    protected abstract
-    @NotNull
-    IElementType getSupportedDefinitionType();
+    protected abstract @NotNull IElementType getSupportedDefinitionType();
 
     @Override
     public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement element) throws IncorrectOperationException {
@@ -79,9 +73,9 @@ public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement
                 }
                 final Document document = editor.getDocument();
                 final int insertOffset;
-                if(insertBefore) {
+                if (insertBefore) {
                     final PsiComment documentationStartElement = JSGraphQLEndpointDocPsiUtil.getDocumentationStartElement(definition);
-                    if(documentationStartElement != null) {
+                    if (documentationStartElement != null) {
                         insertOffset = documentationStartElement.getTextRange().getStartOffset();
                     } else {
                         insertOffset = definition.getTextRange().getStartOffset();
@@ -98,9 +92,9 @@ public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement
                         AnAction editorLineEnd = ActionManager.getInstance().getAction("EditorLineEnd");
                         if (editorLineEnd != null) {
                             final AnActionEvent actionEvent = AnActionEvent.createFromDataContext(
-                                    ActionPlaces.UNKNOWN,
-                                    null,
-                                    new DataManagerImpl.MyDataContext(editor.getComponent())
+                                ActionPlaces.UNKNOWN,
+                                null,
+                                DataManager.getInstance().getDataContext(editor.getComponent())
                             );
                             editorLineEnd.actionPerformed(actionEvent);
                         }
diff --git a/src/main/com/intellij/lang/jsgraphql/endpoint/ide/intentions/JSGraphQLEndpointCreateEnumTypeIntention.java b/src/main/com/intellij/lang/jsgraphql/endpoint/ide/intentions/JSGraphQLEndpointCreateEnumTypeIntention.java
@@ -19,7 +19,7 @@ public String getText() {
     }
 
     @Override
-    protected IElementType getSupportedDefinitionType() {
+    protected @NotNull IElementType getSupportedDefinitionType() {
         return JSGraphQLEndpointTokenTypes.ENUM;
     }
 }
diff --git a/src/main/com/intellij/lang/jsgraphql/endpoint/ide/intentions/JSGraphQLEndpointCreateInputTypeIntention.java b/src/main/com/intellij/lang/jsgraphql/endpoint/ide/intentions/JSGraphQLEndpointCreateInputTypeIntention.java
@@ -20,7 +20,7 @@ public String getText() {
     }
 
     @Override
-    protected IElementType getSupportedDefinitionType() {
+    protected @NotNull IElementType getSupportedDefinitionType() {
         return JSGraphQLEndpointTokenTypes.INPUT;
     }
 }
diff --git a/src/main/com/intellij/lang/jsgraphql/endpoint/ide/intentions/JSGraphQLEndpointCreateInterfaceTypeIntention.java b/src/main/com/intellij/lang/jsgraphql/endpoint/ide/intentions/JSGraphQLEndpointCreateInterfaceTypeIntention.java
@@ -20,7 +20,7 @@ public String getText() {
     }
 
     @Override
-    protected IElementType getSupportedDefinitionType() {
+    protected @NotNull IElementType getSupportedDefinitionType() {
         return JSGraphQLEndpointTokenTypes.INTERFACE;
     }
 }
diff --git a/src/main/com/intellij/lang/jsgraphql/endpoint/ide/intentions/JSGraphQLEndpointCreateObjectTypeIntention.java b/src/main/com/intellij/lang/jsgraphql/endpoint/ide/intentions/JSGraphQLEndpointCreateObjectTypeIntention.java
@@ -20,7 +20,7 @@ public String getText() {
     }
 
     @Override
-    protected IElementType getSupportedDefinitionType() {
+    protected @NotNull IElementType getSupportedDefinitionType() {
         return JSGraphQLEndpointTokenTypes.TYPE;
     }
 }
diff --git a/src/main/com/intellij/lang/jsgraphql/endpoint/ide/intentions/JSGraphQLEndpointCreateScalarTypeIntention.java b/src/main/com/intellij/lang/jsgraphql/endpoint/ide/intentions/JSGraphQLEndpointCreateScalarTypeIntention.java
@@ -19,7 +19,7 @@ public String getText() {
     }
 
     @Override
-    protected IElementType getSupportedDefinitionType() {
+    protected @NotNull IElementType getSupportedDefinitionType() {
         return JSGraphQLEndpointTokenTypes.SCALAR;
     }
 }
diff --git a/src/main/com/intellij/lang/jsgraphql/endpoint/ide/intentions/JSGraphQLEndpointCreateUnionTypeIntention.java b/src/main/com/intellij/lang/jsgraphql/endpoint/ide/intentions/JSGraphQLEndpointCreateUnionTypeIntention.java
@@ -19,7 +19,7 @@ public String getText() {
     }
 
     @Override
-    protected IElementType getSupportedDefinitionType() {
+    protected @NotNull IElementType getSupportedDefinitionType() {
         return JSGraphQLEndpointTokenTypes.UNION;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public String getText() {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@Override`
`22`		`- protected IElementType getSupportedDefinitionType() {`
	`22`	`+ protected @NotNull IElementType getSupportedDefinitionType() {`
`23`	`23`	`return JSGraphQLEndpointTokenTypes.ENUM;`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public String getText() {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`@Override`
`23`		`- protected IElementType getSupportedDefinitionType() {`
	`23`	`+ protected @NotNull IElementType getSupportedDefinitionType() {`
`24`	`24`	`return JSGraphQLEndpointTokenTypes.INPUT;`
`25`	`25`	`}`
`26`	`26`	`}`