Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml
	platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java

Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f

1 files changed, 7 insertions, 6 deletions

diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/structureView/GroupByWordPrefixes.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/structureView/GroupByWordPrefixes.java
index b67f6bfbea3f..efdbeaf3e863 100644
--- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/structureView/GroupByWordPrefixes.java
+++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/structureView/GroupByWordPrefixes.java
@@ -16,6 +16,7 @@
 package com.intellij.lang.properties.structureView;
 
 import com.intellij.icons.AllIcons;
+import com.intellij.ide.structureView.StructureViewTreeElement;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.ide.util.treeView.smartTree.*;
 import com.intellij.lang.properties.IProperty;
@@ -65,14 +66,14 @@ public class GroupByWordPrefixes implements Grouper, Sorter {
       parentPrefixLength = 0;
     }
     for (TreeElement element : children) {
-      String text = null;
-      if (element instanceof PropertiesStructureViewElement) {
-        IProperty property = ((PropertiesStructureViewElement)element).getValue();
-        text = property.getUnescapedKey();
+      if (!(element instanceof StructureViewTreeElement)) {
+        continue;
       }
-      else if (element instanceof ResourceBundlePropertyStructureViewElement) {
-        text = ((ResourceBundlePropertyStructureViewElement)element).getValue();
+      final Object value = ((StructureViewTreeElement)element).getValue();
+      if (!(value instanceof IProperty)) {
+        continue;
       }
+      final String text = ((IProperty) value).getUnescapedKey();
       if (text == null) continue;
       LOG.assertTrue(text.startsWith(parentPrefix) || text.startsWith(mySeparator));
       List<String> words = StringUtil.split(text, mySeparator);