Merge remote-tracking branch 'origin/master'

java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java

@@ -427,7 +427,12 @@ public class GenerateMembersUtil {
 
   private static PsiType substituteType(final PsiSubstitutor substitutor, final PsiType type) {
     final PsiType psiType = substitutor.substitute(type);
-    if (psiType != null) return psiType;
+    if (psiType != null) {
+      final PsiType deepComponentType = psiType.getDeepComponentType();
+      if (!(deepComponentType instanceof PsiCapturedWildcardType || deepComponentType instanceof PsiWildcardType)){
+        return psiType;
+      }
+    }
     return TypeConversionUtil.erasure(type);
   }
 

java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java

@@ -116,7 +116,7 @@ public class TypeMigrationLabeler {
         usages.add(new UsageInfo(expr) {
           @Nullable
           public String getTooltipText() {
-            final PsiType type = expr.getType();
+            final PsiType type = expr.isValid() ? expr.getType() : null;
             if (type == null) return null;
             return "Cannot convert type of the expression from " +
                    type.getCanonicalText() + " to " + p.getSecond().getCanonicalText();

java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java

@@ -115,8 +115,8 @@ public class TypeConversionUtil {
           final PsiClass psiClass = classType.resolve();
           if (psiClass == null || psiClass instanceof PsiTypeParameter) return false;
           final PsiClassType boxedType = ((PsiPrimitiveType)toType).getBoxedType(psiClass.getManager(), psiClass.getResolveScope());
-          if (boxedType != null) {
-            return isAssignable(fromType, boxedType);
+          if (boxedType != null && isAssignable(fromType, boxedType)) {
+            return true;
           }
         }
         return fromTypeRank == toTypeRank ||

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/PolymorphicTypeCast.java

@@ -90,4 +90,8 @@ class C {
   }
 
   void m(int i) { }
+  
+  void asLongs(Integer i) {
+      long l = (long) i;
+  }
 }

java/java-tests/testData/codeInsight/overrideImplement/afterErasureWildcard.java

@@ -0,0 +1,9 @@
+interface Generic<T> {
+  T foo();
+}
+
+class II implements Generic<?> {
+    public Object foo() {
+        <selection>return null;  //To change body of implemented methods use File | Settings | File Templates.</selection>
+    }
+}

java/java-tests/testData/codeInsight/overrideImplement/beforeErasureWildcard.java

@@ -0,0 +1,7 @@
+interface Generic<T> {
+  T foo();
+}
+
+class II implements Generic<?> {
+  <caret>
+}

java/java-tests/testSrc/com/intellij/codeInsight/OverrideImplementTest.java

@@ -61,6 +61,7 @@ public class OverrideImplementTest extends LightCodeInsightTestCase {
   public void testClone() { doTest(false); }
   public void testOnTheLineWithExistingExpression() { doTest(false); }
   public void testSimplifyObjectWildcard() { doTest(false); }
+  public void testErasureWildcard() { doTest(false); }
 
   public void testImplementExtensionMethods() { doTest8(false, true); }
   public void testDoNotImplementExtensionMethods() { doTest8(false, true); }

platform/lang-impl/src/com/intellij/codeInspection/ex/HTMLComposerImpl.java

@@ -126,17 +126,18 @@ public abstract class HTMLComposerImpl extends HTMLComposer {
     final HTMLComposerExtension extension = getLanguageExtension(refElement);
     if (extension != null) {
       extension.appendShortName(refElement, buf);
-    }
-    refElement.accept(new RefVisitor() {
-      @Override public void visitFile(RefFile file) {
-        final PsiFile psiFile = file.getElement();
-        if (psiFile != null) {
-          buf.append(B_OPENING);
-          buf.append(psiFile.getName());
-          buf.append(B_CLOSING);
+    } else {
+      refElement.accept(new RefVisitor() {
+        @Override public void visitFile(RefFile file) {
+          final PsiFile psiFile = file.getElement();
+          if (psiFile != null) {
+            buf.append(B_OPENING);
+            buf.append(psiFile.getName());
+            buf.append(B_CLOSING);
+          }
         }
-      }
-    });
+      });
+    }
   }
 
   protected void appendQualifiedName(StringBuffer buf, RefEntity refEntity) {

plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/FinalUtils.java

@@ -630,8 +630,9 @@ public class FinalUtils {
     }
 
     private void satisfyVacuously() {
-      definitelyAssigned = true;
-      definitelyUnassigned = true;
+      if (definitelyAssigned) {
+        definitelyUnassigned = true;
+      }
     }
 
     private static boolean isPrePostFixExpression(

plugins/InspectionGadgets/test/com/siyeh/igtest/style/field_final/FieldMayBeFinal.java

@@ -398,4 +398,21 @@ class Q implements Iterator<String> {
     public void remove() {
             throw new UnsupportedOperationException();
 }
+}
+class R {
+  private static final String someStaticStuff;
+  static {
+    try {
+      someStaticStuff = "";
+    }
+    catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private String someInjectedStuff;
+
+  public String getSomeInjectedStuff() {
+    return someInjectedStuff;
+  }
 }