diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java
index 456f38681c54..0432e1fe55ac 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java
@@ -24,11 +24,9 @@ import com.intellij.openapi.editor.event.DocumentEvent;
 import com.intellij.openapi.editor.event.EditorFactoryEvent;
 import com.intellij.openapi.editor.event.EditorFactoryListener;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
 import com.intellij.util.containers.HashMap;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;
 
@@ -60,13 +58,6 @@ public class ChangeSignatureGestureDetector extends PsiTreeChangeAdapter impleme
     return false;
   }
 
-  @Nullable
-  public static TextRange getHighlightingRange(@NotNull PsiElement element) {
-    final LanguageChangeSignatureDetector detector = LanguageChangeSignatureDetectors.INSTANCE.forLanguage(element.getLanguage());
-    LOG.assertTrue(detector != null);
-    return detector.getHighlightingRange(element);
-  }
-
   public void changeSignature(PsiFile file) {
     try {
       myDeaf = true;
diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureVisistor.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureVisistor.java
index 9210ed136e9c..66f033af4d92 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureVisistor.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureVisistor.java
@@ -49,7 +49,7 @@ public class ChangeSignatureGestureVisistor implements HighlightVisitor {
   public void visit(PsiElement element, HighlightInfoHolder holder) {
     final ChangeSignatureGestureDetector detector = ChangeSignatureGestureDetector.getInstance(element.getProject());
     if (detector.isChangeSignatureAvailable(element)) {
-      final TextRange range = ChangeSignatureGestureDetector.getHighlightingRange(element);
+      final TextRange range = LanguageChangeSignatureDetectors.getHighlightingRange(element);
       LOG.assertTrue(range != null);
       final HighlightInfo info = new HighlightInfo(new TextAttributes(null, null, Color.RED, EffectType.BOXED, Font.PLAIN),
                                                    HighlightInfoType.INFORMATION, range.getStartOffset(), range.getEndOffset(),
diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/LanguageChangeSignatureDetectors.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/LanguageChangeSignatureDetectors.java
index 990ab277170d..757f18d54a37 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/LanguageChangeSignatureDetectors.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/LanguageChangeSignatureDetectors.java
@@ -17,6 +17,7 @@ package com.intellij.refactoring.changeSignature;
 
 import com.intellij.lang.Language;
 import com.intellij.lang.LanguageExtension;
+import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -41,4 +42,9 @@ class LanguageChangeSignatureDetectors extends LanguageExtension<LanguageChangeS
   public static boolean isSuitableForLanguage(Language lang) {
     return INSTANCE.forLanguage(lang) != null;
   }
+
+  @Nullable
+  public static TextRange getHighlightingRange(@NotNull PsiElement element) {
+    return INSTANCE.forLanguage(element.getLanguage()).getHighlightingRange(element);
+  }
 }