dead icons hunt

platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/statistics/StatisticsPanel.java

@@ -49,7 +49,6 @@ import java.util.List;
  * @author Roman Chernyatchik
  */
 public class StatisticsPanel implements DataProvider {
-  public static final Icon STATISTICS_TAB_ICON = TestsUIUtil.loadIcon("testStatistics");
   public static final DataKey<StatisticsPanel> SM_TEST_RUNNER_STATISTICS  = DataKey.create("SM_TEST_RUNNER_STATISTICS");
 
   private TableView<SMTestProxy> myStatisticsTableView;

platform/testRunner/src/com/intellij/execution/testframework/PoolOfTestIcons.java

@@ -21,14 +21,14 @@ import com.intellij.ui.LayeredIcon;
 import javax.swing.*;
 
 public interface PoolOfTestIcons {
-  Icon SKIPPED_ICON = TestsUIUtil.loadIcon("testSkipped");
-  Icon PASSED_ICON = TestsUIUtil.loadIcon("testPassed");
-  Icon FAILED_ICON = TestsUIUtil.loadIcon("testFailed");
-  Icon ERROR_ICON = TestsUIUtil.loadIcon("testError");
-  Icon NOT_RAN = TestsUIUtil.loadIcon("testNotRan");
-  Icon LOADING_ICON = TestsUIUtil.loadIcon("loadingTree");
-  Icon TERMINATED_ICON = TestsUIUtil.loadIcon("testTerminated");
-  Icon IGNORED_ICON = TestsUIUtil.loadIcon("testIgnored");
+  Icon SKIPPED_ICON = AllIcons.RunConfigurations.TestSkipped;
+  Icon PASSED_ICON = AllIcons.RunConfigurations.TestPassed;
+  Icon FAILED_ICON = AllIcons.RunConfigurations.TestFailed;
+  Icon ERROR_ICON = AllIcons.RunConfigurations.TestError;
+  Icon NOT_RAN = AllIcons.RunConfigurations.TestNotRan;
+  Icon LOADING_ICON = AllIcons.RunConfigurations.LoadingTree;
+  Icon TERMINATED_ICON = AllIcons.RunConfigurations.TestTerminated;
+  Icon IGNORED_ICON = AllIcons.RunConfigurations.TestIgnored;
   Icon ERROR_ICON_MARK = AllIcons.Nodes.ErrorMark;
   Icon TEAR_DOWN_FAILURE = new LayeredIcon(PASSED_ICON, ERROR_ICON_MARK);
 }

platform/testRunner/src/com/intellij/execution/testframework/TestIconProvider.java

@@ -15,6 +15,7 @@
  */
 package com.intellij.execution.testframework;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IconProvider;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.psi.PsiElement;
@@ -36,7 +37,7 @@ public class TestIconProvider extends IconProvider {
     for (TestFramework framework : testFrameworks) {
       try {
         if (framework.isIgnoredMethod(element)) {
-          final Icon ignoredTestIcon = TestsUIUtil.loadIcon("ignoredTest");
+          final Icon ignoredTestIcon = AllIcons.RunConfigurations.IgnoredTest;
           final LayeredIcon icon = new LayeredIcon(ignoredTestIcon, PlatformIcons.PUBLIC_ICON);
           icon.setIcon(PlatformIcons.PUBLIC_ICON, 1, ignoredTestIcon.getIconWidth(), 0);
           return icon;
@@ -48,7 +49,7 @@ public class TestIconProvider extends IconProvider {
     for (TestFramework framework : testFrameworks) {
       try {
         if (framework.isTestMethod(element)) {
-          final LayeredIcon mark = new LayeredIcon(PlatformIcons.METHOD_ICON, TestsUIUtil.loadIcon("testMark"), PlatformIcons.PUBLIC_ICON);
+          final LayeredIcon mark = new LayeredIcon(PlatformIcons.METHOD_ICON, AllIcons.RunConfigurations.TestMark, PlatformIcons.PUBLIC_ICON);
           mark.setIcon(PlatformIcons.PUBLIC_ICON, 2, PlatformIcons.METHOD_ICON.getIconWidth(), 0);
           return mark;
         }

platform/testRunner/src/com/intellij/execution/testframework/TestsUIUtil.java

@@ -21,30 +21,23 @@ import com.intellij.execution.configurations.RuntimeConfiguration;
 import com.intellij.notification.NotificationGroup;
 import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
-import com.intellij.openapi.application.Application;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.MessageType;
 import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.wm.ToolWindowId;
 import com.intellij.openapi.wm.ToolWindowManager;
 import com.intellij.pom.Navigatable;
 import com.intellij.psi.PsiElement;
 import com.intellij.ui.SystemNotifications;
-import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
 import java.awt.*;
-import java.awt.image.BufferedImage;
 import java.util.List;
 
 public class TestsUIUtil {
   public static final NotificationGroup NOTIFICATION_GROUP = NotificationGroup.logOnlyGroup("Test Runner");
-  @NonNls private static final String ICONS_ROOT = "/runConfigurations/";
 
   public static final Color PASSED_COLOR = new Color(0, 128, 0);
 
@@ -100,14 +93,6 @@ public class TestsUIUtil {
     return null;
   }
 
-  public static Icon loadIcon(@NonNls final String iconName) {
-    final Application application = ApplicationManager.getApplication();
-    if (application == null || application.isUnitTestMode()) return new ImageIcon(new BufferedImage(1, 1, BufferedImage.TYPE_3BYTE_BGR));
-    @NonNls final String fullIconName = ICONS_ROOT + iconName + ".png";
-
-    return IconLoader.getIcon(fullIconName);
-  }
-
   public static void notifyByBalloon(@NotNull final Project project, final AbstractTestProxy root, final TestConsoleProperties properties) {
     if (project.isDisposed()) return;
     if (properties == null) return;

platform/testRunner/src/com/intellij/execution/testframework/ToolbarPanel.java

@@ -59,13 +59,13 @@ public class ToolbarPanel extends JPanel implements OccurenceNavigator, Disposab
     final DefaultActionGroup actionGroup = new DefaultActionGroup(null, false);
     actionGroup.addAction(new ToggleBooleanProperty(ExecutionBundle.message("junit.run.hide.passed.action.name"),
                                                     ExecutionBundle.message("junit.run.hide.passed.action.description"),
-                                                    TestsUIUtil.loadIcon("hidePassed"),
+                                                    AllIcons.RunConfigurations.HidePassed,
                                                     properties, TestConsoleProperties.HIDE_PASSED_TESTS));
     actionGroup.addSeparator();
 
     actionGroup.addAction(new ToggleBooleanProperty(ExecutionBundle.message("junit.runing.info.track.test.action.name"),
                                                     ExecutionBundle.message("junit.runing.info.track.test.action.description"),
-                                                    TestsUIUtil.loadIcon("trackTests"),
+                                                    AllIcons.RunConfigurations.TrackTests,
                                                     properties, TestConsoleProperties.TRACK_RUNNING_TEST)).setAsSecondary(true);
 
     actionGroup.addAction(new ToggleBooleanProperty(ExecutionBundle.message("junit.runing.info.sort.alphabetically.action.name"),
@@ -90,7 +90,7 @@ public class ToolbarPanel extends JPanel implements OccurenceNavigator, Disposab
 
     actionGroup.addAction(new ToggleBooleanProperty(ExecutionBundle.message("junit.runing.info.select.first.failed.action.name"),
                                                     null,
-                                                    TestsUIUtil.loadIcon("selectFirstDefect"),
+                                                    AllIcons.RunConfigurations.SelectFirstDefect,
                                                     properties, TestConsoleProperties.SELECT_FIRST_DEFECT)).setAsSecondary(true);
     actionGroup.addAction(new ToggleBooleanProperty(ExecutionBundle.message("junit.runing.info.scroll.to.stacktrace.action.name"),
                                                     ExecutionBundle.message("junit.runing.info.scroll.to.stacktrace.action.description"),

platform/testRunner/src/com/intellij/execution/testframework/ui/TestsProgressAnimator.java

@@ -16,7 +16,7 @@
 package com.intellij.execution.testframework.ui;
 
 import com.intellij.execution.testframework.AbstractTestProxy;
-import com.intellij.execution.testframework.TestsUIUtil;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.util.Alarm;
@@ -29,7 +29,7 @@ public abstract class TestsProgressAnimator implements Runnable, Disposable {
   private static final int MOVIE_TIME = 800;
   private static final int FRAME_TIME = MOVIE_TIME / FRAMES_COUNT;
 
-  public static final Icon PAUSED_ICON = TestsUIUtil.loadIcon("testPaused");
+  public static final Icon PAUSED_ICON = AllIcons.RunConfigurations.TestPaused;
   public static final Icon[] FRAMES = new Icon[FRAMES_COUNT];
 
   private long myLastInvocationTime = -1;
@@ -43,8 +43,14 @@ public abstract class TestsProgressAnimator implements Runnable, Disposable {
   }
 
   static {
-    for (int i = 0; i < FRAMES_COUNT; i++)
-      FRAMES[i] = TestsUIUtil.loadIcon("testInProgress" + (i + 1));
+    FRAMES[0] = AllIcons.RunConfigurations.TestInProgress1;
+    FRAMES[1] = AllIcons.RunConfigurations.TestInProgress2;
+    FRAMES[2] = AllIcons.RunConfigurations.TestInProgress3;
+    FRAMES[3] = AllIcons.RunConfigurations.TestInProgress4;
+    FRAMES[4] = AllIcons.RunConfigurations.TestInProgress5;
+    FRAMES[5] = AllIcons.RunConfigurations.TestInProgress6;
+    FRAMES[6] = AllIcons.RunConfigurations.TestInProgress7;
+    FRAMES[7] = AllIcons.RunConfigurations.TestInProgress8;
   }
 
   public static int getCurrentFrameIndex() {

platform/util/src/com/intellij/icons/AllIcons.java

@@ -66,9 +66,6 @@ public class AllIcons {
     public static final Icon Help = IconLoader.getIcon("/actions/help.png"); 
     public static final Icon Hibernate = IconLoader.getIcon("/actions/hibernate.png"); 
     public static final Icon Ibm = IconLoader.getIcon("/actions/ibm.png"); 
-    public static final Icon Ignore1 = IconLoader.getIcon("/actions/ignore1.png"); 
-    public static final Icon Ignore2 = IconLoader.getIcon("/actions/ignore2.png"); 
-    public static final Icon Ignore3 = IconLoader.getIcon("/actions/ignore3.png"); 
     public static final Icon Import = IconLoader.getIcon("/actions/import.png"); 
     public static final Icon Install = IconLoader.getIcon("/actions/install.png"); 
     public static final Icon IntentionBulb = IconLoader.getIcon("/actions/intentionBulb.png"); 
@@ -112,7 +109,6 @@ public class AllIcons {
     public static final Icon RefactoringBulb = IconLoader.getIcon("/actions/refactoringBulb.png"); 
     public static final Icon Refresh = IconLoader.getIcon("/actions/refresh.png"); 
     public static final Icon RefreshUsages = IconLoader.getIcon("/actions/refreshUsages.png"); 
-    public static final Icon RemoveBig = IconLoader.getIcon("/actions/removeBig.png"); 
     public static final Icon Replace = IconLoader.getIcon("/actions/replace.png"); 
     public static final Icon Reset_to_default = IconLoader.getIcon("/actions/reset-to-default.png"); 
     public static final Icon Reset = IconLoader.getIcon("/actions/reset.png"); 
@@ -141,8 +137,6 @@ public class AllIcons {
     public static final Icon StartDebugger = IconLoader.getIcon("/actions/startDebugger.png"); 
     public static final Icon StepOut = IconLoader.getIcon("/actions/stepOut.png"); 
     public static final Icon Submit1 = IconLoader.getIcon("/actions/submit1.png"); 
-    public static final Icon Submit2 = IconLoader.getIcon("/actions/submit2.png"); 
-    public static final Icon Submit3 = IconLoader.getIcon("/actions/submit3.png"); 
     public static final Icon Sun = IconLoader.getIcon("/actions/sun.png"); 
     public static final Icon Suspend = IconLoader.getIcon("/actions/suspend.png"); 
     public static final Icon SwapPanels = IconLoader.getIcon("/actions/swapPanels.png"); 
@@ -185,6 +179,12 @@ public class AllIcons {
 
   }
   
+  public static class Css {
+    public static final Icon Property = IconLoader.getIcon("/css/property.png"); 
+    public static final Icon Pseudo_element = IconLoader.getIcon("/css/pseudo-element.png"); 
+
+  }
+  
   public static class Debugger {
     
     public static class Actions {
@@ -193,7 +193,6 @@ public class AllIcons {
       public static final Icon Force_step_over = IconLoader.getIcon("/debugger/actions/force_step_over.png"); 
 
     }
-    public static final Icon AddBreakpoint = IconLoader.getIcon("/debugger/addBreakpoint.png"); 
     public static final Icon AddToWatch = IconLoader.getIcon("/debugger/addToWatch.png"); 
     public static final Icon Attach = IconLoader.getIcon("/debugger/attach.png"); 
     public static final Icon AutoVariablesMode = IconLoader.getIcon("/debugger/autoVariablesMode.png"); 
@@ -248,13 +247,10 @@ public class AllIcons {
     public static final Icon Db_verified_field_breakpoint = IconLoader.getIcon("/debugger/db_verified_field_breakpoint.png"); 
     public static final Icon Db_verified_method_breakpoint = IconLoader.getIcon("/debugger/db_verified_method_breakpoint.png"); 
     public static final Icon Db_verified_warning_breakpoint = IconLoader.getIcon("/debugger/db_verified_warning_breakpoint.png"); 
-    public static final Icon Db_warning = IconLoader.getIcon("/debugger/db_warning.png"); 
     public static final Icon Detach = IconLoader.getIcon("/debugger/detach.png"); 
     public static final Icon Disable_value_calculation = IconLoader.getIcon("/debugger/disable_value_calculation.png"); 
     public static final Icon EvaluateExpression = IconLoader.getIcon("/debugger/evaluateExpression.png"); 
     public static final Icon Frame = IconLoader.getIcon("/debugger/frame.png"); 
-    public static final Icon GroupClosed = IconLoader.getIcon("/debugger/groupClosed.png"); 
-    public static final Icon GroupOpened = IconLoader.getIcon("/debugger/groupOpened.png"); 
     public static final Icon KillProcess = IconLoader.getIcon("/debugger/killProcess.png"); 
     public static final Icon MuteBreakpoints = IconLoader.getIcon("/debugger/muteBreakpoints.png"); 
     public static final Icon NewWatch = IconLoader.getIcon("/debugger/newWatch.png"); 
@@ -262,8 +258,6 @@ public class AllIcons {
     public static final Icon RestoreLayout = IconLoader.getIcon("/debugger/restoreLayout.png"); 
     public static final Icon ShowCurrentFrame = IconLoader.getIcon("/debugger/showCurrentFrame.png"); 
     public static final Icon StackFrame = IconLoader.getIcon("/debugger/stackFrame.png"); 
-    public static final Icon Suspend_all = IconLoader.getIcon("/debugger/suspend_all.png"); 
-    public static final Icon Suspend_thread = IconLoader.getIcon("/debugger/suspend_thread.png"); 
     public static final Icon ThreadAtBreakpoint = IconLoader.getIcon("/debugger/threadAtBreakpoint.png"); 
     public static final Icon ThreadCurrent = IconLoader.getIcon("/debugger/threadCurrent.png"); 
     public static final Icon ThreadFrozen = IconLoader.getIcon("/debugger/threadFrozen.png"); 
@@ -286,15 +280,12 @@ public class AllIcons {
 
     }
     public static final Icon ThreadSuspended = IconLoader.getIcon("/debugger/threadSuspended.png"); 
-    public static final Icon ToGrid = IconLoader.getIcon("/debugger/toGrid.png"); 
     public static final Icon ToolConsole = IconLoader.getIcon("/debugger/toolConsole.png"); 
-    public static final Icon ToTab = IconLoader.getIcon("/debugger/toTab.png"); 
     public static final Icon Value = IconLoader.getIcon("/debugger/value.png"); 
     public static final Icon ViewBreakpoints = IconLoader.getIcon("/debugger/viewBreakpoints.png"); 
     public static final Icon Watch = IconLoader.getIcon("/debugger/watch.png"); 
     public static final Icon Watches = IconLoader.getIcon("/debugger/watches.png"); 
     public static final Icon WatchLastReturnValue = IconLoader.getIcon("/debugger/watchLastReturnValue.png"); 
-    public static final Icon WatchReturnValues = IconLoader.getIcon("/debugger/watchReturnValues.png"); 
 
   }
   
@@ -867,20 +858,6 @@ public class AllIcons {
     public static final Icon JavaDocFolder = IconLoader.getIcon("/nodes/javaDocFolder.png"); 
     
     public static class Jsf {
-      
-      public static class Big_icons {
-        public static final Icon Component = IconLoader.getIcon("/nodes/jsf/big_icons/component.png"); 
-        public static final Icon Converter = IconLoader.getIcon("/nodes/jsf/big_icons/converter.png"); 
-        public static final Icon General = IconLoader.getIcon("/nodes/jsf/big_icons/general.png"); 
-        public static final Icon GenericValue = IconLoader.getIcon("/nodes/jsf/big_icons/genericValue.png"); 
-        public static final Icon ManagedBean = IconLoader.getIcon("/nodes/jsf/big_icons/managedBean.png"); 
-        public static final Icon NavigationCase = IconLoader.getIcon("/nodes/jsf/big_icons/navigationCase.png"); 
-        public static final Icon NavigationRule = IconLoader.getIcon("/nodes/jsf/big_icons/navigationRule.png"); 
-        public static final Icon Renderer = IconLoader.getIcon("/nodes/jsf/big_icons/renderer.png"); 
-        public static final Icon RenderKit = IconLoader.getIcon("/nodes/jsf/big_icons/renderKit.png"); 
-        public static final Icon Validator = IconLoader.getIcon("/nodes/jsf/big_icons/validator.png"); 
-
-      }
       public static final Icon Component = IconLoader.getIcon("/nodes/jsf/component.png"); 
       public static final Icon Converter = IconLoader.getIcon("/nodes/jsf/converter.png"); 
       public static final Icon General = IconLoader.getIcon("/nodes/jsf/general.png"); 
@@ -1095,11 +1072,9 @@ public class AllIcons {
     public static final Icon TestInProgress8 = IconLoader.getIcon("/runConfigurations/testInProgress8.png"); 
     public static final Icon TestMark = IconLoader.getIcon("/runConfigurations/testMark.png"); 
     public static final Icon TestNotRan = IconLoader.getIcon("/runConfigurations/testNotRan.png"); 
-    public static final Icon TestOuput = IconLoader.getIcon("/runConfigurations/testOuput.png"); 
     public static final Icon TestPassed = IconLoader.getIcon("/runConfigurations/testPassed.png"); 
     public static final Icon TestPaused = IconLoader.getIcon("/runConfigurations/testPaused.png"); 
     public static final Icon TestSkipped = IconLoader.getIcon("/runConfigurations/testSkipped.png"); 
-    public static final Icon TestStatistics = IconLoader.getIcon("/runConfigurations/testStatistics.png"); 
     public static final Icon TestTerminated = IconLoader.getIcon("/runConfigurations/testTerminated.png"); 
     public static final Icon Tomcat = IconLoader.getIcon("/runConfigurations/tomcat.png"); 
     public static final Icon TrackCoverage = IconLoader.getIcon("/runConfigurations/trackCoverage.png"); 
@@ -1114,7 +1089,6 @@ public class AllIcons {
   public static class Toolbar {
     public static final Icon Filterdups = IconLoader.getIcon("/toolbar/filterdups.png"); 
     public static final Icon Folders = IconLoader.getIcon("/toolbar/folders.png"); 
-    public static final Icon Show_packages = IconLoader.getIcon("/toolbar/show_packages.png"); 
     public static final Icon Unknown = IconLoader.getIcon("/toolbar/unknown.png"); 
 
   }
@@ -1161,7 +1135,6 @@ public class AllIcons {
   
   public static class Vcs {
     public static final Icon AllRevisions = IconLoader.getIcon("/vcs/allRevisions.png"); 
-    public static final Icon Annotate1 = IconLoader.getIcon("/vcs/annotate1.png"); 
     public static final Icon Arrow_left = IconLoader.getIcon("/vcs/arrow_left.png"); 
     public static final Icon Arrow_right = IconLoader.getIcon("/vcs/arrow_right.png"); 
     public static final Icon CheckSpelling = IconLoader.getIcon("/vcs/checkSpelling.png"); 
@@ -1185,15 +1158,9 @@ public class AllIcons {
   
   public static class Webreferences {
     public static final Icon Add = IconLoader.getIcon("/webreferences/add.png"); 
-    public static final Icon InvalidFile = IconLoader.getIcon("/webreferences/invalidFile.png"); 
-    public static final Icon InvalidWebReference = IconLoader.getIcon("/webreferences/invalidWebReference.png"); 
     public static final Icon Properties = IconLoader.getIcon("/webreferences/properties.png"); 
     public static final Icon Remove = IconLoader.getIcon("/webreferences/remove.png"); 
     public static final Icon Server = IconLoader.getIcon("/webreferences/server.png"); 
-    public static final Icon SystemIcon = IconLoader.getIcon("/webreferences/systemIcon.png"); 
-    public static final Icon SystemIconX = IconLoader.getIcon("/webreferences/systemIconX.png"); 
-    public static final Icon WebReference = IconLoader.getIcon("/webreferences/webReference.png"); 
-    public static final Icon WebReferencesRoot = IconLoader.getIcon("/webreferences/webReferencesRoot.png"); 
 
   }
   
@@ -1214,15 +1181,7 @@ public class AllIcons {
 
     }
     public static final Icon Css_class = IconLoader.getIcon("/xml/css_class.png"); 
-    public static final Icon Html_id = IconLoader.getIcon("/xml/html_id.png");
-    public static final Icon Toggle_addressbar = IconLoader.getIcon("/xml/toggle_addressbar.png"); 
-    public static final Icon Web_preview = IconLoader.getIcon("/xml/web_preview.png"); 
-    public static final Icon Web_preview2 = IconLoader.getIcon("/xml/web_preview2.png"); 
+    public static final Icon Html_id = IconLoader.getIcon("/xml/html_id.png"); 
 
   }
-
-  public static class Css {
-    public static final Icon Css_property = IconLoader.getIcon("/css/property.png");
-    public static final Icon Css_pseudo_element = IconLoader.getIcon("/css/pseudo-element.png");
-  }
 }

plugins/devkit/src/references/IconsReferencesContributor.java

@@ -256,7 +256,7 @@ public class IconsReferencesContributor extends PsiReferenceContributor implemen
   }
 
   @Override
-  public boolean execute(@NotNull ReferencesSearch.SearchParameters queryParameters, @NotNull Processor<PsiReference> consumer) {
+  public boolean execute(@NotNull ReferencesSearch.SearchParameters queryParameters, @NotNull final Processor<PsiReference> consumer) {
     final PsiElement file = queryParameters.getElementToSearch();
     if (file instanceof PsiBinaryFile) {
       final Module module = ApplicationManager.getApplication().runReadAction(new Computable<Module>() {
@@ -278,26 +278,30 @@ public class IconsReferencesContributor extends PsiReferenceContributor implemen
         model.setWholeWordsOnly(true);
         final List<UsageInfo> usages = FindInProjectUtil.findUsages(model, FindInProjectUtil.getPsiDirectory(model, project), project, false);
         if (!usages.isEmpty()) {
-          for (UsageInfo usage : usages) {
-            final PsiElement element = usage.getElement();
+          for (final UsageInfo usage : usages) {
+            ApplicationManager.getApplication().runReadAction(new Runnable() {
+              public void run() {
+                final PsiElement element = usage.getElement();
 
-            final ProperTextRange textRange = usage.getRangeInElement();
-            if (element != null && textRange != null) {
-              final PsiElement start = element.findElementAt(textRange.getStartOffset());
-              final PsiElement end = element.findElementAt(textRange.getEndOffset());
-              if (start != null && end != null) {
-                PsiElement value = PsiTreeUtil.findCommonParent(start, end);
-                if (value instanceof PsiJavaToken) {
-                  value = value.getParent();
-                }
-                if (value != null) {
-                  final FileReference reference = FileReferenceUtil.findFileReference(value);
-                  if (reference != null) {
-                    consumer.process(reference);
+                final ProperTextRange textRange = usage.getRangeInElement();
+                if (element != null && textRange != null) {
+                  final PsiElement start = element.findElementAt(textRange.getStartOffset());
+                  final PsiElement end = element.findElementAt(textRange.getEndOffset());
+                  if (start != null && end != null) {
+                    PsiElement value = PsiTreeUtil.findCommonParent(start, end);
+                    if (value instanceof PsiJavaToken) {
+                      value = value.getParent();
+                    }
+                    if (value != null) {
+                      final FileReference reference = FileReferenceUtil.findFileReference(value);
+                      if (reference != null) {
+                        consumer.process(reference);
+                      }
+                    }
                   }
                 }
               }
-            }
+            });
           }
         }
       }