azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

missing files handling in converter

Browse Source 
- silently continue if no files were found to convert
This commit is contained in:
Mikhail Mutcianko
2014-07-16 16:40:11 +04:00
committed by Yan Zhulanow
parent 155d2fa979
commit 2c44f5c4b7
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java
+5 -3
View File
@@ -121,7 +121,7 @@ public enum TopDownAnalyzerFacadeForJVM {
@Nullable IncrementalCacheProvider incrementalCacheProvider
) {
List<JetFile> filesToAnalyze = new ArrayList<JetFile>(files);
filesToAnalyze.add(searchForAndroidDeclarations(project));
searchAndAddAndroidDeclarations(project, filesToAnalyze);
FileBasedDeclarationProviderFactory providerFactory =
new FileBasedDeclarationProviderFactory(topDownAnalysisParameters.getStorageManager(), filesToAnalyze);
@@ -177,9 +177,11 @@ public enum TopDownAnalyzerFacadeForJVM {
return module;
}
private static JetFile searchForAndroidDeclarations(Project project) {
private static Collection<JetFile> searchAndAddAndroidDeclarations(Project project, Collection<JetFile> files) {
AndroidUIXmlPathProvider provider = ServiceManager.getService(project, AndroidUIXmlPathProvider.class);
Collection<File> paths = provider.getPaths();
return new AndroidUIXmlParser(project, paths).parseToPsi();
JetFile file = new AndroidUIXmlParser(project, paths).parseToPsi();
if (file != null) files.add(file);
return files;
}
}