From 88f0aabaeabe8b0d71b87dc6edc02418c8daacbd Mon Sep 17 00:00:00 2001
From: Andrey Vokin <andrey.vokin@jetbrains.com>
Date: Thu, 18 Dec 2014 13:10:30 +0300
Subject: [PATCH] Live Templates. Substituting Template via TemplateSubstitutor
 implemented. After review fix

---
 .../template/{impl => }/TemplateSubstitutor.java            | 6 ++++--
 .../intellij/codeInsight/template/impl/TemplateState.java   | 4 ++--
 .../platform-resources/src/META-INF/LangExtensionPoints.xml | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
 rename platform/lang-impl/src/com/intellij/codeInsight/template/{impl => }/TemplateSubstitutor.java (79%)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSubstitutor.java b/platform/lang-impl/src/com/intellij/codeInsight/template/TemplateSubstitutor.java
similarity index 79%
rename from platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSubstitutor.java
rename to platform/lang-impl/src/com/intellij/codeInsight/template/TemplateSubstitutor.java
index b696191c10b1..c72f71dddbfa 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSubstitutor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/TemplateSubstitutor.java
@@ -13,16 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.codeInsight.template.impl;
+package com.intellij.codeInsight.template;
 
+import com.intellij.codeInsight.template.impl.TemplateImpl;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.psi.PsiFile;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public interface TemplateSubstitutor {
   ExtensionPointName<TemplateSubstitutor> EP_NAME = ExtensionPointName.create("com.intellij.liveTemplateSubstitutor");
 
   @Nullable
-  TemplateImpl substituteTemplate(final Editor editor, final PsiFile file, int caretOffset, final TemplateImpl template);
+  TemplateImpl substituteTemplate(@NotNull PsiFile file, int caretOffset, @NotNull TemplateImpl template);
 }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java
index 28da15874d30..e80b060d94a8 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java
@@ -351,9 +351,9 @@ public class TemplateState implements Disposable {
     }
   }
 
-  private TemplateImpl substituteTemplate(final PsiFile file, int caretOffset, TemplateImpl template) {
+  private static TemplateImpl substituteTemplate(final PsiFile file, int caretOffset, TemplateImpl template) {
     for (TemplateSubstitutor substitutor : Extensions.getExtensions(TemplateSubstitutor.EP_NAME)) {
-      final TemplateImpl substituted = substitutor.substituteTemplate(myEditor, file, caretOffset, template);
+      final TemplateImpl substituted = substitutor.substituteTemplate(file, caretOffset, template);
       if (substituted != null) {
         template = substituted;
       }
diff --git a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
index 6b0cd0a5f778..d5375dca95bd 100644
--- a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
@@ -318,7 +318,7 @@
     <extensionPoint name="liveTemplateMacro" interface="com.intellij.codeInsight.template.Macro"/>
     <extensionPoint name="liveTemplateOptionalProcessor" interface="com.intellij.codeInsight.template.impl.TemplateOptionalProcessor"/>
     <extensionPoint name="liveTemplatePreprocessor" interface="com.intellij.codeInsight.template.impl.TemplatePreprocessor"/>
-    <extensionPoint name="liveTemplateSubstitutor" interface="com.intellij.codeInsight.template.impl.TemplateSubstitutor"/>
+    <extensionPoint name="liveTemplateSubstitutor" interface="com.intellij.codeInsight.template.TemplateSubstitutor"/>
     <extensionPoint name="customLiveTemplate" interface="com.intellij.codeInsight.template.CustomLiveTemplate"/>
     <extensionPoint name="variableTypeCalculator" interface="com.intellij.codeInsight.template.macro.VariableTypeCalculator"/>