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

Merge branch 'master' of github.com:JetBrains/kotlin

Browse Source
This commit is contained in:
James Strachan
2012-04-20 17:23:53 +01:00
parent 34ad235246 a31edfc3bd
commit 47c38f5105
255 changed files with 1110 additions and 5809 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt
+5 -5
View File
@@ -4,7 +4,7 @@ import java.io.File
import java.io.PrintStream
import org.jetbrains.jet.cli.CompilerArguments
import org.jetbrains.jet.cli.KotlinCompiler
import org.jetbrains.jet.compiler.CompileEnvironment
import org.jetbrains.jet.compiler.CompileEnvironmentConfiguration
import org.jetbrains.kotlin.doc.highlighter.HtmlCompilerPlugin
/**
@@ -20,16 +20,16 @@ fun main(args: Array<String?>): Unit {
*/
class KDocCompiler() : KotlinCompiler() {
protected override fun configureEnvironment(environment : CompileEnvironment?, arguments : CompilerArguments?) {
super.configureEnvironment(environment, arguments)
val coreEnvironment = environment?.getEnvironment()
protected override fun configureEnvironment(configuration : CompileEnvironmentConfiguration?, arguments : CompilerArguments?) {
super.configureEnvironment(configuration, arguments)
val coreEnvironment = configuration?.getEnvironment()
if (coreEnvironment != null) {
val kdoc = KDoc()
if (arguments is KDocArguments) {
kdoc.config = arguments.apply()
}
val plugins = coreEnvironment.getCompilerPlugins().orEmpty()
val plugins = configuration?.getCompilerPlugins().orEmpty()
/*
val sourcePlugin = HtmlCompilerPlugin()
plugins.add(sourcePlugin)