From c12fd3f0e67f6b897f7b828a57d4c2fd9d5bcc97 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Sat, 8 Sep 2012 00:35:05 +0400 Subject: [PATCH] Changed Tuple usage to Pair usage in kdoc --- .../src/main/kotlin/kotlin/swing/Frames.kt | 2 +- .../kotlin/doc/highlighter2/Html2CompilerPlugin.kt | 4 ++-- .../org/jetbrains/kotlin/doc/highlighter2/psiUtils.kt | 4 ++-- .../org/jetbrains/kotlin/doc/model/KotlinModel.kt | 2 +- .../org/jetbrains/kotlin/template/HtmlTemplate.kt | 10 +++++----- .../kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/Frames.kt b/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/Frames.kt index 783239d7cfa..59a855c7354 100644 --- a/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/Frames.kt +++ b/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/Frames.kt @@ -33,7 +33,7 @@ var JFrame.title: String var JFrame.size: Pair get() = Pair(getSize().sure().getWidth().toInt(), getSize().sure().getHeight().toInt()) set(dim) { - setSize(Dimension(dim._1, dim._2)) + setSize(Dimension(dim.first, dim.second)) } var JFrame.height: Int 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 d8a84451a54..b327b9930fe 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 @@ -115,8 +115,8 @@ class Html2CompilerPlugin(private val compilerArguments: KDocArguments) : Doclet } for (t in splitPsi(psiFile)) { - val text = t._1 - val psi = t._2 + val text = t.first + val psi = t.second span(className = classForPsi(psi)) { print(text.escapeHtml()) } 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 1c07c1a4c3f..174b65bf915 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 @@ -31,8 +31,8 @@ private fun splitPsiImpl(psi: PsiElement, listBuilder: ImmutableArrayListBuilder } } -fun splitPsi(psi: PsiElement): List { - val listBuilder = listBuilder() +fun splitPsi(psi: PsiElement): List> { + val listBuilder = listBuilder>() splitPsiImpl(psi, listBuilder) return listBuilder.build() } 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 07a32e5fdba..3c461368b9c 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 @@ -774,7 +774,7 @@ class TemplateLinkRenderer(val annotated: KAnnotated, val template: KDocTemplate // TODO even hacker than the above hack! val link = hackedLinks.get(text) if (link != null) { - href = annotated.model.config.resolveLink(link._1) + link._2 + href = annotated.model.config.resolveLink(link.first) + link.second } } if (href != null) { 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 1de41516d7a..0b59cec7407 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 @@ -10,9 +10,9 @@ abstract class HtmlTemplate() : TextTemplate() { content: () -> Unit) { val allAttributesBuilder = listBuilder>() if (style != null) - allAttributesBuilder.add(Pair("style", style)) + allAttributesBuilder.add(Pair("style", style)) if (className != null) - allAttributesBuilder.add(Pair("class", className)) + allAttributesBuilder.add(Pair("class", className)) // TODO: add addAll to ListBuilder for (attribute in attributes) @@ -26,7 +26,7 @@ abstract class HtmlTemplate() : TextTemplate() { } else { // TODO: escape values - "<$tagName ${allAttributes.map { t -> "${t._1}='${t._2.escapeHtml()}'" }.makeString(" ")}>" + "<$tagName ${allAttributes.map { t -> "${t.first}='${t.second.escapeHtml()}'" }.makeString(" ")}>" } ) content() @@ -79,9 +79,9 @@ abstract class HtmlTemplate() : TextTemplate() { fun a(href: String? = null, name: String? = null, content: () -> Unit) { val attributes = listBuilder>() if (href != null) - attributes.add(Pair("href", href)) + attributes.add(Pair("href", href)) if (name != null) - attributes.add(Pair("name", name)) + attributes.add(Pair("name", name)) tag(tagName = "a", attributes = attributes.build(), content = content) } } diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt index b367f9e0301..bb1a65585eb 100644 --- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt +++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt @@ -51,7 +51,7 @@ class PsiUtilsTest { [Test] fun splitPsi() { val file = createFile("class Foo") - val items: List = splitPsi(file).map { t -> t._1 } + val items: List = splitPsi(file).map { t -> t.first } Assert.assertEquals(arrayList("class", " ", "Foo"), items) }