cleanup

platform/lang-impl/src/com/intellij/codeInsight/hint/actions/InjectionAwareEditorAction.java

@@ -1,42 +0,0 @@
-/*
- * Copyright 2000-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.intellij.codeInsight.hint.actions;
-
-import com.intellij.codeInsight.actions.BaseCodeInsightAction;
-import com.intellij.openapi.actionSystem.CommonDataKeys;
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.actionSystem.EditorAction;
-import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
-import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * @author ignatov
- */
-public class InjectionAwareEditorAction extends EditorAction {
-  protected InjectionAwareEditorAction(EditorActionHandler defaultHandler) {
-    super(defaultHandler);
-  }
-
-  @Nullable
-  protected Editor getEditor(final DataContext dataContext) {
-    Editor editor = super.getEditor(dataContext);
-    Project project = CommonDataKeys.PROJECT.getData(dataContext);
-    Editor injected = project == null ? null : BaseCodeInsightAction.getInjectedEditor(project, editor);
-    return injected == null ? editor : injected;
-  }
-}

platform/lang-impl/src/com/intellij/codeInsight/hint/actions/NextParameterAction.java

@@ -17,12 +17,14 @@
 package com.intellij.codeInsight.hint.actions;
 
 import com.intellij.codeInsight.hint.PrevNextParameterHandler;
+import com.intellij.openapi.editor.actionSystem.EditorAction;
 
 /**
  * @author ven
  */
-public class NextParameterAction extends InjectionAwareEditorAction {
+public class NextParameterAction extends EditorAction {
   public NextParameterAction() {
     super(new PrevNextParameterHandler(true));
+    setInjectedContext(true);
   }
 }

platform/lang-impl/src/com/intellij/codeInsight/hint/actions/PrevParameterAction.java

@@ -17,12 +17,14 @@
 package com.intellij.codeInsight.hint.actions;
 
 import com.intellij.codeInsight.hint.PrevNextParameterHandler;
+import com.intellij.openapi.editor.actionSystem.EditorAction;
 
 /**
  * @author ven
  */
-public class PrevParameterAction extends InjectionAwareEditorAction {
+public class PrevParameterAction extends EditorAction {
   public PrevParameterAction() {
     super(new PrevNextParameterHandler(false));
+    setInjectedContext(true);
   }
 }

platform/lang-impl/src/com/intellij/codeInsight/template/impl/actions/NextVariableAction.java

@@ -25,16 +25,16 @@
 package com.intellij.codeInsight.template.impl.actions;
 
 import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.codeInsight.hint.actions.InjectionAwareEditorAction;
 import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
 import com.intellij.codeInsight.template.impl.TemplateState;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.intellij.openapi.editor.actionSystem.EditorWriteActionHandler;
 
-public class NextVariableAction extends InjectionAwareEditorAction {
+public class NextVariableAction extends EditorAction {
   public NextVariableAction() {
     super(new Handler());
     setInjectedContext(true);

platform/lang-impl/src/com/intellij/codeInsight/template/impl/actions/PreviousVariableAction.java

@@ -25,16 +25,16 @@
 package com.intellij.codeInsight.template.impl.actions;
 
 import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.codeInsight.hint.actions.InjectionAwareEditorAction;
 import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
 import com.intellij.codeInsight.template.impl.TemplateState;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.intellij.openapi.editor.actionSystem.EditorWriteActionHandler;
 
-public class PreviousVariableAction extends InjectionAwareEditorAction {
+public class PreviousVariableAction extends EditorAction {
   public PreviousVariableAction() {
     super(new Handler());
     setInjectedContext(true);

platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/ExpandLiveTemplateByTabAction.java

@@ -15,19 +15,19 @@
  */
 package com.intellij.codeInsight.template.impl.editorActions;
 
-import com.intellij.codeInsight.hint.actions.InjectionAwareEditorAction;
 import com.intellij.codeInsight.template.TemplateManager;
 import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
 import com.intellij.codeInsight.template.impl.TemplateSettings;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.actionSystem.EditorAction;
 import com.intellij.openapi.editor.actionSystem.EditorWriteActionHandler;
 import com.intellij.openapi.project.Project;
 
 /**
  * @author peter
  */
-public class ExpandLiveTemplateByTabAction extends InjectionAwareEditorAction {
+public class ExpandLiveTemplateByTabAction extends EditorAction {
   public ExpandLiveTemplateByTabAction() {
     super(new EditorWriteActionHandler() {
       @Override
@@ -43,5 +43,6 @@ public class ExpandLiveTemplateByTabAction extends InjectionAwareEditorAction {
                ((TemplateManagerImpl)TemplateManager.getInstance(project)).prepareTemplate(editor, TemplateSettings.TAB_CHAR, null) != null;
       }
     });
+    setInjectedContext(true);
   }
 }