diff --git a/platform/usageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java b/platform/usageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java index 299e66e4d6d2..91b0b32cee4b 100644 --- a/platform/usageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java +++ b/platform/usageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java @@ -328,7 +328,10 @@ public class UsageInfo2UsageAdapter implements UsageInModule, if (containingFile == null && oContainingFile == null || !Comparing.equal(containingFile, oContainingFile)) { return 0; } - return getFirstSegment().getStartOffset() - o.getFirstSegment().getStartOffset(); + Segment s1 = getFirstSegment(); + Segment s2 = o.getFirstSegment(); + if (s1 == null || s2 == null) return 0; + return s1.getStartOffset() - s2.getStartOffset(); } public void rename(String newName) throws IncorrectOperationException {