diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/diagnosticProvider/Fe10IdeNormalAnalysisSourceModuleCollectDiagnosticsTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/diagnosticProvider/Fe10IdeNormalAnalysisSourceModuleCollectDiagnosticsTestGenerated.java
index 52b7cde86ab..5f690f1f8c1 100644
--- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/diagnosticProvider/Fe10IdeNormalAnalysisSourceModuleCollectDiagnosticsTestGenerated.java
+++ b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/diagnosticProvider/Fe10IdeNormalAnalysisSourceModuleCollectDiagnosticsTestGenerated.java
@@ -100,6 +100,42 @@ public class Fe10IdeNormalAnalysisSourceModuleCollectDiagnosticsTestGenerated ex
         runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/inferTypeFromGetValueDelegateLibrary.kt");
     }
 
+    @Test
+    @TestMetadata("javaInnerClass.kt")
+    public void testJavaInnerClass() throws Exception {
+        runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClass.kt");
+    }
+
+    @Test
+    @TestMetadata("javaInnerClassFromAnotherModule.kt")
+    public void testJavaInnerClassFromAnotherModule() throws Exception {
+        runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromAnotherModule.kt");
+    }
+
+    @Test
+    @TestMetadata("javaInnerClassFromLibrary.kt")
+    public void testJavaInnerClassFromLibrary() throws Exception {
+        runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromLibrary.kt");
+    }
+
+    @Test
+    @TestMetadata("javaNestedClass.kt")
+    public void testJavaNestedClass() throws Exception {
+        runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClass.kt");
+    }
+
+    @Test
+    @TestMetadata("javaNestedClassFromAnotherModule.kt")
+    public void testJavaNestedClassFromAnotherModule() throws Exception {
+        runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromAnotherModule.kt");
+    }
+
+    @Test
+    @TestMetadata("javaNestedClassFromLibrary.kt")
+    public void testJavaNestedClassFromLibrary() throws Exception {
+        runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromLibrary.kt");
+    }
+
     @Test
     @TestMetadata("overrideProtectedClassReturnFromLibrary.kt")
     public void testOverrideProtectedClassReturnFromLibrary() throws Exception {
diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/diagnosticProvider/FirIdeNormalAnalysisSourceModuleCollectDiagnosticsTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/diagnosticProvider/FirIdeNormalAnalysisSourceModuleCollectDiagnosticsTestGenerated.java
index e90cbdb335c..93ec60a4f14 100644
--- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/diagnosticProvider/FirIdeNormalAnalysisSourceModuleCollectDiagnosticsTestGenerated.java
+++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/diagnosticProvider/FirIdeNormalAnalysisSourceModuleCollectDiagnosticsTestGenerated.java
@@ -100,6 +100,42 @@ public class FirIdeNormalAnalysisSourceModuleCollectDiagnosticsTestGenerated ext
         runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/inferTypeFromGetValueDelegateLibrary.kt");
     }
 
+    @Test
+    @TestMetadata("javaInnerClass.kt")
+    public void testJavaInnerClass() throws Exception {
+        runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClass.kt");
+    }
+
+    @Test
+    @TestMetadata("javaInnerClassFromAnotherModule.kt")
+    public void testJavaInnerClassFromAnotherModule() throws Exception {
+        runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromAnotherModule.kt");
+    }
+
+    @Test
+    @TestMetadata("javaInnerClassFromLibrary.kt")
+    public void testJavaInnerClassFromLibrary() throws Exception {
+        runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromLibrary.kt");
+    }
+
+    @Test
+    @TestMetadata("javaNestedClass.kt")
+    public void testJavaNestedClass() throws Exception {
+        runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClass.kt");
+    }
+
+    @Test
+    @TestMetadata("javaNestedClassFromAnotherModule.kt")
+    public void testJavaNestedClassFromAnotherModule() throws Exception {
+        runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromAnotherModule.kt");
+    }
+
+    @Test
+    @TestMetadata("javaNestedClassFromLibrary.kt")
+    public void testJavaNestedClassFromLibrary() throws Exception {
+        runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromLibrary.kt");
+    }
+
     @Test
     @TestMetadata("overrideProtectedClassReturnFromLibrary.kt")
     public void testOverrideProtectedClassReturnFromLibrary() throws Exception {
diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/diagnosticProvider/FirStandaloneNormalAnalysisSourceModuleCollectDiagnosticsTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/diagnosticProvider/FirStandaloneNormalAnalysisSourceModuleCollectDiagnosticsTestGenerated.java
index 7711de1756c..eccf3f510f3 100644
--- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/diagnosticProvider/FirStandaloneNormalAnalysisSourceModuleCollectDiagnosticsTestGenerated.java
+++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/diagnosticProvider/FirStandaloneNormalAnalysisSourceModuleCollectDiagnosticsTestGenerated.java
@@ -100,6 +100,42 @@ public class FirStandaloneNormalAnalysisSourceModuleCollectDiagnosticsTestGenera
         runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/inferTypeFromGetValueDelegateLibrary.kt");
     }
 
