Fix anonymous and local class indices

api/src/main/java/net/neoforged/jst/api/PsiHelper.java

@@ -7,6 +7,7 @@
 import com.intellij.psi.PsiParameter;
 import com.intellij.psi.PsiParameterListOwner;
 import com.intellij.psi.PsiPrimitiveType;
+import com.intellij.psi.PsiTypeParameter;
 import com.intellij.psi.PsiTypes;
 import com.intellij.psi.PsiWhiteSpace;
 import com.intellij.psi.SyntaxTraverser;
@@ -157,8 +158,9 @@ private static int getNonQualifiedClassIdx(@NotNull final PsiClass psiClass, @No
                 CachedValuesManager.getCachedValue(containingClass, () -> {
                     var map = new ObjectIntHashMap<PsiClass>();
                     int index = 0;
-                    for (PsiClass aClass : SyntaxTraverser.psiTraverser().withRoot(containingClass).postOrderDfsTraversal().filter(PsiClass.class)) {
-                        if (aClass.getQualifiedName() == null) {
+                    for (var aClass : SyntaxTraverser.psiTraverser().withRoot(containingClass).postOrderDfsTraversal().filter(PsiClass.class)) {
+                        // We're only interested in actual classes without qualified names (type parameters are an instance of PsiClass)
+                        if (!(aClass instanceof PsiTypeParameter) && aClass.getQualifiedName() == null) {
                             map.put(aClass, ++index);
                         }
                     }

tests/data/parchment/anonymous_classes/expected/FormattedText.java

@@ -0,0 +1,25 @@
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.Optional;
+
+public interface FormattedText {
+    FormattedText EMPTY = new FormattedText() {
+        @Override
+        public <T> Optional<T> visit(AtomicReference<T> named_inner1) {
+            return Optional.empty();
+        }
+    };
+
+    <T> Optional<T> visit(AtomicReference<T> p_ref);
+
+    static FormattedText of(final String p_txt) {
+        class Local {
+            void run(int named_local1) {}
+        }
+        return new FormattedText() {
+            @Override
+            public <T> Optional<T> visit(AtomicReference<T> named_inner2) {
+                return Optional.empty();
+            }
+        };
+    }
+}

tests/data/parchment/anonymous_classes/mappings.tsrg

@@ -0,0 +1,10 @@
+tsrg2 left right
+obfuscated_c$1 FormattedText$1
+	obfuscated_m (Ljava/util/concurrent/atomic/AtomicReference;)Ljava/util/Optional; visit
+		0 o named_inner1
+obfuscated_c$2 FormattedText$2Local
+	obfuscated_m (I)V run
+		0 o named_local1
+obfuscated_c$3 FormattedText$3
+	obfuscated_m (Ljava/util/concurrent/atomic/AtomicReference;)Ljava/util/Optional; visit
+		0 o named_inner2

tests/data/parchment/anonymous_classes/source/FormattedText.java

@@ -0,0 +1,25 @@
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.Optional;
+
+public interface FormattedText {
+    FormattedText EMPTY = new FormattedText() {
+        @Override
+        public <T> Optional<T> visit(AtomicReference<T> p_130797_) {
+            return Optional.empty();
+        }
+    };
+
+    <T> Optional<T> visit(AtomicReference<T> p_ref);
+
+    static FormattedText of(final String p_txt) {
+        class Local {
+            void run(int p_127434_) {}
+        }
+        return new FormattedText() {
+            @Override
+            public <T> Optional<T> visit(AtomicReference<T> p_130787_) {
+                return Optional.empty();
+            }
+        };
+    }
+}

tests/src/test/java/net/neoforged/jst/tests/EmbeddedTest.java

@@ -218,6 +218,11 @@ void testJavadoc() throws Exception {
         void testTsrgMappings() throws Exception {
             runParchmentTest("tsrg_file", "merged.tsrg");
         }
+
+        @Test
+        void testAnonymousClasses() throws Exception {
+            runParchmentTest("anonymous_classes", "mappings.tsrg");
+        }
     }
 
     @Nested