diff --git a/plugins/java-i18n/src/com/intellij/lang/properties/psi/ResourceBundleManager.java b/plugins/java-i18n/src/com/intellij/lang/properties/psi/ResourceBundleManager.java index a68cd3f31f99..f3243b410a97 100644 --- a/plugins/java-i18n/src/com/intellij/lang/properties/psi/ResourceBundleManager.java +++ b/plugins/java-i18n/src/com/intellij/lang/properties/psi/ResourceBundleManager.java @@ -42,7 +42,7 @@ public abstract class ResourceBundleManager { public abstract PsiClass getResourceBundle(); public List suggestPropertiesFiles(){ - return I18nUtil.defaultGetPropertyFiles(myProject); + return I18nUtil.defaultSuggestPropertiesFiles(myProject); } @Nullable diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/references/I18nUtil.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/references/I18nUtil.java index 10b809997b51..c0fe61293b38 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/references/I18nUtil.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/references/I18nUtil.java @@ -20,6 +20,7 @@ import com.intellij.lang.properties.IProperty; import com.intellij.lang.properties.PropertiesFileProcessor; import com.intellij.lang.properties.PropertiesReferenceManager; import com.intellij.lang.properties.psi.PropertiesFile; +import com.intellij.lang.properties.xml.XmlPropertiesFile; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectFileIndex; @@ -74,7 +75,7 @@ public class I18nUtil { } } - public static List defaultGetPropertyFiles(Project project) { + public static List defaultSuggestPropertiesFiles(Project project) { final List paths = new ArrayList(); final ProjectFileIndex projectFileIndex = ProjectRootManager.getInstance(project).getFileIndex(); @@ -82,6 +83,9 @@ public class I18nUtil { @Override public boolean process(String baseName, PropertiesFile propertiesFile) { + if (propertiesFile instanceof XmlPropertiesFile) { + return true; + } VirtualFile virtualFile = propertiesFile.getVirtualFile(); if (projectFileIndex.isInContent(virtualFile)) { String path = FileUtil.toSystemDependentName(virtualFile.getPath()); diff --git a/plugins/properties/src/com/intellij/lang/properties/references/I18nizeQuickFixDialog.java b/plugins/properties/src/com/intellij/lang/properties/references/I18nizeQuickFixDialog.java index f044a6db681c..db51ebfc5e30 100644 --- a/plugins/properties/src/com/intellij/lang/properties/references/I18nizeQuickFixDialog.java +++ b/plugins/properties/src/com/intellij/lang/properties/references/I18nizeQuickFixDialog.java @@ -359,7 +359,7 @@ public class I18nizeQuickFixDialog extends DialogWrapper implements I18nizeQuick } protected List defaultSuggestPropertiesFiles() { - return I18nUtil.defaultGetPropertyFiles(myProject); + return I18nUtil.defaultSuggestPropertiesFiles(myProject); } protected PropertiesFile getPropertiesFile() {