+    @Test
+    @TestMetadata("javaInnerClass.kt")
+    public void testJavaInnerClass() throws Exception {
+        runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClass.kt");
+    }
+
+    @Test
+    @TestMetadata("javaInnerClassFromAnotherModule.kt")
+    public void testJavaInnerClassFromAnotherModule() throws Exception {
+        runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromAnotherModule.kt");
+    }
+
+    @Test
+    @TestMetadata("javaInnerClassFromLibrary.kt")
+    public void testJavaInnerClassFromLibrary() throws Exception {
+        runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromLibrary.kt");
+    }
+
+    @Test
+    @TestMetadata("javaNestedClass.kt")
+    public void testJavaNestedClass() throws Exception {
+        runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClass.kt");
+    }
+
+    @Test
+    @TestMetadata("javaNestedClassFromAnotherModule.kt")
+    public void testJavaNestedClassFromAnotherModule() throws Exception {
+        runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromAnotherModule.kt");
+    }
+
+    @Test
+    @TestMetadata("javaNestedClassFromLibrary.kt")
+    public void testJavaNestedClassFromLibrary() throws Exception {
+        runTest("analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromLibrary.kt");
+    }
+
     @Test
     @TestMetadata("overrideProtectedClassReturnFromLibrary.kt")
     public void testOverrideProtectedClassReturnFromLibrary() throws Exception {
diff --git a/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClass.descriptors.txt b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClass.descriptors.txt
new file mode 100644
index 00000000000..aa03cd386b9
--- /dev/null
+++ b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClass.descriptors.txt
@@ -0,0 +1,4 @@
+Diagnostics from elements:
+  for PSI element of type KtParameter at (11,25-61)
+    UNUSED_PARAMETER      text ranges: [(64,73)]
+      PSI: KtParameter at (11,25-61)
diff --git a/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClass.kt b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClass.kt
new file mode 100644
index 00000000000..bd3b7b2900c
--- /dev/null
+++ b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClass.kt
@@ -0,0 +1,16 @@
+// FILE: issue/pack/RowIcon.java
+package issue.pack;
+
+public class RowIcon {
+    public class RClass {}
+}
+
+// FILE: usage.kt
+package usage
+
+fun testJavaNestedClass(alignment: issue.pack.RowIcon.RClass) {
+}
+
+fun checkIt() {
+    testJavaNestedClass(issue.pack.RowIcon().RClass())
+}
diff --git a/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClass.txt b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClass.txt
new file mode 100644
index 00000000000..9f370a89565
--- /dev/null
+++ b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClass.txt
@@ -0,0 +1 @@
+Diagnostics from elements:
diff --git a/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromAnotherModule.descriptors.txt b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromAnotherModule.descriptors.txt
new file mode 100644
index 00000000000..7b5f5418d8e
--- /dev/null
+++ b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromAnotherModule.descriptors.txt
@@ -0,0 +1,4 @@
+Diagnostics from elements:
+  for PSI element of type KtParameter at (13,25-61)
+    UNUSED_PARAMETER      text ranges: [(86,95)]
+      PSI: KtParameter at (13,25-61)
diff --git a/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromAnotherModule.kt b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromAnotherModule.kt
new file mode 100644
index 00000000000..28e90639703
--- /dev/null
+++ b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromAnotherModule.kt
@@ -0,0 +1,18 @@
+// MODULE: dep
+// FILE: issue/pack/RowIcon.java
+package issue.pack;
+
+public class RowIcon {
+    public class RClass {}
+}
+
+// MODULE: main(dep)
+// FILE: usage.kt
+package usage
+
+fun testJavaNestedClass(alignment: issue.pack.RowIcon.RClass) {
+}
+
+fun checkIt() {
+    testJavaNestedClass(issue.pack.RowIcon().RClass())
+}
diff --git a/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromAnotherModule.standalone.fir.txt b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromAnotherModule.standalone.fir.txt
new file mode 100644
index 00000000000..9f370a89565
--- /dev/null
+++ b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromAnotherModule.standalone.fir.txt
@@ -0,0 +1 @@
+Diagnostics from elements:
diff --git a/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromAnotherModule.txt b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromAnotherModule.txt
new file mode 100644
index 00000000000..79f0e696298
--- /dev/null
+++ b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromAnotherModule.txt
@@ -0,0 +1,4 @@
+Diagnostics from elements:
+  for PSI element of type KtDotQualifiedExpression at (17,25-54)
+    ARGUMENT_TYPE_MISMATCH      text ranges: [(169,198)]
+      PSI: KtDotQualifiedExpression at (17,25-54)
diff --git a/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromLibrary.kt b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromLibrary.kt
new file mode 100644
index 00000000000..b72899a3fdb
--- /dev/null
+++ b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromLibrary.kt
@@ -0,0 +1,20 @@
+// IGNORE_FE10
+// MODULE: lib
+// MODULE_KIND: LibraryBinary
+// FILE: issue/pack/RowIcon.java
+package issue.pack;
+
+public class RowIcon {
+    public class RClass {}
+}
+
+// MODULE: main(lib)
+// FILE: usage.kt
+package usage
+
+fun testJavaNestedClass(alignment: issue.pack.RowIcon.RClass) {
+}
+
+fun checkIt() {
+    testJavaNestedClass(issue.pack.RowIcon().RClass())
+}
diff --git a/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromLibrary.standalone.fir.txt b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromLibrary.standalone.fir.txt
new file mode 100644
index 00000000000..9f370a89565
--- /dev/null
+++ b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromLibrary.standalone.fir.txt
@@ -0,0 +1 @@
+Diagnostics from elements:
diff --git a/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromLibrary.txt b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromLibrary.txt
new file mode 100644
index 00000000000..e4e1783d635
--- /dev/null
+++ b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaInnerClassFromLibrary.txt
@@ -0,0 +1,4 @@
+Diagnostics from elements:
+  for PSI element of type KtDotQualifiedExpression at (19,25-54)
+    ARGUMENT_TYPE_MISMATCH      text ranges: [(171,200)]
+      PSI: KtDotQualifiedExpression at (19,25-54)
diff --git a/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClass.descriptors.txt b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClass.descriptors.txt
new file mode 100644
index 00000000000..aa03cd386b9
--- /dev/null
+++ b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClass.descriptors.txt
@@ -0,0 +1,4 @@
+Diagnostics from elements:
+  for PSI element of type KtParameter at (11,25-61)
+    UNUSED_PARAMETER      text ranges: [(64,73)]
+      PSI: KtParameter at (11,25-61)
diff --git a/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClass.kt b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClass.kt
new file mode 100644
index 00000000000..1cb5c060812
--- /dev/null
+++ b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClass.kt
@@ -0,0 +1,16 @@
+// FILE: issue/pack/RowIcon.java
+package issue.pack;
+
+public class RowIcon {
+    public static class RClass {}
+}
+
+// FILE: usage.kt
+package usage
+
+fun testJavaNestedClass(alignment: issue.pack.RowIcon.RClass) {
+}
+
+fun checkIt() {
+    testJavaNestedClass(issue.pack.RowIcon.RClass())
+}
diff --git a/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClass.txt b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClass.txt
new file mode 100644
index 00000000000..9f370a89565
--- /dev/null
+++ b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClass.txt
@@ -0,0 +1 @@
+Diagnostics from elements:
diff --git a/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromAnotherModule.descriptors.txt b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromAnotherModule.descriptors.txt
new file mode 100644
index 00000000000..7b5f5418d8e
--- /dev/null
+++ b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromAnotherModule.descriptors.txt
@@ -0,0 +1,4 @@
+Diagnostics from elements:
+  for PSI element of type KtParameter at (13,25-61)
+    UNUSED_PARAMETER      text ranges: [(86,95)]
+      PSI: KtParameter at (13,25-61)
diff --git a/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromAnotherModule.kt b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromAnotherModule.kt
new file mode 100644
index 00000000000..642319c7b53
--- /dev/null
+++ b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromAnotherModule.kt
@@ -0,0 +1,18 @@
+// MODULE: dep
+// FILE: issue/pack/RowIcon.java
+package issue.pack;
+
+public class RowIcon {
+    public static class RClass {}
+}
+
+// MODULE: main(dep)
+// FILE: usage.kt
+package usage
+
+fun testJavaNestedClass(alignment: issue.pack.RowIcon.RClass) {
+}
+
+fun checkIt() {
+    testJavaNestedClass(issue.pack.RowIcon.RClass())
+}
diff --git a/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromAnotherModule.standalone.fir.txt b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromAnotherModule.standalone.fir.txt
new file mode 100644
index 00000000000..9f370a89565
--- /dev/null
+++ b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromAnotherModule.standalone.fir.txt
@@ -0,0 +1 @@
+Diagnostics from elements:
diff --git a/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromAnotherModule.txt b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromAnotherModule.txt
new file mode 100644
index 00000000000..f3d9899c7c6
--- /dev/null
+++ b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromAnotherModule.txt
@@ -0,0 +1,4 @@
+Diagnostics from elements:
+  for PSI element of type KtDotQualifiedExpression at (17,25-52)
+    ARGUMENT_TYPE_MISMATCH      text ranges: [(169,196)]
+      PSI: KtDotQualifiedExpression at (17,25-52)
diff --git a/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromLibrary.kt b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromLibrary.kt
new file mode 100644
index 00000000000..5474492b55a
--- /dev/null
+++ b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromLibrary.kt
@@ -0,0 +1,20 @@
+// IGNORE_FE10
+// MODULE: lib
+// MODULE_KIND: LibraryBinary
+// FILE: issue/pack/RowIcon.java
+package issue.pack;
+
+public class RowIcon {
+    public static class RClass {}
+}
+
+// MODULE: main(lib)
+// FILE: usage.kt
+package usage
+
+fun testJavaNestedClass(alignment: issue.pack.RowIcon.RClass) {
+}
+
+fun checkIt() {
+    testJavaNestedClass(issue.pack.RowIcon.RClass())
+}
diff --git a/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromLibrary.standalone.fir.txt b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromLibrary.standalone.fir.txt
new file mode 100644
index 00000000000..9f370a89565
--- /dev/null
+++ b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromLibrary.standalone.fir.txt
@@ -0,0 +1 @@
+Diagnostics from elements:
diff --git a/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromLibrary.txt b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromLibrary.txt
new file mode 100644
index 00000000000..39b202b85ad
--- /dev/null
+++ b/analysis/analysis-api/testData/components/diagnosticsProvider/diagnostics/javaNestedClassFromLibrary.txt
@@ -0,0 +1,4 @@
+Diagnostics from elements:
+  for PSI element of type KtDotQualifiedExpression at (19,25-52)
+    ARGUMENT_TYPE_MISMATCH      text ranges: [(171,198)]
+      PSI: KtDotQualifiedExpression at (19,25-52)