Merge branch 'master' of git.labs.intellij.net:idea/community

java/openapi/src/com/intellij/util/xml/ClassMappingNameConverter.java

@@ -52,7 +52,7 @@ public class ClassMappingNameConverter extends ResolvingConverter.StringConverte
     if (classElement == null) return Collections.emptyList();
     Object value = ((GenericDomValue)classElement).getValue();
     if (value == null) return Collections.emptyList();
-    assert value instanceof PsiClass : classElement + " should have PsiClass type";
+    assert value instanceof PsiClass : classElement + " should have PsiClass type, but was " + value;
     PsiClass psiClass = (PsiClass)value;
 
     JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(context.getProject());

platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestUtil.java

@@ -72,7 +72,7 @@ public class CodeInsightTestUtil {
     return null;
   }
 
-  public static void doIntentionTest(CodeInsightTestFixture fixture, @NonNls String file, @NonNls String actionText) throws Throwable {
+  public static void doIntentionTest(CodeInsightTestFixture fixture, @NonNls String file, @NonNls String actionText) {
     doIntentionTest(fixture, actionText, file + ".xml", file + "_after.xml");
   }
 

xml/dom-impl/src/com/intellij/util/xml/stubs/index/DomNamespaceKeyIndex.java

@@ -42,7 +42,7 @@ public class DomNamespaceKeyIndex extends StringStubIndexExtension<PsiFile> {
 
   public boolean hasStubElementsWithNamespaceKey(final DomFileElement domFileElement, final String namespaceKey) {
     final VirtualFile file = domFileElement.getFile().getVirtualFile();
-    assert file instanceof VirtualFileWithId : file;
+    if (!(file instanceof VirtualFileWithId)) return false;
 
     final int virtualFileId = ((VirtualFileWithId)file).getId();
     CommonProcessors.FindFirstProcessor<String> processor =

xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlEntityCache.java

@@ -1,6 +1,7 @@
 package com.intellij.psi.impl.source.xml;
 
 import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.ModificationTracker;
 import com.intellij.psi.*;
 import com.intellij.psi.util.CachedValue;
 import com.intellij.psi.util.CachedValueProvider;
@@ -27,7 +28,7 @@ public class XmlEntityCache {
             if (declElement instanceof XmlEntityDecl && declElement.isValid() && name.equals(((XmlEntityDecl)declElement).getName()))
               return new Result<XmlEntityDecl>((XmlEntityDecl)declElement, declElement);
             cachingMap.put(name,null);
-            return new Result<XmlEntityDecl>(null,null);
+            return new Result<XmlEntityDecl>(null, ModificationTracker.NEVER_CHANGED);
           }
         },
         false