Add language version arguments

9 files changed, 80 insertions, 30 deletions

diff --git a/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt b/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt
index 3eb235e5..003c6835 100644
--- a/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt
+++ b/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt
@@ -69,7 +69,6 @@ class AnalysisEnvironment(val messageCollector: MessageCollector) : Disposable {
 
         val projectFileIndex = CoreProjectFileIndex(environment.project,
                 environment.configuration.getList(JVMConfigurationKeys.CONTENT_ROOTS))
-        environment.configuration.put(CommonConfigurationKeys.LANGUAGE_VERSION_SETTINGS, LanguageVersionSettingsImpl.DEFAULT)
 
         val moduleManager = object : CoreModuleManager(environment.project, this) {
             override fun getModules(): Array<out Module> = arrayOf(projectFileIndex.module)
@@ -142,7 +141,7 @@ class AnalysisEnvironment(val messageCollector: MessageCollector) : Disposable {
                 },
                 CompilerEnvironment,
                 packagePartProviderFactory = { info, content ->
-                    JvmPackagePartProvider(LanguageVersionSettingsImpl.DEFAULT, content.moduleContentScope).apply {
+                    JvmPackagePartProvider(configuration.languageVersionSettings, content.moduleContentScope).apply {
                         addRoots(javaRoots)
                     }
                 },
@@ -157,6 +156,12 @@ class AnalysisEnvironment(val messageCollector: MessageCollector) : Disposable {
         return DokkaResolutionFacade(environment.project, moduleDescriptor, resolverForModule)
     }
 
+    fun loadLanguageVersionSettings(languageVersionString: String?, apiVersionString: String?) {
+        val languageVersion = LanguageVersion.fromVersionString(languageVersionString) ?: LanguageVersion.LATEST_STABLE
+        val apiVersion = apiVersionString?.let { ApiVersion.parse(it) } ?: ApiVersion.createByLanguageVersion(languageVersion)
+        configuration.languageVersionSettings = LanguageVersionSettingsImpl(languageVersion, apiVersion)
+    }
+
     /**
      * Classpath for this environment.
      */
diff --git a/core/src/main/kotlin/DokkaBootstrapImpl.kt b/core/src/main/kotlin/DokkaBootstrapImpl.kt
index 0aea4422..126a0175 100644
--- a/core/src/main/kotlin/DokkaBootstrapImpl.kt
+++ b/core/src/main/kotlin/DokkaBootstrapImpl.kt
@@ -66,6 +66,8 @@ class DokkaBootstrapImpl : DokkaBootstrap {
                         perPackageOptions,
                         externalDocumentationLinks,
                         noStdlibLink,
+                        languageVersion,
+                        apiVersion,
                         cacheRoot,
                         suppressedFiles.map { File(it) }
                 )
diff --git a/core/src/main/kotlin/Generation/DokkaGenerator.kt b/core/src/main/kotlin/Generation/DokkaGenerator.kt
index 17b6b156..09e5cedf 100644
--- a/core/src/main/kotlin/Generation/DokkaGenerator.kt
+++ b/core/src/main/kotlin/Generation/DokkaGenerator.kt
@@ -94,6 +94,8 @@ class DokkaGenerator(val logger: DokkaLogger,
 
             addSources(sourcePaths)
             addSources(this@DokkaGenerator.samples)
+
+            loadLanguageVersionSettings(options.languageVersion, options.apiVersion)
         }
 
         return environment
diff --git a/core/src/main/kotlin/Generation/configurationImpl.kt b/core/src/main/kotlin/Generation/configurationImpl.kt
index befe7e72..34d4154e 100644
--- a/core/src/main/kotlin/Generation/configurationImpl.kt
+++ b/core/src/main/kotlin/Generation/configurationImpl.kt
@@ -35,24 +35,28 @@ data class PackageOptionsImpl(override val prefix: String,
                               override val skipDeprecated: Boolean = false,
                               override val suppress: Boolean = false) : DokkaConfiguration.PackageOptions
 
-data class DokkaConfigurationImpl(override val moduleName: String,
-                                  override val classpath: List<String>,
-                                  override val sourceRoots: List<SourceRootImpl>,
-                                  override val samples: List<String>,
-                                  override val includes: List<String>,
-                                  override val outputDir: String,
-                                  override val format: String,
-                                  override val includeNonPublic: Boolean,
-                                  override val includeRootPackage: Boolean,
-                                  override val reportUndocumented: Boolean,
-                                  override val skipEmptyPackages: Boolean,
-                                  override val skipDeprecated: Boolean,
-                                  override val jdkVersion: Int,
-                                  override val generateIndexPages: Boolean,
-                                  override val sourceLinks: List<SourceLinkDefinitionImpl>,
-                                  override val impliedPlatforms: List<String>,
-                                  override val perPackageOptions: List<PackageOptionsImpl>,
-                                  override val externalDocumentationLinks: List<ExternalDocumentationLinkImpl>,
-                                  override val noStdlibLink: Boolean,
-                                  override val cacheRoot: String?,
-                                  override val suppressedFiles: List<String>) : DokkaConfiguration
\ No newline at end of file
+data class DokkaConfigurationImpl(
+        override val moduleName: String,
+        override val classpath: List<String>,
+        override val sourceRoots: List<SourceRootImpl>,
+        override val samples: List<String>,
+        override val includes: List<String>,
+        override val outputDir: String,
+        override val format: String,
+        override val includeNonPublic: Boolean,
+        override val includeRootPackage: Boolean,
+        override val reportUndocumented: Boolean,
+        override val skipEmptyPackages: Boolean,
+        override val skipDeprecated: Boolean,
+        override val jdkVersion: Int,
+        override val generateIndexPages: Boolean,
+        override val sourceLinks: List<SourceLinkDefinitionImpl>,
+        override val impliedPlatforms: List<String>,
+        override val perPackageOptions: List<PackageOptionsImpl>,
+        override val externalDocumentationLinks: List<ExternalDocumentationLinkImpl>,
+        override val noStdlibLink: Boolean,
+        override val cacheRoot: String?,
+        override val suppressedFiles: List<String>,
+        override val languageVersion: String?,
+        override val apiVersion: String?
+) : DokkaConfiguration
\ No newline at end of file
diff --git a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
index 2998e314..61bf50d6 100644
--- a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
+++ b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
@@ -48,6 +48,8 @@ class DocumentationOptions(val outputDir: String,
                            perPackageOptions: List<PackageOptions> = emptyList(),
                            externalDocumentationLinks: List<ExternalDocumentationLink> = emptyList(),
                            noStdlibLink: Boolean,
+                           val languageVersion: String?,
+                           val apiVersion: String?,
                            cacheRoot: String? = null,
                            val suppressedFiles: List<File> = emptyList()) {
     init {
diff --git a/core/src/test/kotlin/TestAPI.kt b/core/src/test/kotlin/TestAPI.kt
index 8bbeb2f2..ff8a5260 100644
--- a/core/src/test/kotlin/TestAPI.kt
+++ b/core/src/test/kotlin/TestAPI.kt
@@ -28,15 +28,20 @@ fun verifyModel(vararg roots: ContentRoot,
                 verifier: (DocumentationModule) -> Unit) {
     val documentation = DocumentationModule("test")
 
-    val options = DocumentationOptions("", format,
+    val options = DocumentationOptions(
+            "",
+            format,
             includeNonPublic = includeNonPublic,
             skipEmptyPackages = false,
             includeRootPackage = true,
-            sourceLinks = listOf<SourceLinkDefinition>(),
+            sourceLinks = listOf(),
             perPackageOptions = perPackageOptions,
             generateIndexPages = false,
             noStdlibLink = true,
-            cacheRoot = "default")
+            cacheRoot = "default",
+            languageVersion = null,
+            apiVersion = null
+    )
 
     appendDocumentation(documentation, *roots,
             withJdk = withJdk,
@@ -88,6 +93,8 @@ fun appendDocumentation(documentation: DocumentationModule,
             addClasspath(File(kotlinStrictfpRoot))
         }
         addRoots(roots.toList())
+
+        loadLanguageVersionSettings(options.languageVersion, options.apiVersion)
     }
     val defaultPlatformsProvider = object : DefaultPlatformsProvider {
         override fun getDefaultPlatforms(descriptor: DeclarationDescriptor) = defaultPlatforms
diff --git a/core/src/test/kotlin/format/KotlinWebSiteFormatTest.kt b/core/src/test/kotlin/format/KotlinWebSiteFormatTest.kt
index f4ca2982..af44b048 100644
--- a/core/src/test/kotlin/format/KotlinWebSiteFormatTest.kt
+++ b/core/src/test/kotlin/format/KotlinWebSiteFormatTest.kt
@@ -42,7 +42,14 @@ class KotlinWebSiteFormatTest {
 
     private fun buildMultiplePlatforms(path: String): DocumentationModule {
         val module = DocumentationModule("test")
-        val options = DocumentationOptions("", "html", generateIndexPages = false, noStdlibLink = true)
+        val options = DocumentationOptions(
+                outputDir = "",
+                outputFormat = "html",
+                generateIndexPages = false,
+                noStdlibLink = true,
+                languageVersion = null,
+                apiVersion = null
+        )
         appendDocumentation(module, contentRootFromPath("testdata/format/website/$path/jvm.kt"), defaultPlatforms = listOf("JVM"), options = options)
         appendDocumentation(module, contentRootFromPath("testdata/format/website/$path/jre7.kt"), defaultPlatforms = listOf("JVM", "JRE7"), options = options)
         appendDocumentation(module, contentRootFromPath("testdata/format/website/$path/js.kt"), defaultPlatforms = listOf("JS"), options = options)
diff --git a/core/src/test/kotlin/format/KotlinWebSiteHtmlFormatTest.kt b/core/src/test/kotlin/format/KotlinWebSiteHtmlFormatTest.kt
index b4b133f4..433c9c13 100644
--- a/core/src/test/kotlin/format/KotlinWebSiteHtmlFormatTest.kt
+++ b/core/src/test/kotlin/format/KotlinWebSiteHtmlFormatTest.kt
@@ -57,7 +57,14 @@ class KotlinWebSiteHtmlFormatTest {
 
     private fun buildMultiplePlatforms(path: String): DocumentationModule {
         val module = DocumentationModule("test")
-        val options = DocumentationOptions("", "html", generateIndexPages = false, noStdlibLink = true)
+        val options = DocumentationOptions(
+                outputDir = "",
+                outputFormat = "kotlin-website-html",
+                generateIndexPages = false,
+                noStdlibLink = true,
+                languageVersion = null,
+                apiVersion = null
+        )
         appendDocumentation(module, contentRootFromPath("testdata/format/website-html/$path/jvm.kt"), defaultPlatforms = listOf("JVM"), options = options)
         appendDocumentation(module, contentRootFromPath("testdata/format/website-html/$path/jre7.kt"), defaultPlatforms = listOf("JVM", "JRE7"), options = options)
         appendDocumentation(module, contentRootFromPath("testdata/format/website-html/$path/js.kt"), defaultPlatforms = listOf("JS"), options = options)
diff --git a/core/src/test/kotlin/format/MarkdownFormatTest.kt b/core/src/test/kotlin/format/MarkdownFormatTest.kt
index d2ab5b5c..2c5422c5 100644
--- a/core/src/test/kotlin/format/MarkdownFormatTest.kt
+++ b/core/src/test/kotlin/format/MarkdownFormatTest.kt
@@ -300,7 +300,14 @@ class MarkdownFormatTest {
     @Test fun packagePlatformsWithExtExtensions() {
         val path = "multiplatform/packagePlatformsWithExtExtensions"
         val module = DocumentationModule("test")
-        val options = DocumentationOptions("", "html", generateIndexPages = false, noStdlibLink = true)
+        val options = DocumentationOptions(
+                outputDir = "",
+                outputFormat = "html",
+                generateIndexPages = false,
+                noStdlibLink = true,
+                languageVersion = null,
+                apiVersion = null
+        )
         appendDocumentation(module, contentRootFromPath("testdata/format/$path/jvm.kt"), defaultPlatforms = listOf("JVM"), withKotlinRuntime = true, options = options)
         verifyMultiplatformIndex(module, path)
         verifyMultiplatformPackage(module, path)
@@ -402,7 +409,14 @@ class MarkdownFormatTest {
 
     private fun buildMultiplePlatforms(path: String): DocumentationModule {
         val module = DocumentationModule("test")
-        val options = DocumentationOptions("", "html", generateIndexPages = false, noStdlibLink = true)
+        val options = DocumentationOptions(
+                outputDir = "",
+                outputFormat = "html",
+                generateIndexPages = false,
+                noStdlibLink = true,
+                languageVersion = null,
+                apiVersion = null
+        )
         appendDocumentation(module, contentRootFromPath("testdata/format/$path/jvm.kt"), defaultPlatforms = listOf("JVM"), options = options)
         appendDocumentation(module, contentRootFromPath("testdata/format/$path/js.kt"), defaultPlatforms = listOf("JS"), options = options)
         return module