From 375946f62c79f3a64d34578f74977801edcfa817 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Wed, 1 Feb 2012 13:16:13 +0400
Subject: [PATCH] diamond type visitor EA-30757 - assert:
 PsiSubstitutorImpl$SubstitutionVisitorBase.visitType

---
 java/java-psi-api/src/com/intellij/psi/PsiTypeVisitor.java  | 4 ++++
 .../src/com/intellij/psi/PsiDiamondTypeImpl.java            | 6 ++++--
 .../src/com/intellij/psi/impl/PsiSubstitutorImpl.java       | 5 +++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/java/java-psi-api/src/com/intellij/psi/PsiTypeVisitor.java b/java/java-psi-api/src/com/intellij/psi/PsiTypeVisitor.java
index 045060685ce0..f0e9afd057f2 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiTypeVisitor.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiTypeVisitor.java
@@ -52,4 +52,8 @@ public class PsiTypeVisitor<A> {
   public A visitDisjunctionType(PsiDisjunctionType disjunctionType) {
     return visitType(disjunctionType);
   }
+  
+  public A visitDiamondType(PsiDiamondType diamondType) {
+    return visitType(diamondType);
+  }
 }
diff --git a/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java b/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java
index cff23586365f..50341eef31aa 100644
--- a/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java
@@ -29,7 +29,9 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
 /**
  * User: anna
@@ -73,7 +75,7 @@ public class PsiDiamondTypeImpl extends PsiDiamondType {
 
   @Override
   public <A> A accept(PsiTypeVisitor<A> visitor) {
-    return visitor.visitType(this);
+    return visitor.visitDiamondType(this);
   }
 
   @Override
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java
index 2c67d7eff8bb..f9535cbb3695 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java
@@ -212,6 +212,11 @@ public class PsiSubstitutorImpl implements PsiSubstitutor {
       });
       return disjunctionType.newDisjunctionType(substituted);
     }
+
+    @Override
+    public PsiType visitDiamondType(PsiDiamondType diamondType) {
+      return diamondType;
+    }
   }
 
   private final SubstitutionVisitor myAddingBoundsSubstitutionVisitor = new SubstitutionVisitor(SubstituteKind.ADD_BOUNDS);