diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/ConstructorReferencesSearchHelper.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/ConstructorReferencesSearchHelper.java
index 42c4b06a20c9..9144206a080d 100644
--- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/ConstructorReferencesSearchHelper.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/ConstructorReferencesSearchHelper.java
@@ -255,17 +255,14 @@ public class ConstructorReferencesSearchHelper {
 
       @Override
       public TextRange getRangeInElement() {
-        if (usage instanceof PsiClass) {
-          PsiIdentifier identifier = ((PsiClass)usage).getNameIdentifier();
-          if (identifier != null) return TextRange.from(identifier.getStartOffsetInParent(), identifier.getTextLength());
-        }
-        else if (usage instanceof PsiField) {
-          PsiIdentifier identifier = ((PsiField)usage).getNameIdentifier();
-          return TextRange.from(identifier.getStartOffsetInParent(), identifier.getTextLength());
-        }
-        else if (usage instanceof PsiMethod) {
-          PsiIdentifier identifier = ((PsiMethod)usage).getNameIdentifier();
-          if (identifier != null) return TextRange.from(identifier.getStartOffsetInParent(), identifier.getTextLength());
+        if (usage instanceof PsiNameIdentifierOwner) {
+          PsiElement identifier = ((PsiNameIdentifierOwner)usage).getNameIdentifier();
+          if (identifier != null) {
+            final int startOffsetInParent = identifier.getStartOffsetInParent();
+            if (startOffsetInParent >= 0) { // -1 for light elements generated e.g. by lombok
+              return TextRange.from(startOffsetInParent, identifier.getTextLength());
+            }
+          }
         }
         return super.getRangeInElement();
       }