From 21852bdf6846dae324dc35b0057445e7395becfa Mon Sep 17 00:00:00 2001
From: Stanislav Utikeev <stanislav.utikeev@jetbrains.com>
Date: Tue, 5 Nov 2019 12:59:49 +0300
Subject: [PATCH] Get rid of dependency on Template in CompletionData via
 implementing PresentableLookupValue for Template class

GitOrigin-RevId: 30f18d282a00eef5871a75e5542cec8a7bad9b0a
---
 .../com/intellij/codeInsight/lookup/LookupItemUtil.java   | 3 ---
 .../intellij/codeInsight/completion/CompletionData.java   | 3 ---
 .../src/com/intellij/codeInsight/template/Template.java   | 8 +++++++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/lookup/LookupItemUtil.java b/java/java-impl/src/com/intellij/codeInsight/lookup/LookupItemUtil.java
index 8e54b27067ba..ea163d8bd026 100644
--- a/java/java-impl/src/com/intellij/codeInsight/lookup/LookupItemUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/lookup/LookupItemUtil.java
@@ -66,9 +66,6 @@ public class LookupItemUtil {
     else if (object instanceof String) {
       s = (String)object;
     }
-    else if (object instanceof Template) {
-      s = ((Template)object).getKey();
-    }
     else if (object instanceof PresentableLookupValue) {
       s = ((PresentableLookupValue)object).getPresentation();
     }
diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionData.java b/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionData.java
index 33ac7620d5ed..2eb9176e88b4 100644
--- a/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionData.java
+++ b/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompletionData.java
@@ -199,9 +199,6 @@ public class CompletionData {
     else if (object instanceof String) {
       s = (String)object;
     }
-    //else if (object instanceof Template) { TODO[traff]: uncomment, extract interface
-    //  s = ((Template) object).getKey();
-    //}
     else if (object instanceof PresentableLookupValue) {
       s = ((PresentableLookupValue)object).getPresentation();
     }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/Template.java b/platform/lang-impl/src/com/intellij/codeInsight/template/Template.java
index 511eecc8b152..8ed1a5581020 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/Template.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/Template.java
@@ -16,6 +16,7 @@
 
 package com.intellij.codeInsight.template;
 
+import com.intellij.codeInsight.lookup.PresentableLookupValue;
 import com.intellij.codeInsight.template.impl.TemplateImpl;
 import com.intellij.codeInsight.template.impl.Variable;
 import com.intellij.util.PairProcessor;
@@ -29,7 +30,7 @@ import java.util.Map;
  * Used to build and run a live template.
  * @see TemplateManager
  */
-public abstract class Template {
+public abstract class Template implements PresentableLookupValue {
 
   public enum Property {
     USE_STATIC_IMPORT_IF_POSSIBLE
@@ -122,4 +123,9 @@ public abstract class Template {
   public static boolean getDefaultValue(@NotNull Property key) {
     return false;
   }
+
+  @Override
+  public String getPresentation() {
+    return getKey();
+  }
 }