MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

look for xml properties in files with xml file type only

Browse Source
This commit is contained in:
Maxim.Mossienko
2013-12-08 21:14:48 +01:00
parent b46a384549
commit b6ae811de9
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesFile.java
+2 -1
View File
@@ -15,6 +15,7 @@
*/
package com.intellij.lang.properties.xml;
import com.intellij.ide.highlighter.XmlFileType;
import com.intellij.lang.properties.IProperty;
import com.intellij.lang.properties.PropertiesUtil;
import com.intellij.lang.properties.ResourceBundle;
@@ -71,7 +72,7 @@ public class XmlPropertiesFile implements PropertiesFile {
@Nullable
public static PropertiesFile getPropertiesFile(final PsiFile file) {
return file instanceof XmlFile ? getPropertiesFile((XmlFile)file) : null;
return file instanceof XmlFile && file.getFileType() == XmlFileType.INSTANCE ? getPropertiesFile((XmlFile)file) : null;
}
public static PropertiesFile getPropertiesFile(final XmlFile file) {
plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesIconProvider.java
+4 -1
View File
@@ -1,6 +1,7 @@
package com.intellij.lang.properties.xml;
import com.intellij.ide.IconProvider;
import com.intellij.ide.highlighter.XmlFileType;
import com.intellij.psi.PsiElement;
import com.intellij.psi.xml.XmlFile;
import icons.PropertiesIcons;
@@ -16,6 +17,8 @@ public class XmlPropertiesIconProvider extends IconProvider {
@Override
public Icon getIcon(@NotNull PsiElement element, int flags) {
return element instanceof XmlFile && XmlPropertiesFile.getPropertiesFile((XmlFile)element) != null ? PropertiesIcons.XmlProperties : null;
return element instanceof XmlFile &&
((XmlFile)element).getFileType() == XmlFileType.INSTANCE &&
XmlPropertiesFile.getPropertiesFile((XmlFile)element) != null ? PropertiesIcons.XmlProperties : null;
}
}