From b486fcb930e7f1c6587484802867576956ab58ae Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Fri, 8 Nov 2013 16:37:23 +0400
Subject: [PATCH] template actions are now injection aware

---
 .../codeInsight/template/impl/actions/NextVariableAction.java | 4 ++--
 .../template/impl/actions/PreviousVariableAction.java         | 4 ++--
 .../impl/editorActions/ExpandLiveTemplateByTabAction.java     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/actions/NextVariableAction.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/actions/NextVariableAction.java
index 6605dacbc209..697686bcc0df 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/actions/NextVariableAction.java
+++ b/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 EditorAction {
+public class NextVariableAction extends InjectionAwareEditorAction {
   public NextVariableAction() {
     super(new Handler());
     setInjectedContext(true);
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/actions/PreviousVariableAction.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/actions/PreviousVariableAction.java
index bbb1f6a2bdf7..adedfef9bbc5 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/actions/PreviousVariableAction.java
+++ b/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 EditorAction {
+public class PreviousVariableAction extends InjectionAwareEditorAction {
   public PreviousVariableAction() {
     super(new Handler());
     setInjectedContext(true);
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/ExpandLiveTemplateByTabAction.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/ExpandLiveTemplateByTabAction.java
index b037ff276731..876fe5d9e7af 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/ExpandLiveTemplateByTabAction.java
+++ b/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 EditorAction {
+public class ExpandLiveTemplateByTabAction extends InjectionAwareEditorAction {
   public ExpandLiveTemplateByTabAction() {
     super(new EditorWriteActionHandler() {
       @Override