From 4aa99fd33a7510d9c386ceae686a12080a6b7a2c Mon Sep 17 00:00:00 2001
From: Mikhail Pyltsin <Mikhail.Pyltsin@jetbrains.com>
Date: Tue, 27 Aug 2024 15:24:02 +0200
Subject: [PATCH] IJ-CR-143396 [java-inspection] IDEA-356207 incorrect work
 with `typeUseWithType` option

- more tests

GitOrigin-RevId: 14fc2ab77a0659541423741c704437c7fba446b6
---
 .../TypeUseWithTypeHighlightingUseGenerated.java      |  2 ++
 .../TypeUseWithTypeHighlightingUseNotGenerated.java   |  2 ++
 .../TypeUseWithTypeUseGeneratedInline.after.java      | 11 +++++++++++
 .../TypeUseWithTypeUseGeneratedInline.java            | 11 +++++++++++
 .../ig/style/MissortedModifiersInspectionTest.java    |  3 +++
 5 files changed, 29 insertions(+)
 create mode 100644 java/java-tests/testData/ig/com/siyeh/igtest/style/missorted_modifiers/TypeUseWithTypeUseGeneratedInline.after.java
 create mode 100644 java/java-tests/testData/ig/com/siyeh/igtest/style/missorted_modifiers/TypeUseWithTypeUseGeneratedInline.java

diff --git a/java/java-tests/testData/ig/com/siyeh/igtest/style/missorted_modifiers/TypeUseWithTypeHighlightingUseGenerated.java b/java/java-tests/testData/ig/com/siyeh/igtest/style/missorted_modifiers/TypeUseWithTypeHighlightingUseGenerated.java
index 500101dfaf09..130802dcd805 100644
--- a/java/java-tests/testData/ig/com/siyeh/igtest/style/missorted_modifiers/TypeUseWithTypeHighlightingUseGenerated.java
+++ b/java/java-tests/testData/ig/com/siyeh/igtest/style/missorted_modifiers/TypeUseWithTypeHighlightingUseGenerated.java
@@ -6,6 +6,8 @@ class TypeUseWithTypeHighlighting {
   <warning descr="Missorted modifiers '@ReadOnly private'">@ReadOnly</warning>
   private String field;
 
+  <warning descr="Missorted modifiers '@ReadOnly private'">@ReadOnly</warning> private String fieldOneLine;
+
   private <warning descr="Missorted modifiers '@ReadOnly final'">@ReadOnly</warning> <error descr="Variable 'field1' might not have been initialized">final String field1</error>;
   private final @ReadOnly String field2 = "2";
 }
diff --git a/java/java-tests/testData/ig/com/siyeh/igtest/style/missorted_modifiers/TypeUseWithTypeHighlightingUseNotGenerated.java b/java/java-tests/testData/ig/com/siyeh/igtest/style/missorted_modifiers/TypeUseWithTypeHighlightingUseNotGenerated.java
index 89a0d00db5f7..1801c855ed19 100644
--- a/java/java-tests/testData/ig/com/siyeh/igtest/style/missorted_modifiers/TypeUseWithTypeHighlightingUseNotGenerated.java
+++ b/java/java-tests/testData/ig/com/siyeh/igtest/style/missorted_modifiers/TypeUseWithTypeHighlightingUseNotGenerated.java
@@ -6,6 +6,8 @@ class TypeUseWithTypeHighlighting {
   @ReadOnly
   private String field;
 
+  @ReadOnly private String fieldOneLine;
+
   private <warning descr="Missorted modifiers '@ReadOnly final'">@ReadOnly</warning> <error descr="Variable 'field1' might not have been initialized">final String field1</error>;
   private final @ReadOnly String field2 = "2";
 }
diff --git a/java/java-tests/testData/ig/com/siyeh/igtest/style/missorted_modifiers/TypeUseWithTypeUseGeneratedInline.after.java b/java/java-tests/testData/ig/com/siyeh/igtest/style/missorted_modifiers/TypeUseWithTypeUseGeneratedInline.after.java
new file mode 100644
index 000000000000..1eb838472f12
--- /dev/null
+++ b/java/java-tests/testData/ig/com/siyeh/igtest/style/missorted_modifiers/TypeUseWithTypeUseGeneratedInline.after.java
@@ -0,0 +1,11 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+class TypeUseWithType {
+
+  private @TestAnn<caret>otation1 String fieldOneLine;
+
+  @Target(value = { ElementType.TYPE_USE, ElementType.FIELD })
+  public @interface TestAnnotation1 {
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/ig/com/siyeh/igtest/style/missorted_modifiers/TypeUseWithTypeUseGeneratedInline.java b/java/java-tests/testData/ig/com/siyeh/igtest/style/missorted_modifiers/TypeUseWithTypeUseGeneratedInline.java
new file mode 100644
index 000000000000..24ec9e3ee002
--- /dev/null
+++ b/java/java-tests/testData/ig/com/siyeh/igtest/style/missorted_modifiers/TypeUseWithTypeUseGeneratedInline.java
@@ -0,0 +1,11 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+class TypeUseWithType {
+
+  <warning descr="Missorted modifiers '@TestAnnotation1 private'">@TestAnnotation1<caret></warning> private String fieldOneLine;
+
+  @Target(value = { ElementType.TYPE_USE, ElementType.FIELD })
+  public @interface TestAnnotation1 {
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/siyeh/ig/style/MissortedModifiersInspectionTest.java b/java/java-tests/testSrc/com/siyeh/ig/style/MissortedModifiersInspectionTest.java
index 36c5089c3196..43f0f4ca5913 100644
--- a/java/java-tests/testSrc/com/siyeh/ig/style/MissortedModifiersInspectionTest.java
+++ b/java/java-tests/testSrc/com/siyeh/ig/style/MissortedModifiersInspectionTest.java
@@ -30,6 +30,9 @@ public class MissortedModifiersInspectionTest extends LightJavaInspectionTestCas
   public void testTypeUseWithTypeUseGenerated() {
     doTestQuickFix();
   }
+  public void testTypeUseWithTypeUseGeneratedInline() {
+    doTestQuickFix();
+  }
 
   public void testTypeUseWithTypeUseNotGenerated() {
     doTest();