Skip to content

Commit

Permalink
FIx review
Browse files Browse the repository at this point in the history
  • Loading branch information
vmishenev committed Jan 18, 2023
1 parent 833a9dc commit f48c67c
Showing 1 changed file with 15 additions and 12 deletions.
Expand Up @@ -9,7 +9,7 @@ import org.jetbrains.dokka.plugability.DokkaContext
import org.jetbrains.dokka.utilities.DokkaLogger
import java.io.Closeable

fun KotlinAnalysis(
fun ProjectKotlinAnalysis(
sourceSets: List<DokkaSourceSet>,
logger: DokkaLogger,
analysisConfiguration: DokkaAnalysisConfiguration = DokkaAnalysisConfiguration()
Expand All @@ -22,7 +22,7 @@ fun KotlinAnalysis(
analysisConfiguration = analysisConfiguration
)
}
return ProjectKotlinAnalysis(environments)
return EnvironmentKotlinAnalysis(environments)
}

/**
Expand All @@ -46,7 +46,7 @@ fun SamplesKotlinAnalysis(
)
}

return SamplesKotlinAnalysis(environments, projectKotlinAnalysis)
return EnvironmentKotlinAnalysis(environments, projectKotlinAnalysis)
}

class DokkaAnalysisConfiguration(
Expand All @@ -60,7 +60,18 @@ class DokkaAnalysisConfiguration(
@Deprecated(message = "Construct using list of DokkaSourceSets and logger",
replaceWith = ReplaceWith("KotlinAnalysis(context.configuration.sourceSets, context.logger)")
)
fun KotlinAnalysis(context: DokkaContext): KotlinAnalysis = KotlinAnalysis(context.configuration.sourceSets, context.logger)
fun KotlinAnalysis(context: DokkaContext): KotlinAnalysis =
ProjectKotlinAnalysis(context.configuration.sourceSets, context.logger)

@Deprecated(message = "It was renamed to `ProjectKotlinAnalysis`",
replaceWith = ReplaceWith("ProjectKotlinAnalysis(sourceSets, logger, analysisConfiguration)")
)
fun KotlinAnalysis(
sourceSets: List<DokkaSourceSet>,
logger: DokkaLogger,
analysisConfiguration: DokkaAnalysisConfiguration = DokkaAnalysisConfiguration()
) = ProjectKotlinAnalysis(sourceSets, logger, analysisConfiguration)


/**
* First child delegation. It does not close [parent].
Expand Down Expand Up @@ -103,12 +114,4 @@ internal open class EnvironmentKotlinAnalysis(
}
}

internal class ProjectKotlinAnalysis(
environments: SourceSetDependent<AnalysisContext>
) : EnvironmentKotlinAnalysis(environments)

internal class SamplesKotlinAnalysis(
sampleEnvironments: SourceSetDependent<AnalysisContext>,
projectKotlinAnalysis: KotlinAnalysis
) : EnvironmentKotlinAnalysis(sampleEnvironments, projectKotlinAnalysis)

0 comments on commit f48c67c

Please sign in to comment.