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

Kapt: Remove artificial KaptError exception on errors from annotation processor (KT-21262)

Browse Source
This commit is contained in:
Yan Zhulanow
2017-11-16 19:18:57 +09:00
parent 0a0de8da29
commit 3d1ca61f9f
5 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt
+2 -2
View File
@@ -104,7 +104,7 @@ internal class PerFileAnalysisCache(val file: KtFile, val componentProvider: Com
DiagnosticUtils.throwIfRunningOnServer(e)
LOG.error(e)
return AnalysisResult.error(BindingContext.EMPTY, e)
return AnalysisResult.internalError(BindingContext.EMPTY, e)
}
}
}
@@ -188,7 +188,7 @@ private object KotlinResolveDataProvider {
DiagnosticUtils.throwIfRunningOnServer(e)
LOG.error(e)
return AnalysisResult.error(BindingContext.EMPTY, e)
return AnalysisResult.internalError(BindingContext.EMPTY, e)
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt
+1 -1
View File
@@ -105,7 +105,7 @@ internal class ProjectResolutionFacade(
val withError = results.firstOrNull { it.isError() }
val bindingContext = CompositeBindingContext.create(results.map { it.bindingContext })
return if (withError != null)
AnalysisResult.error(bindingContext, withError.error)
AnalysisResult.internalError(bindingContext, withError.error)
else
//TODO: (module refactoring) several elements are passed here in debugger
AnalysisResult.success(bindingContext, findModuleDescriptor(elements.first().getModuleInfo()))