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

properties: check element is valid

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-11-01 12:22:03 +03:00
parent 83aebfb0c2
commit afa62a899d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/PropertiesImplUtil.java
+2 -2
View File
@@ -90,13 +90,13 @@ public class PropertiesImplUtil extends PropertiesUtil {
@NotNull final PsiDirectory baseDirectory) {
final ResourceBundleManager bundleBaseNameManager = ResourceBundleManager.getInstance(baseDirectory.getProject());
final List<PropertiesFile> bundleFiles = Stream
.of(ReadAction.compute(() -> baseDirectory.getFiles()))
.of(ReadAction.compute(() -> baseDirectory.isValid() ? baseDirectory.getFiles() : PsiFile.EMPTY_ARRAY))
.filter(f -> Comparing.strEqual(f.getVirtualFile().getExtension(), extension))
.filter(PropertiesImplUtil::isPropertiesFile)
.filter(f -> Comparing.equal(bundleBaseNameManager.getBaseName(f), baseName))
.map(PropertiesImplUtil::getPropertiesFile)
.collect(Collectors.toList());
if (bundleFiles == null) return null;
if (bundleFiles.isEmpty()) return null;
return new ResourceBundleWithCachedFiles(new ResourceBundleImpl(bundleFiles.get(0)), bundleFiles);
}