Unsorted replacements "jet" -> "kotlin"
#KT-2896 Fixed
This commit is contained in:
@@ -50,7 +50,6 @@
|
||||
<ignorePackage>com</ignorePackage>
|
||||
<ignorePackage>sun</ignorePackage>
|
||||
<ignorePackage>java</ignorePackage>
|
||||
<ignorePackage>jet</ignorePackage>
|
||||
<ignorePackage>js</ignorePackage>
|
||||
<ignorePackage>junit</ignorePackage>
|
||||
<ignorePackage>org</ignorePackage>
|
||||
|
||||
@@ -57,7 +57,6 @@
|
||||
<ignorePackage>com</ignorePackage>
|
||||
<ignorePackage>sun</ignorePackage>
|
||||
<ignorePackage>java</ignorePackage>
|
||||
<ignorePackage>jet</ignorePackage>
|
||||
<ignorePackage>junit</ignorePackage>
|
||||
<ignorePackage>org</ignorePackage>
|
||||
</ignorePackages>
|
||||
|
||||
+1
-1
@@ -3,8 +3,8 @@ package test.kotlin.jtests;
|
||||
import static kotlin.KotlinPackage.*;
|
||||
import static kotlin.util.UtilPackage.*;
|
||||
|
||||
import jet.Function1;
|
||||
import junit.framework.TestCase;
|
||||
import kotlin.Function1;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
@@ -3,7 +3,7 @@ package kotlin.jdbc
|
||||
import java.sql.*
|
||||
|
||||
// Workaround for an import clash
|
||||
import jet.Array
|
||||
import kotlin.Array
|
||||
|
||||
/**
|
||||
* Executes the specfied block with result set and then closes it
|
||||
|
||||
@@ -760,7 +760,7 @@ class TemplateLinkRenderer(val annotated: KAnnotated, val template: KDocTemplate
|
||||
// TODO really dirty hack alert!!!
|
||||
// until the resolver is working, lets try adding a few prefixes :)
|
||||
for (prefix in arrayList("java.lang", "java.util", "java.util.concurrent", "java.util.regex", "java.io",
|
||||
"jet", "java.awt", "java.awt.event", "java.sql", "java.beans",
|
||||
"java.awt", "java.awt.event", "java.sql", "java.beans",
|
||||
"javax.swing", "javax.swing.event",
|
||||
"org.w3c.dom",
|
||||
"kotlin.template")) {
|
||||
|
||||
+1
-1
@@ -134,7 +134,7 @@ abstract class KDocTemplate() : TextTemplate() {
|
||||
return if (c != null) {
|
||||
val prefix = if (c.isAnnotation()) "@" else ""
|
||||
val cname = c.name
|
||||
if ((cname.startsWith("jet.Function") || cname.startsWith("jet.ExtensionFunction")) && arguments.isNotEmpty()) {
|
||||
if ((cname.startsWith("kotlin.Function") || cname.startsWith("kotlin.ExtensionFunction")) && arguments.isNotEmpty()) {
|
||||
val rt = arguments.last()
|
||||
// TODO use drop()
|
||||
val rest = arguments.subList(0, arguments.size - 1).orEmpty()
|
||||
|
||||
@@ -42,7 +42,6 @@ class KDocTest {
|
||||
val ignorePackages = config.ignorePackages
|
||||
ignorePackages.add("org.jetbrains.kotlin")
|
||||
ignorePackages.add("java")
|
||||
ignorePackages.add("jet")
|
||||
ignorePackages.add("junit")
|
||||
ignorePackages.add("sun")
|
||||
ignorePackages.add("org")
|
||||
|
||||
Reference in New Issue
Block a user