change signature detectors: cleanup

This commit is contained in:
anna
2010-09-09 16:19:58 +04:00
parent 0c4334d6b0
commit 029d2424eb
3 changed files with 7 additions and 10 deletions
@@ -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;
@@ -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(),
@@ -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);
}
}