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

[light classes] LightClassBuilder: cleanup code

Browse Source 
^KT-48773
This commit is contained in:
Dmitry Gridin
2022-06-13 21:38:55 +02:00
committed by Space
parent 8a75aef8f5
commit bfe09de95f
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/builder/LightClassBuilder.kt
+13 -15
View File
@@ -25,11 +25,11 @@ import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics
data class LightClassBuilderResult(val stub: PsiJavaFileStub, val bindingContext: BindingContext, val diagnostics: Diagnostics) data class LightClassBuilderResult(val stub: PsiJavaFileStub, val bindingContext: BindingContext, val diagnostics: Diagnostics)
fun buildLightClass( fun buildLightClass(
packageFqName: FqName, packageFqName: FqName,
files: Collection<KtFile>, files: Collection<KtFile>,
generateClassFilter: GenerationState.GenerateClassFilter, generateClassFilter: GenerationState.GenerateClassFilter,
context: LightClassConstructionContext, context: LightClassConstructionContext,
generate: (state: GenerationState, files: Collection<KtFile>) -> Unit generate: (state: GenerationState, files: Collection<KtFile>) -> Unit
): LightClassBuilderResult { ): LightClassBuilderResult {
val project = files.first().project val project = files.first().project
@@ -62,18 +62,16 @@ fun buildLightClass(
stubComputationTrackerInstance(project)?.onStubComputed(javaFileStub, context) stubComputationTrackerInstance(project)?.onStubComputed(javaFileStub, context)
return LightClassBuilderResult(javaFileStub, context.bindingContext, state.collectedExtraJvmDiagnostics) return LightClassBuilderResult(javaFileStub, context.bindingContext, state.collectedExtraJvmDiagnostics)
} } catch (e: ProcessCanceledException) {
catch (e: ProcessCanceledException) {
throw e throw e
} } catch (e: RuntimeException) {
catch (e: RuntimeException) { logErrorWithOSInfo(e, packageFqName, files.firstOrNull()?.virtualFile)
logErrorWithOSInfo(e, packageFqName, null)
throw e throw e
} }
} }
private fun createJavaFileStub(packageFqName: FqName, files: Collection<KtFile>): PsiJavaFileStub { private fun createJavaFileStub(packageFqName: FqName, files: Collection<KtFile>): PsiJavaFileStub {
val javaFileStub = PsiJavaFileStubImpl(packageFqName.asString(), /*compiled = */true) val javaFileStub = PsiJavaFileStubImpl(packageFqName.asString(), /* compiled = */true)
javaFileStub.psiFactory = ClsWrapperStubPsiFactory.INSTANCE javaFileStub.psiFactory = ClsWrapperStubPsiFactory.INSTANCE
val fakeFile = object : ClsFileImpl(files.first().viewProvider) { val fakeFile = object : ClsFileImpl(files.first().viewProvider) {
@@ -93,11 +91,11 @@ private fun createJavaFileStub(packageFqName: FqName, files: Collection<KtFile>)
} }
private fun logErrorWithOSInfo(cause: Throwable?, fqName: FqName, virtualFile: VirtualFile?) { private fun logErrorWithOSInfo(cause: Throwable?, fqName: FqName, virtualFile: VirtualFile?) {
val path = if (virtualFile == null) "<null>" else virtualFile.path val path = virtualFile?.path ?: "<null>"
LOG.error( LOG.error(
"Could not generate LightClass for $fqName declared in $path\n" + "Could not generate LightClass for $fqName declared in $path\n" +
"System: ${SystemInfo.OS_NAME} ${SystemInfo.OS_VERSION} Java Runtime: ${SystemInfo.JAVA_RUNTIME_VERSION}", "System: ${SystemInfo.OS_NAME} ${SystemInfo.OS_VERSION} Java Runtime: ${SystemInfo.JAVA_RUNTIME_VERSION}",
cause cause,
) )
} }