diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/Doclet.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/Doclet.kt index a0617b13379..1b1efba610a 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/Doclet.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/Doclet.kt @@ -1,12 +1,12 @@ package org.jetbrains.kotlin.doc -import org.jetbrains.kotlin.doc.model.KModel import java.io.File +import org.jetbrains.kotlin.doc.model.KModel /** - * A simple plugin to KDoc to generate information from the model into a directory - * which can be implemented using any kind of layout or format. - */ +* A simple plugin to KDoc to generate information from the model into a directory +* which can be implemented using any kind of layout or format. +*/ trait Doclet { fun generate(model: KModel, outputDir: File): Unit } diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt index 938d449b3c9..6adcb68b637 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt @@ -1,35 +1,9 @@ package org.jetbrains.kotlin.doc -import kotlin.* -import kotlin.util.* - +import java.io.File +import org.jetbrains.kotlin.doc.model.* import org.jetbrains.kotlin.doc.templates.* import org.jetbrains.kotlin.template.TextTemplate -import org.jetbrains.kotlin.doc.model.* - -import java.io.File -import java.util.List -import java.util.HashSet -import java.util.* - -import org.jetbrains.jet.internal.com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.resolve.BindingContext.* -import org.jetbrains.jet.cli.common.CompilerPlugin -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor -import org.jetbrains.jet.lexer.JetTokens -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor -import org.jetbrains.jet.lang.resolve.java.JavaNamespaceDescriptor -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor -import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver -import org.jetbrains.jet.util.slicedmap.WritableSlice -import org.jetbrains.jet.lang.resolve.BindingContextUtils /** Creates JavaDoc style HTML output from the model */ class JavadocStyleHtmlDoclet() : Doclet { diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDoc.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDoc.kt index 59f0d4671c2..68add5ef74e 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDoc.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDoc.kt @@ -1,36 +1,8 @@ package org.jetbrains.kotlin.doc -import kotlin.* -import kotlin.util.* - -import org.jetbrains.kotlin.doc.templates.* -import org.jetbrains.kotlin.template.TextTemplate -import org.jetbrains.kotlin.doc.model.* - import java.io.File -import java.util.List -import java.util.HashSet -import java.util.Collection - -import org.jetbrains.jet.internal.com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.resolve.BindingContext.* -import org.jetbrains.jet.cli.common.CompilerPlugin -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor -import org.jetbrains.jet.lexer.JetTokens -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor -import org.jetbrains.jet.lang.resolve.java.JavaNamespaceDescriptor -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor -import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver -import org.jetbrains.jet.util.slicedmap.WritableSlice -import org.jetbrains.jet.lang.resolve.BindingContextUtils import org.jetbrains.kotlin.doc.highlighter2.Html2CompilerPlugin +import org.jetbrains.kotlin.doc.model.* /** Generates the Kotlin Documentation for the model */ class KDoc(protected arguments: KDocArguments) : KModelCompilerPlugin(arguments) { diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt index 0b73fa10ef9..2a778c81e34 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt @@ -1,14 +1,10 @@ package org.jetbrains.kotlin.doc -import java.io.File import java.io.PrintStream -import org.jetbrains.jet.cli.jvm.K2JVMCompilerArguments -import org.jetbrains.jet.cli.jvm.K2JVMCompiler import org.jetbrains.jet.cli.common.CLICompiler +import org.jetbrains.jet.cli.jvm.K2JVMCompiler +import org.jetbrains.jet.cli.jvm.K2JVMCompilerArguments import org.jetbrains.jet.cli.jvm.compiler.K2JVMCompileEnvironmentConfiguration -import org.jetbrains.kotlin.doc.highlighter.HtmlCompilerPlugin -import org.jetbrains.jet.cli.common.ExitCode -import org.jetbrains.kotlin.doc.highlighter2.Html2CompilerPlugin /** * Main for running the KDocCompiler diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt index 478dbce74f1..fa6935c3461 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt @@ -1,13 +1,11 @@ package org.jetbrains.kotlin.doc -import kotlin.* -import kotlin.util.* import java.util.* import org.jetbrains.kotlin.doc.model.KPackage /** - * The configuration used with KDoc - */ +* The configuration used with KDoc +*/ class KDocConfig() { /** diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/collections.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/collections.kt index 72f629888ab..0b8db7995f0 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/collections.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/collections.kt @@ -1,9 +1,8 @@ package org.jetbrains.kotlin.doc +import java.util.HashMap import java.util.List import java.util.Map -import java.util.HashMap - fun List.toHashMap(f: (A) -> #(K, V)): Map { val r = HashMap() diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt index 8a13b2eab09..ca78f358752 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt @@ -1,10 +1,10 @@ package org.jetbrains.kotlin.doc.highlighter -import org.jetbrains.jet.internal.com.intellij.psi.PsiFile -import org.jetbrains.jet.lang.psi.* -import org.jetbrains.jet.internal.com.intellij.psi.PsiElement -import org.jetbrains.jet.internal.com.intellij.psi.PsiWhiteSpace import org.jetbrains.jet.internal.com.intellij.psi.PsiComment +import org.jetbrains.jet.internal.com.intellij.psi.PsiElement +import org.jetbrains.jet.internal.com.intellij.psi.PsiFile +import org.jetbrains.jet.internal.com.intellij.psi.PsiWhiteSpace +import org.jetbrains.jet.lang.psi.* class HtmlKotlinVisitor: JetTreeVisitor() { diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt index fc64c8d0b6c..effe0a068f1 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt @@ -1,11 +1,11 @@ package org.jetbrains.kotlin.doc.highlighter -import org.jetbrains.jet.internal.com.intellij.psi.* -import org.jetbrains.jet.internal.com.intellij.psi.tree.IElementType -import org.jetbrains.jet.internal.com.intellij.psi.tree.TokenSet import java.util.HashMap import java.util.Map import kotlin.template.HtmlFormatter +import org.jetbrains.jet.internal.com.intellij.psi.* +import org.jetbrains.jet.internal.com.intellij.psi.tree.IElementType +import org.jetbrains.jet.internal.com.intellij.psi.tree.TokenSet import org.jetbrains.jet.lexer.* fun main(args: Array) { diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt index 51a83a9a830..37934d1b7f1 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt @@ -1,26 +1,17 @@ package org.jetbrains.kotlin.doc.highlighter2 -import org.jetbrains.jet.cli.common.CompilerPlugin -import org.jetbrains.jet.cli.common.CompilerPluginContext import java.io.File import java.util.List -import org.jetbrains.jet.internal.com.intellij.psi.PsiFile import org.jetbrains.jet.internal.com.intellij.openapi.vfs.local.CoreLocalVirtualFile -import org.jetbrains.jet.cli.jvm.K2JVMCompilerArguments -import org.jetbrains.kotlin.doc.KDocArguments -import org.jetbrains.kotlin.template.TextTemplate +import org.jetbrains.jet.internal.com.intellij.psi.PsiElement +import org.jetbrains.jet.internal.com.intellij.psi.PsiFile +import org.jetbrains.jet.internal.com.intellij.psi.impl.source.tree.LeafPsiElement +import org.jetbrains.jet.lexer.JetTokens +import org.jetbrains.kotlin.doc.* +import org.jetbrains.kotlin.doc.model.KModel +import org.jetbrains.kotlin.doc.model.SourceInfo import org.jetbrains.kotlin.template.HtmlTemplate import org.jetbrains.kotlin.template.escapeHtml -import org.jetbrains.jet.internal.com.intellij.psi.PsiElement -import org.jetbrains.jet.internal.com.intellij.psi.impl.source.tree.LeafPsiElement -import org.jetbrains.jet.JetNodeTypes -import org.jetbrains.jet.lexer.JetTokens -import org.jetbrains.kotlin.doc.Doclet -import org.jetbrains.kotlin.doc.model.KModel -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.kotlin.doc.model.SourceInfo -import org.jetbrains.kotlin.doc.* - class Html2CompilerPlugin(private val compilerArguments: KDocArguments) : Doclet { diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/ioUtils.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/ioUtils.kt index c3fe68478a2..9d371d72b1d 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/ioUtils.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/ioUtils.kt @@ -1,7 +1,6 @@ package org.jetbrains.kotlin.doc.highlighter2 import java.io.File -import java.io.FileInputStream import java.io.FileOutputStream fun File.write(callback: (FileOutputStream) -> Unit) = diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/psiUtils.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/psiUtils.kt index 3c762fb8a79..6540c8c98f4 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/psiUtils.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/psiUtils.kt @@ -1,7 +1,7 @@ package org.jetbrains.kotlin.doc.highlighter2 -import org.jetbrains.jet.internal.com.intellij.psi.PsiElement import java.util.List +import org.jetbrains.jet.internal.com.intellij.psi.PsiElement private fun PsiElement.getTextChildRelativeOffset() = getTextRange()!!.getStartOffset() - getParent()!!.getTextRange()!!.getStartOffset() diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KModelCompilerPlugin.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KModelCompilerPlugin.kt index d7e113f3cf2..c5dc24b1595 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KModelCompilerPlugin.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KModelCompilerPlugin.kt @@ -1,11 +1,10 @@ package org.jetbrains.kotlin.doc.model -import org.jetbrains.jet.cli.common.CompilerPlugin -import org.jetbrains.jet.cli.common.CompilerPluginContext -import org.jetbrains.kotlin.doc.KDocConfig -import org.jetbrains.kotlin.doc.KDocArguments import java.io.File import java.util.List +import org.jetbrains.jet.cli.common.CompilerPlugin +import org.jetbrains.jet.cli.common.CompilerPluginContext +import org.jetbrains.kotlin.doc.KDocArguments /** Base class for any compiler plugin which needs to process a KModel */ abstract class KModelCompilerPlugin( diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt index abfafbcd6d9..fb8a343a180 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt @@ -1,57 +1,47 @@ package org.jetbrains.kotlin.doc.model -import kotlin.* -import kotlin.util.* - -import org.jetbrains.kotlin.doc.KDocConfig -import org.jetbrains.kotlin.doc.* -import org.jetbrains.kotlin.doc.highlighter.SyntaxHighligher - +import java.io.File import java.util.* -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor -import org.jetbrains.jet.lang.resolve.java.JavaNamespaceDescriptor -import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.resolve.BindingContextUtils -import org.jetbrains.jet.lexer.JetTokens -import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor -import org.pegdown.PegDownProcessor -import org.pegdown.LinkRenderer -import org.pegdown.ast.WikiLinkNode -import org.pegdown.LinkRenderer.Rendering -import org.pegdown.ast.RefLinkNode -import org.pegdown.ast.AutoLinkNode -import org.pegdown.ast.ExpLinkNode -import org.pegdown.Extensions -import org.jetbrains.kotlin.doc.templates.KDocTemplate -import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl -import org.jetbrains.jet.lang.descriptors.Visibility -import org.jetbrains.jet.lang.descriptors.ClassKind +import org.jetbrains.jet.internal.com.intellij.openapi.vfs.local.CoreLocalVirtualFile +import org.jetbrains.jet.internal.com.intellij.psi.PsiDirectory import org.jetbrains.jet.internal.com.intellij.psi.PsiElement import org.jetbrains.jet.internal.com.intellij.psi.PsiFile -import org.jetbrains.jet.internal.com.intellij.psi.PsiDirectory +import org.jetbrains.jet.internal.com.intellij.psi.PsiFileSystemItem +import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.jet.lang.descriptors.ClassKind +import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.jet.lang.descriptors.ModuleDescriptor +import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor +import org.jetbrains.jet.lang.descriptors.PropertyDescriptor +import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor +import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor import org.jetbrains.jet.lang.descriptors.Visibilities import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils.LineAndColumn -import org.jetbrains.jet.internal.com.intellij.psi.PsiFileSystemItem -import java.io.File -import org.jetbrains.jet.internal.com.intellij.psi.PsiElement -import org.jetbrains.jet.internal.com.intellij.openapi.vfs.local.CoreLocalVirtualFile - +import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.jet.lang.resolve.BindingContextUtils +import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver +import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.jet.lexer.JetTokens +import org.jetbrains.kotlin.doc.* +import org.jetbrains.kotlin.doc.highlighter.SyntaxHighligher +import org.jetbrains.kotlin.doc.templates.KDocTemplate +import org.pegdown.Extensions +import org.pegdown.LinkRenderer +import org.pegdown.LinkRenderer.Rendering +import org.pegdown.PegDownProcessor +import org.pegdown.ast.AutoLinkNode +import org.pegdown.ast.ExpLinkNode +import org.pegdown.ast.RefLinkNode +import org.pegdown.ast.WikiLinkNode /** - * Returns the collection of functions with duplicate function names filtered out - * so only the first one is included - */ +* Returns the collection of functions with duplicate function names filtered out +* so only the first one is included +*/ fun filterDuplicateNames(functions: Collection): Collection { var lastName = "" return functions.filter{ diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/AllClassesFrameTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/AllClassesFrameTemplate.kt index b3cca8b6179..0a932709321 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/AllClassesFrameTemplate.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/AllClassesFrameTemplate.kt @@ -1,10 +1,5 @@ package org.jetbrains.kotlin.doc.templates -import kotlin.* -import org.jetbrains.kotlin.template.* -import kotlin.io.* -import kotlin.util.* -import java.util.* import org.jetbrains.kotlin.doc.model.KModel class AllClassesFrameTemplate(val model: KModel, val classAttributes: String = "") : KDocTemplate() { diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassExtensionsTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassExtensionsTemplate.kt index f43aabefdab..cb2f837b8c1 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassExtensionsTemplate.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassExtensionsTemplate.kt @@ -1,15 +1,10 @@ package org.jetbrains.kotlin.doc.templates -import kotlin.* -import org.jetbrains.kotlin.template.* -import kotlin.io.* -import kotlin.util.* import java.util.* -import org.jetbrains.kotlin.doc.model.KModel -import org.jetbrains.kotlin.doc.model.KPackage import org.jetbrains.kotlin.doc.model.KClass import org.jetbrains.kotlin.doc.model.KFunction -import org.jetbrains.kotlin.doc.model.KAnnotation +import org.jetbrains.kotlin.doc.model.KModel +import org.jetbrains.kotlin.doc.model.KPackage import org.jetbrains.kotlin.doc.model.KProperty class ClassExtensionsTemplate(m: KModel, p: KPackage, k: KClass, diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt index f8dae120bb0..dfed29d8a71 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt @@ -1,15 +1,8 @@ package org.jetbrains.kotlin.doc.templates -import kotlin.* -import org.jetbrains.kotlin.template.* -import kotlin.io.* -import kotlin.util.* -import java.util.* +import org.jetbrains.kotlin.doc.model.KClass import org.jetbrains.kotlin.doc.model.KModel import org.jetbrains.kotlin.doc.model.KPackage -import org.jetbrains.kotlin.doc.model.KClass -import org.jetbrains.kotlin.doc.model.KFunction -import org.jetbrains.kotlin.doc.model.KAnnotation open class ClassTemplate(open val model: KModel, pkg: KPackage, open val klass: KClass) : PackageTemplateSupport(pkg) { diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/HelpDocTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/HelpDocTemplate.kt index 0e1d8892e9a..ffdb40fa3c9 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/HelpDocTemplate.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/HelpDocTemplate.kt @@ -1,10 +1,5 @@ package org.jetbrains.kotlin.doc.templates -import kotlin.* -import org.jetbrains.kotlin.template.* -import kotlin.io.* -import kotlin.util.* -import java.util.* import org.jetbrains.kotlin.doc.model.KModel class HelpDocTemplate(val model: KModel) : KDocTemplate() { diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/IndexTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/IndexTemplate.kt index 22ffd9911f0..982d577c897 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/IndexTemplate.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/IndexTemplate.kt @@ -1,10 +1,5 @@ package org.jetbrains.kotlin.doc.templates -import kotlin.* -import org.jetbrains.kotlin.template.* -import kotlin.io.* -import kotlin.util.* -import java.util.* import org.jetbrains.kotlin.doc.model.KModel class IndexTemplate(val model: KModel) : KDocTemplate() { diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt index c110e4a56cd..988db604925 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt @@ -1,17 +1,14 @@ package org.jetbrains.kotlin.doc.templates -import kotlin.* -import kotlin.util.* -import org.jetbrains.kotlin.doc.model.KClass -import org.jetbrains.kotlin.doc.model.KAnnotation -import org.jetbrains.kotlin.doc.model.KPackage -import org.jetbrains.kotlin.template.TextTemplate -import org.jetbrains.kotlin.doc.model.KFunction +import java.util.List import org.jetbrains.kotlin.doc.* -import java.util.Collection +import org.jetbrains.kotlin.doc.model.KAnnotation +import org.jetbrains.kotlin.doc.model.KClass +import org.jetbrains.kotlin.doc.model.KFunction +import org.jetbrains.kotlin.doc.model.KPackage import org.jetbrains.kotlin.doc.model.KProperty import org.jetbrains.kotlin.doc.model.KType -import java.util.List +import org.jetbrains.kotlin.template.TextTemplate abstract class KDocTemplate() : TextTemplate() { // TODO: use same timestamp for all pages diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewFrameTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewFrameTemplate.kt index 34eb421734c..c86fc969f51 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewFrameTemplate.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewFrameTemplate.kt @@ -1,10 +1,5 @@ package org.jetbrains.kotlin.doc.templates -import kotlin.* -import org.jetbrains.kotlin.template.* -import kotlin.io.* -import kotlin.util.* -import java.util.* import org.jetbrains.kotlin.doc.model.KModel class OverviewFrameTemplate(val model: KModel) : KDocTemplate() { diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt index 400f01742d1..1b103df6cda 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt @@ -1,10 +1,5 @@ package org.jetbrains.kotlin.doc.templates -import kotlin.* -import org.jetbrains.kotlin.template.* -import kotlin.io.* -import kotlin.util.* -import java.util.* import org.jetbrains.kotlin.doc.model.KModel class OverviewSummaryTemplate(val model: KModel) : KDocTemplate() { diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewTreeTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewTreeTemplate.kt index 392a175f21f..f14a8efc117 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewTreeTemplate.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewTreeTemplate.kt @@ -1,10 +1,5 @@ package org.jetbrains.kotlin.doc.templates -import kotlin.* -import org.jetbrains.kotlin.template.* -import kotlin.io.* -import kotlin.util.* -import java.util.* import org.jetbrains.kotlin.doc.model.KModel class OverviewTreeTemplate(val model: KModel) : KDocTemplate() { diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt index 05cd8a3b582..ad9e22a9cd2 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt @@ -1,14 +1,7 @@ package org.jetbrains.kotlin.doc.templates -import kotlin.* -import org.jetbrains.kotlin.template.* -import kotlin.io.* -import kotlin.util.* -import java.util.* import org.jetbrains.kotlin.doc.model.KModel import org.jetbrains.kotlin.doc.model.KPackage -import org.jetbrains.kotlin.doc.model.KClass -import org.jetbrains.kotlin.doc.model.KFunction import org.jetbrains.kotlin.doc.model.extensionFunctions import org.jetbrains.kotlin.doc.model.filterDuplicateNames diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageListTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageListTemplate.kt index 29f7c427ab0..79455db4527 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageListTemplate.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageListTemplate.kt @@ -1,10 +1,5 @@ package org.jetbrains.kotlin.doc.templates -import kotlin.* -import org.jetbrains.kotlin.template.* -import kotlin.io.* -import kotlin.util.* -import java.util.* import org.jetbrains.kotlin.doc.model.KModel class PackageListTemplate(val model: KModel) : KDocTemplate() { diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageSummaryTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageSummaryTemplate.kt index 21eb9441067..40f291d0bf0 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageSummaryTemplate.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageSummaryTemplate.kt @@ -1,16 +1,9 @@ package org.jetbrains.kotlin.doc.templates -import kotlin.* -import org.jetbrains.kotlin.template.* -import kotlin.io.* -import kotlin.util.* -import java.util.* import org.jetbrains.kotlin.doc.model.KModel import org.jetbrains.kotlin.doc.model.KPackage -import org.jetbrains.kotlin.doc.model.KClass -import org.jetbrains.kotlin.doc.model.extensionFunctions -import org.jetbrains.kotlin.doc.model.inheritedExtensionFunctions import org.jetbrains.kotlin.doc.model.filterDuplicateNames +import org.jetbrains.kotlin.doc.model.inheritedExtensionFunctions class PackageSummaryTemplate(val model: KModel, pkg: KPackage) : PackageTemplateSupport(pkg) { override fun render() { diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt index 161b927ea89..3a70e92978a 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt @@ -1,18 +1,10 @@ package org.jetbrains.kotlin.doc.templates -import kotlin.* -import kotlin.io.* -import kotlin.util.* import java.util.* -import org.jetbrains.kotlin.template.* -import org.jetbrains.kotlin.doc.model.KModel -import org.jetbrains.kotlin.doc.model.KPackage -import org.jetbrains.kotlin.doc.model.KClass -import org.jetbrains.kotlin.doc.model.KFunction import org.jetbrains.kotlin.doc.model.KAnnotation +import org.jetbrains.kotlin.doc.model.KFunction +import org.jetbrains.kotlin.doc.model.KPackage import org.jetbrains.kotlin.doc.model.KProperty -import org.jetbrains.kotlin.doc.model.KTypeParameter - abstract class PackageTemplateSupport(open val pkg: KPackage) : KDocTemplate() { diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/SearchXmlTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/SearchXmlTemplate.kt index a7aee7943c2..8a38f98260e 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/SearchXmlTemplate.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/SearchXmlTemplate.kt @@ -1,9 +1,5 @@ package org.jetbrains.kotlin.doc.templates -import kotlin.* -import org.jetbrains.kotlin.template.* -import kotlin.io.* -import kotlin.util.* import java.util.* import org.jetbrains.kotlin.doc.model.* diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/HtmlTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/HtmlTemplate.kt index 2b377fbce61..4ec4b8c694c 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/HtmlTemplate.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/HtmlTemplate.kt @@ -2,7 +2,6 @@ package org.jetbrains.kotlin.template import java.util.List - abstract class HtmlTemplate() : TextTemplate() { fun tag( diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/TemplateCore.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/TemplateCore.kt index f0ede26ffd8..ee174667c7c 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/TemplateCore.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/TemplateCore.kt @@ -1,22 +1,19 @@ package org.jetbrains.kotlin.template -import kotlin.io.* -import java.io.Writer -import java.io.StringWriter +import java.io.File +import java.io.FileWriter import java.io.OutputStream import java.io.OutputStreamWriter -import java.io.FileWriter -import java.io.File -import java.util.List -import kotlin.dom.attribute +import java.io.StringWriter +import java.io.Writer /** - * Represents a generic API to templates which should be usable - * in JavaScript in a browser or on the server side stand alone or in a web app etc. - * - * To make things easier to implement in JS this namespace won't refer to any java.io or servlet - * stuff - */ +* Represents a generic API to templates which should be usable +* in JavaScript in a browser or on the server side stand alone or in a web app etc. +* +* To make things easier to implement in JS this namespace won't refer to any java.io or servlet +* stuff +*/ trait Template { /** Renders the template to the output printer */ diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt index 3f0d92b1cf5..448fb98752d 100644 --- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt +++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt @@ -2,8 +2,8 @@ package test.kotlin.kdoc import java.io.File import kotlin.test.assertTrue -import org.jetbrains.jet.cli.jvm.K2JVMCompilerArguments import org.jetbrains.jet.cli.jvm.K2JVMCompiler +import org.jetbrains.jet.cli.jvm.K2JVMCompilerArguments import org.jetbrains.kotlin.doc.highlighter.HtmlCompilerPlugin import org.junit.Test diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocSampleTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocSampleTest.kt index 26ea3a9ba1d..1b8b9b48521 100644 --- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocSampleTest.kt +++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocSampleTest.kt @@ -1,13 +1,12 @@ package test.kotlin.kdoc -import org.junit.Test -import org.jetbrains.kotlin.doc.KDoc -import org.jetbrains.kotlin.doc.KDocCompiler -import org.jetbrains.kotlin.doc.KDocArguments -import org.jetbrains.jet.cli.common.ExitCode -import org.junit.Assert import java.io.File import java.io.IOException +import org.jetbrains.jet.cli.common.ExitCode +import org.jetbrains.kotlin.doc.KDocArguments +import org.jetbrains.kotlin.doc.KDocCompiler +import org.junit.Assert +import org.junit.Test fun File.rmrf() { val children = listFiles() diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt index 06a31fd51cd..7b5cb4b2438 100644 --- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt +++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt @@ -1,18 +1,16 @@ package test.kotlin.kdoc +import java.io.File +import java.util.ArrayList +import kotlin.test.assertTrue +import org.jetbrains.jet.cli.common.ExitCode import org.jetbrains.kotlin.doc.KDocArguments import org.jetbrains.kotlin.doc.KDocCompiler - -import kotlin.test.assertTrue - -import org.junit.Test -import java.io.File import org.junit.Assert -import org.jetbrains.jet.cli.common.ExitCode -import java.util.ArrayList +import org.junit.Test /** - */ +*/ class KDocTest { Test fun generateKDocForStandardLibrary() { var moduleName = "ApiDocsModule.kt" diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/template/PegdownTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/template/PegdownTest.kt index 69249a99c50..532be0094d6 100644 --- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/template/PegdownTest.kt +++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/template/PegdownTest.kt @@ -1,13 +1,9 @@ package test.pegdown -import kotlin.* -import kotlin.util.* -import kotlin.test.* - import junit.framework.TestCase import org.pegdown.* -import org.pegdown.ast.* import org.pegdown.LinkRenderer.Rendering +import org.pegdown.ast.* class PegdownTest() : TestCase() { var markdownProcessor = PegDownProcessor(Extensions.ALL) diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/template/TemplateCoreTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/template/TemplateCoreTest.kt index 14f6fc67f40..c345aed779b 100644 --- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/template/TemplateCoreTest.kt +++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/template/TemplateCoreTest.kt @@ -1,13 +1,9 @@ package test.kotlin.template -import kotlin.* -import org.jetbrains.kotlin.template.* -import kotlin.io.* -import kotlin.util.* import java.util.* - -import junit.framework.TestCase import junit.framework.Assert.* +import junit.framework.TestCase +import org.jetbrains.kotlin.template.* class EmailTemplate(var name: String = "James", var time: Date = Date()) : TextTemplate() { public override fun render() {