Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@antonbashir
antonbashir committed Jun 29, 2024
1 parent 7b7f199 commit 5f19584
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 35 deletions.
11 changes: 10 additions & 1 deletion build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,16 @@ executable {
.toFile()
.absolutePath
dependsOn(WRITE_CONFIGURATION_TASK)
jvmArgs("-Dconfiguration=$configurationPath")
jvmArgs("-Xms2g", "-Xmx2g")
jvmArgs("--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED")
jvmArgs("--add-exports", "jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED")
jvmArgs("--add-exports", "jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED")
jvmArgs("--add-exports", "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED")
jvmArgs("--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED")
jvmArgs("--add-exports", "jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED")
jvmArgs("--add-exports", "jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED")
jvmArgs("--add-exports", "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED")
jvmArgs("-Dconfiguration=/home/anton/development/art-environment/local/projects/art-example/build/generator/module.yml")
}
}
main("io.art.generator.Generator")
Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/io/art/generator/parser/KotlinDescriptorParser.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ open class KotlinDescriptorParser : KotlinTypeParser() {
?.takeIf { declaration -> declaration.classKind != ANNOTATION_CLASS }
?.takeIf { declaration -> declaration.isInternal() }
?.takeIf { declaration -> declaration.isLocal() }
?.takeIf { declaration -> declaration.primaryConstructor?.parameters?.isEmpty() == true }
?.takeIf { declaration -> declaration.typeParameters.isEmpty() }
?.asMetaClass()
)
}
Expand All @@ -78,7 +78,7 @@ open class KotlinDescriptorParser : KotlinTypeParser() {
.filter { declaration -> declaration.classKind != ANNOTATION_CLASS }
.filter { declaration -> !declaration.isInternal() }
.filter { declaration -> !declaration.isLocal() }
.filter { declaration -> declaration.primaryConstructor?.parameters?.isEmpty() == true }
.filter { declaration -> declaration.typeParameters.isEmpty() }
.associate { declaration -> declaration.simpleName.asString() to cache.getOrElse(declaration) { declaration.asMetaClass() } }
metaClass.innerClasses.putAll(innerClasses)
}
Expand All @@ -91,7 +91,7 @@ open class KotlinDescriptorParser : KotlinTypeParser() {
.filter { declaration -> declaration.classKind != ANNOTATION_CLASS }
.filter { declaration -> !declaration.isInternal() }
.filter { declaration -> !declaration.isLocal() }
.filter { declaration -> declaration.primaryConstructor?.parameters?.isEmpty() == true }
.filter { declaration -> declaration.typeParameters.isEmpty() }
.map { declaration -> cache.getOrElse(declaration) { declaration.asMetaClass() } }
.toList()
metaClass.interfaces.addAll(interfaces)
Expand Down
77 changes: 46 additions & 31 deletions src/main/kotlin/io/art/generator/service/analyzing/KotlinAnalyzingService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,16 @@ package io.art.generator.service.analyzing
import com.google.devtools.ksp.isInternal
import com.google.devtools.ksp.isLocal
import com.google.devtools.ksp.processing.*
import com.google.devtools.ksp.symbol.*
import com.google.devtools.ksp.symbol.ClassKind.ANNOTATION_CLASS
import com.google.devtools.ksp.symbol.ClassKind.ENUM_ENTRY
import com.google.devtools.ksp.symbol.Modifier.*
import com.google.devtools.ksp.symbol.KSAnnotated
import com.google.devtools.ksp.symbol.KSClassDeclaration
import com.google.devtools.ksp.symbol.KSFile
import com.google.devtools.ksp.symbol.Modifier.INNER
import com.tschuchort.compiletesting.KotlinCompilation
import com.tschuchort.compiletesting.SourceFile
import com.tschuchort.compiletesting.symbolProcessorProviders
import io.art.core.constants.StringConstants.DOT
import io.art.core.matcher.PathMatcher.matches
import io.art.generator.configuration.SourceConfiguration
import io.art.generator.constants.ANALYZING_MESSAGE
Expand All @@ -37,6 +40,7 @@ import io.art.generator.model.KotlinMetaClass
import io.art.generator.parser.KotlinDescriptorParser
import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
import java.nio.file.Paths.get
import kotlin.io.path.exists

data class KotlinAnalyzingRequest(
val configuration: SourceConfiguration,
Expand All @@ -49,37 +53,18 @@ object KotlinAnalyzerBuiltins {

fun analyzeKotlinSources(request: KotlinAnalyzingRequest) = KotlinAnalyzingService().analyzeKotlinSources(request)

private class KotlinAnalyzingProcessor(private val processor: (files: List<KSFile>) -> Unit) : SymbolProcessor {
private class KotlinAnalyzingProcessor(
private val request: KotlinAnalyzingRequest,
private val processor: (files: List<KotlinMetaClass>) -> Unit
) : SymbolProcessor, KotlinDescriptorParser() {
var invoked = false
override fun process(resolver: Resolver): List<KSAnnotated> {
if (invoked) return emptyList()
println("test")
processor(resolver.getAllFiles().toList())
invoked = true
KotlinAnalyzerBuiltins.builtins = resolver.builtIns
return emptyList()
}
}

private class KotlinAnalyzingProcessorProvider(private val processor: (files: List<KSFile>) -> Unit) : SymbolProcessorProvider {
override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor = KotlinAnalyzingProcessor(processor)
}

@OptIn(ExperimentalCompilerApi::class)
private class KotlinAnalyzingService : KotlinDescriptorParser() {
fun analyzeKotlinSources(request: KotlinAnalyzingRequest): List<KotlinMetaClass> {
KOTLIN_LOGGER.info(ANALYZING_MESSAGE(request.configuration.root))
val roots = request.configuration.sources.toSet()
val processed = mutableSetOf<KSFile>()
KotlinCompilation().apply {
sources = roots.map { path -> SourceFile.fromPath(path.toFile(), false) }
symbolProcessorProviders = listOf(KotlinAnalyzingProcessorProvider(processed::addAll))
compile()
}
return request.configuration.root.toFile().listFiles()!!
.map { file -> file.name }
.flatMap { packageName -> collectClasses(processed, packageName) }
val resolved = resolver.getAllFiles().toSet()
request.configuration.root.toFile().listFiles()!!
.asSequence()
.map { file -> file.name }
.flatMap { packageName -> collectClasses(resolved, packageName) }
.filter { descriptor -> !descriptor.containingFile?.fileName?.kotlinPath.isNullOrBlank() }
.filter { descriptor -> descriptor.included(request) }
.filter { descriptor -> descriptor.qualifiedName?.asString() != request.metaClassName }
Expand All @@ -89,10 +74,15 @@ private class KotlinAnalyzingService : KotlinDescriptorParser() {
.filter { descriptor -> !descriptor.isLocal() }
.filter { descriptor -> !descriptor.isInternal() }
.filter { descriptor -> descriptor.parentDeclaration !is KSClassDeclaration }
.filter { descriptor -> descriptor.primaryConstructor?.parameters?.isEmpty() == true }
.filter { descriptor -> descriptor.typeParameters.isEmpty() }
.toList()
.map { descriptor -> descriptor.asMetaClass() }
.distinctBy { metaClass -> metaClass.type.typeName }
.toList()
.let(processor)
invoked = true
KotlinAnalyzerBuiltins.builtins = resolver.builtIns
return emptyList()
}

private fun KSClassDeclaration.included(request: KotlinAnalyzingRequest) = get(containingFile!!.filePath)
Expand All @@ -103,8 +93,33 @@ private class KotlinAnalyzingService : KotlinDescriptorParser() {
}

private fun collectClasses(processed: Set<KSFile>, packageName: String): List<KSClassDeclaration> = processed
.filter { declaration -> declaration.packageName.asString() == packageName }
.filter { declaration -> declaration.packageName.asString().substringBefore(DOT) == packageName }
.flatMap { declaration -> declaration.declarations }
.filterIsInstance<KSClassDeclaration>()
.toList()
}

private class KotlinAnalyzingProcessorProvider(
private val request: KotlinAnalyzingRequest,
private val processor: (files: List<KotlinMetaClass>) -> Unit
) : SymbolProcessorProvider {
override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor = KotlinAnalyzingProcessor(request, processor)
}

@OptIn(ExperimentalCompilerApi::class)
private class KotlinAnalyzingService {
fun analyzeKotlinSources(request: KotlinAnalyzingRequest): List<KotlinMetaClass> {
KOTLIN_LOGGER.info(ANALYZING_MESSAGE(request.configuration.root))
val roots = request.configuration.sources.toSet()
val processed = mutableListOf<KotlinMetaClass>()
KotlinCompilation().apply {
sources = roots.filter { path -> path.exists() }
.flatMap { path -> path.toFile().walkTopDown().toList() }
.filter { path -> path.isFile }
.map { path -> SourceFile.fromPath(path, false) }
symbolProcessorProviders = listOf(KotlinAnalyzingProcessorProvider(request, processed::addAll))
compile()
}
return processed
}
}

0 comments on commit 5f19584

Please sign in to comment.