Snapshot 621d3b6adc5a7cb6f13e27610aa33af48f13da27 from master branch of git://git.jetbrains.org/idea/community.git

Change-Id: I3e2f8acd6054389626ab7c0f9065c8d905e99436

2 files changed, 10 insertions, 6 deletions

diff --git a/plugins/properties/src/com/intellij/lang/properties/parsing/PropertiesParserDefinition.java b/plugins/properties/src/com/intellij/lang/properties/parsing/PropertiesParserDefinition.java
index ce0ad4e90006..23255c527574 100644
--- a/plugins/properties/src/com/intellij/lang/properties/parsing/PropertiesParserDefinition.java
+++ b/plugins/properties/src/com/intellij/lang/properties/parsing/PropertiesParserDefinition.java
@@ -85,9 +85,6 @@ public class PropertiesParserDefinition implements ParserDefinition {
     else if (type == PropertiesElementTypes.PROPERTIES_LIST) {
       return new PropertiesListImpl(node);
     }
-
-    LOG.error("Alien element type [" + type + "]. Can't create Property PsiElement for that.");
-
-    return new ASTWrapperPsiElement(node);
+    throw new AssertionError("Alien element type [" + type + "]. Can't create Property PsiElement for that.");
   }
 }
diff --git a/plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesIndex.java b/plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesIndex.java
index f36749c9593b..e29af4722802 100644
--- a/plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesIndex.java
+++ b/plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesIndex.java
@@ -1,9 +1,11 @@
 package com.intellij.lang.properties.xml;
 
 import com.intellij.ide.highlighter.XmlFileType;
+import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.io.StreamUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.Consumer;
 import com.intellij.util.indexing.*;
 import com.intellij.util.io.*;
 import com.intellij.util.text.CharArrayUtil;
@@ -22,7 +24,7 @@ import java.util.Map;
  *         Date: 7/25/11
  */
 public class XmlPropertiesIndex extends FileBasedIndexExtension<XmlPropertiesIndex.Key, String>
-  implements FileBasedIndex.InputFilter, DataIndexer<XmlPropertiesIndex.Key, String, FileContent>,
+  implements FileBasedIndex.FileTypeSpecificInputFilter, DataIndexer<XmlPropertiesIndex.Key, String, FileContent>,
              KeyDescriptor<XmlPropertiesIndex.Key> {
 
   public final static Key MARKER_KEY = new Key();
@@ -69,7 +71,12 @@ public class XmlPropertiesIndex extends FileBasedIndexExtension<XmlPropertiesInd
 
   @Override
   public boolean acceptInput(VirtualFile file) {
-    return XmlFileType.INSTANCE == file.getFileType();
+    return true;
+  }
+
+  @Override
+  public void registerFileTypesUsedForIndexing(@NotNull Consumer<FileType> fileTypeSink) {
+    fileTypeSink.consume(XmlFileType.INSTANCE);
   }
 
   @NotNull