diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaCodeVisionProvider.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaCodeVisionProvider.java
index 36b8c6b0143c..9838a9b4721c 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaCodeVisionProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaCodeVisionProvider.java
@@ -65,7 +65,7 @@ public class JavaCodeVisionProvider implements InlayHintsProvider<JavaCodeVision
       @Override
       public boolean collect(@NotNull PsiElement element, @NotNull Editor editor, @NotNull InlayHintsSink sink) {
         if (!(element instanceof PsiMember) || element instanceof PsiTypeParameter) return true;
-        if (!isFirstInLine(element)) return true;
+        if (!InlayHintsUtils.isFirstInLine(element)) return true;
         PsiMember member = (PsiMember)element;
         if (member.getName() == null) return true;
 
@@ -161,13 +161,6 @@ public class JavaCodeVisionProvider implements InlayHintsProvider<JavaCodeVision
         }
         return true;
       }
-
-      private boolean isFirstInLine(PsiElement element) {
-        PsiElement prevSibling = element.getPrevSibling();
-        return ((prevSibling instanceof PsiWhiteSpace &&
-                  (prevSibling.textContains('\n') || prevSibling.getTextRange().getStartOffset() == 0)) ||
-                 element.getTextRange().getStartOffset() == 0);
-      }
     };
   }
 
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/codeVision/JavaCodeVisionProviderTest.kt b/java/java-tests/testSrc/com/intellij/java/codeInsight/codeVision/JavaCodeVisionProviderTest.kt
index c76784aee795..5f17ecb10c01 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/codeVision/JavaCodeVisionProviderTest.kt
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/codeVision/JavaCodeVisionProviderTest.kt
@@ -100,6 +100,18 @@ class A {
       |}
     """.trimMargin(), JavaReferencesCodeVisionProvider.ID)
 
+  fun testClassAfterPackageStatement() = doTest("""
+package com.company;
+
+<# block [1 usage] #>
+class A{}
+class B {
+ void use() {
+   new A();
+ }
+}
+""", JavaReferencesCodeVisionProvider.ID)
+
   private fun doTest(text: String, vararg enabledProviderIds: String) {
     testProviders(text, "test.java", *enabledProviderIds)
   }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hints/InlayHintsUtils.kt b/platform/lang-impl/src/com/intellij/codeInsight/hints/InlayHintsUtils.kt
index b3cea6ddd6f7..34efafb4d60d 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/hints/InlayHintsUtils.kt
+++ b/platform/lang-impl/src/com/intellij/codeInsight/hints/InlayHintsUtils.kt
@@ -16,6 +16,7 @@ import com.intellij.openapi.editor.markup.EffectType
 import com.intellij.openapi.editor.markup.TextAttributesEffectsBuilder
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.*
+import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.refactoring.suggested.endOffset
 import com.intellij.refactoring.suggested.startOffset
 import com.intellij.util.SmartList
@@ -283,9 +284,8 @@ object InlayHintsUtils {
 
   @JvmStatic
   fun isFirstInLine(element: PsiElement): Boolean {
-    val prevSibling = element.prevSibling
-    return prevSibling is PsiWhiteSpace &&
-           (prevSibling.textContains('\n') || prevSibling.getTextRange().startOffset == 0) ||
-           element.textRange.startOffset == 0
+    val prevLeaf = PsiTreeUtil.prevLeaf(element, true)
+    return prevLeaf == null ||
+           prevLeaf is PsiWhiteSpace && (prevLeaf.textContains('\n') || prevLeaf.textRange.startOffset == 0)
   }
 }
\ No newline at end of file