1 files changed, 6 insertions, 7 deletions
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SubstitutionShortInfoHandler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SubstitutionShortInfoHandler.java
index 32f1302336f3..ecdccbe0e40b 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SubstitutionShortInfoHandler.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SubstitutionShortInfoHandler.java
@@ -1,6 +1,6 @@
 package com.intellij.structuralsearch.plugin.ui;
 
-import com.intellij.codeInsight.hint.TooltipGroup;
+import com.intellij.codeInsight.hint.TooltipController;
 import com.intellij.codeInsight.template.impl.TemplateImplUtil;
 import com.intellij.codeInsight.template.impl.Variable;
 import com.intellij.openapi.editor.Document;
@@ -11,7 +11,6 @@ import com.intellij.openapi.util.Key;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 
 /**
  * Created by IntelliJ IDEA.
@@ -21,7 +20,6 @@ import java.util.Iterator;
  * To change this template use File | Settings | File Templates.
  */
 public class SubstitutionShortInfoHandler implements DocumentListener, EditorMouseMotionListener, CaretListener {
-  private static final TooltipGroup SS_INFO_TOOLTIP_GROUP = new TooltipGroup("SS_INFO_TOOLTIP_GROUP", 0);
 
   private long modificationTimeStamp;
   private final ArrayList<Variable> variables = new ArrayList<Variable>();
@@ -63,9 +61,7 @@ public class SubstitutionShortInfoHandler implements DocumentListener, EditorMou
         String varname = elements.subSequence(start + 1, end).toString();
         Variable foundVar = null;
 
-        for(Iterator<Variable> i=variables.iterator();i.hasNext();) {
-          final Variable var = i.next();
-
+        for (final Variable var : variables) {
           if (var.getName().equals(varname)) {
             foundVar = var;
             break;
@@ -79,7 +75,10 @@ public class SubstitutionShortInfoHandler implements DocumentListener, EditorMou
     }
 
     if (text.length() > 0) {
-      UIUtil.showTooltip(editor, start, end, text, SS_INFO_TOOLTIP_GROUP);
+      UIUtil.showTooltip(editor, start, end + 1, text);
+    }
+    else {
+      TooltipController.getInstance().cancelTooltips();
     }
   }