azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrated from @HiddenDeclaration to @Deprecated(..., level = DeprecationLevel.HIDDEN)

Browse Source
This commit is contained in:
Andrey Breslav
2015-10-09 14:49:41 +03:00
parent 7663afb7e0
commit 8e7f6f3c8c
14 changed files with 88 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/resolve/HiddenDeclarations.kt
Vendored
+11 -11
View File
@@ -4,34 +4,34 @@ package test
import test.topLevelFun import test.topLevelFun
import test.topLevelProperty import test.topLevelProperty
@HiddenDeclaration @Deprecated("hidden", level = DeprecationLevel.HIDDEN)
fun topLevelFun(){} fun topLevelFun(){}
@HiddenDeclaration @Deprecated("hidden", level = DeprecationLevel.HIDDEN)
var topLevelProperty = 1 var topLevelProperty = 1
@HiddenDeclaration @Deprecated("hidden", level = DeprecationLevel.HIDDEN)
fun String.topLevelExtensionFun(){} fun String.topLevelExtensionFun(){}
@HiddenDeclaration @Deprecated("hidden", level = DeprecationLevel.HIDDEN)
val String.topLevelExtensionProperty: Int get() = 1 val String.topLevelExtensionProperty: Int get() = 1
open class A { open class A {
constructor(<!UNUSED_PARAMETER!>p<!>: Int) : this(<!TYPE_MISMATCH!>""<!>) {} constructor(<!UNUSED_PARAMETER!>p<!>: Int) : this(<!TYPE_MISMATCH!>""<!>) {}
@HiddenDeclaration @Deprecated("hidden", level = DeprecationLevel.HIDDEN)
constructor(<!UNUSED_PARAMETER!>s<!>: String){} constructor(<!UNUSED_PARAMETER!>s<!>: String){}
@HiddenDeclaration @Deprecated("hidden", level = DeprecationLevel.HIDDEN)
open fun memberFun(){} open fun memberFun(){}
@HiddenDeclaration @Deprecated("hidden", level = DeprecationLevel.HIDDEN)
val memberProperty = 1 val memberProperty = 1
@HiddenDeclaration @Deprecated("hidden", level = DeprecationLevel.HIDDEN)
fun String.memberExtensionFun(){} fun String.memberExtensionFun(){}
@HiddenDeclaration @Deprecated("hidden", level = DeprecationLevel.HIDDEN)
val String.memberExtensionProperty: Int get() = 1 val String.memberExtensionProperty: Int get() = 1
fun foo() { fun foo() {
@@ -50,10 +50,10 @@ open class A {
} }
interface I { interface I {
@HiddenDeclaration @Deprecated("hidden", level = DeprecationLevel.HIDDEN)
fun foo1() fun foo1()
@HiddenDeclaration @Deprecated("hidden", level = DeprecationLevel.HIDDEN)
fun foo2() fun foo2()
} }
compiler/testData/diagnostics/tests/resolve/HiddenDeclarations.txt
Vendored
+19 -19
View File
@@ -1,52 +1,52 @@
package package
package test { package test {
@kotlin.HiddenDeclaration() public var topLevelProperty: kotlin.Int @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "hidden") public var topLevelProperty: kotlin.Int
@kotlin.HiddenDeclaration() public val kotlin.String.topLevelExtensionProperty: kotlin.Int @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "hidden") public val kotlin.String.topLevelExtensionProperty: kotlin.Int
@kotlin.HiddenDeclaration() public fun topLevelFun(): kotlin.Unit @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "hidden") public fun topLevelFun(): kotlin.Unit
@kotlin.HiddenDeclaration() public fun kotlin.String.topLevelExtensionFun(): kotlin.Unit @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "hidden") public fun kotlin.String.topLevelExtensionFun(): kotlin.Unit
public open class A { public open class A {
public constructor A(/*0*/ p: kotlin.Int) public constructor A(/*0*/ p: kotlin.Int)
@kotlin.HiddenDeclaration() public constructor A(/*0*/ s: kotlin.String) @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "hidden") public constructor A(/*0*/ s: kotlin.String)
@kotlin.HiddenDeclaration() public final val memberProperty: kotlin.Int = 1 @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "hidden") public final val memberProperty: kotlin.Int = 1
@kotlin.HiddenDeclaration() public final val kotlin.String.memberExtensionProperty: kotlin.Int @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "hidden") public final val kotlin.String.memberExtensionProperty: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): kotlin.Unit public final fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@kotlin.HiddenDeclaration() public open fun memberFun(): kotlin.Unit @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "hidden") public open fun memberFun(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@kotlin.HiddenDeclaration() public final fun kotlin.String.memberExtensionFun(): kotlin.Unit @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "hidden") public final fun kotlin.String.memberExtensionFun(): kotlin.Unit
} }
public final class B : test.A { public final class B : test.A {
public constructor B() public constructor B()
@kotlin.HiddenDeclaration() public final override /*1*/ /*fake_override*/ val memberProperty: kotlin.Int @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "hidden") public final override /*1*/ /*fake_override*/ val memberProperty: kotlin.Int
@kotlin.HiddenDeclaration() public final override /*1*/ /*fake_override*/ val kotlin.String.memberExtensionProperty: kotlin.Int @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "hidden") public final override /*1*/ /*fake_override*/ val kotlin.String.memberExtensionProperty: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit public final override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ fun memberFun(): kotlin.Unit public open override /*1*/ fun memberFun(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@kotlin.HiddenDeclaration() public final override /*1*/ /*fake_override*/ fun kotlin.String.memberExtensionFun(): kotlin.Unit @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "hidden") public final override /*1*/ /*fake_override*/ fun kotlin.String.memberExtensionFun(): kotlin.Unit
} }
public final class C : test.A { public final class C : test.A {
public constructor C() public constructor C()
@kotlin.HiddenDeclaration() public final override /*1*/ /*fake_override*/ val memberProperty: kotlin.Int @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "hidden") public final override /*1*/ /*fake_override*/ val memberProperty: kotlin.Int
@kotlin.HiddenDeclaration() public final override /*1*/ /*fake_override*/ val kotlin.String.memberExtensionProperty: kotlin.Int @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "hidden") public final override /*1*/ /*fake_override*/ val kotlin.String.memberExtensionProperty: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit public final override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@kotlin.HiddenDeclaration() public open override /*1*/ /*fake_override*/ fun memberFun(): kotlin.Unit @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "hidden") public open override /*1*/ /*fake_override*/ fun memberFun(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@kotlin.HiddenDeclaration() public final override /*1*/ /*fake_override*/ fun kotlin.String.memberExtensionFun(): kotlin.Unit @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "hidden") public final override /*1*/ /*fake_override*/ fun kotlin.String.memberExtensionFun(): kotlin.Unit
} }
public interface I { public interface I {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.HiddenDeclaration() public abstract fun foo1(): kotlin.Unit @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "hidden") public abstract fun foo1(): kotlin.Unit
@kotlin.HiddenDeclaration() public abstract fun foo2(): kotlin.Unit @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "hidden") public abstract fun foo2(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
@@ -55,7 +55,7 @@ package test {
public constructor X() public constructor X()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ fun foo1(): kotlin.Unit public open override /*1*/ fun foo1(): kotlin.Unit
@kotlin.HiddenDeclaration() public abstract override /*1*/ /*fake_override*/ fun foo2(): kotlin.Unit @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "hidden") public abstract override /*1*/ /*fake_override*/ fun foo2(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
compiler/testData/writeFlags/hidden/function.kt
Vendored
+3 -2
View File
@@ -1,7 +1,8 @@
class MyClass() { class MyClass() {
@HiddenDeclaration fun test() {} @Deprecated("hidden", level = DeprecationLevel.HIDDEN)
fun test() {}
} }
// TESTED_OBJECT_KIND: function // TESTED_OBJECT_KIND: function
// TESTED_OBJECTS: MyClass, test // TESTED_OBJECTS: MyClass, test
// FLAGS: ACC_SYNTHETIC, ACC_PUBLIC, ACC_FINAL // FLAGS: ACC_SYNTHETIC, ACC_PUBLIC, ACC_FINAL, ACC_DEPRECATED
compiler/testData/writeFlags/hidden/propertyGetter.kt
Vendored
+3 -2
View File
@@ -1,9 +1,10 @@
class MyClass() { class MyClass() {
@HiddenDeclaration var test: Int @Deprecated("hidden", level = DeprecationLevel.HIDDEN)
var test: Int
get() = 0 get() = 0
set(value) {} set(value) {}
} }
// TESTED_OBJECT_KIND: function // TESTED_OBJECT_KIND: function
// TESTED_OBJECTS: MyClass, getTest // TESTED_OBJECTS: MyClass, getTest
// FLAGS: ACC_SYNTHETIC, ACC_PUBLIC, ACC_FINAL // FLAGS: ACC_SYNTHETIC, ACC_PUBLIC, ACC_FINAL, ACC_DEPRECATED
compiler/testData/writeFlags/hidden/propertySetter.kt
Vendored
+3 -2
View File
@@ -1,9 +1,10 @@
class MyClass() { class MyClass() {
@HiddenDeclaration var test: Int @Deprecated("hidden", level = DeprecationLevel.HIDDEN)
var test: Int
get() = 0 get() = 0
set(value) {} set(value) {}
} }
// TESTED_OBJECT_KIND: function // TESTED_OBJECT_KIND: function
// TESTED_OBJECTS: MyClass, setTest // TESTED_OBJECTS: MyClass, setTest
// FLAGS: ACC_SYNTHETIC, ACC_PUBLIC, ACC_FINAL // FLAGS: ACC_SYNTHETIC, ACC_PUBLIC, ACC_FINAL, ACC_DEPRECATED
core/reflection.jvm/src/kotlin/reflect/jvm/_Deprecated.kt
+2 -4
View File
@@ -46,12 +46,10 @@ public var KProperty<*>.accessible: Boolean
get() = isAccessible get() = isAccessible
set(value) { isAccessible = value } set(value) { isAccessible = value }
@HiddenDeclaration @Deprecated("Moved to package kotlin.jvm", ReplaceWith("java"), level = DeprecationLevel.HIDDEN)
@Deprecated("Moved to package kotlin.jvm", ReplaceWith("java"))
public val <T : Any> KClass<T>.java: Class<T> public val <T : Any> KClass<T>.java: Class<T>
get() = java get() = java
@HiddenDeclaration @Deprecated("Moved to package kotlin.jvm", ReplaceWith("kotlin"), level = DeprecationLevel.HIDDEN)
@Deprecated("Moved to package kotlin.jvm", ReplaceWith("kotlin"))
public val <T : Any> Class<T>.kotlin: KClass<T> public val <T : Any> Class<T>.kotlin: KClass<T>
get() = kotlin get() = kotlin
idea/idea-completion/testData/basic/multifile/HiddenDeclarations/HiddenDeclarations.dependency.kt
Vendored
+5 -3
View File
@@ -1,14 +1,16 @@
package test package test
@HiddenDeclaration @Deprecated("hidden", level = DeprecationLevel.HIDDEN)
fun hiddenFun(){} fun hiddenFun(){}
fun notHiddenFun(){} fun notHiddenFun(){}
@HiddenDeclaration @Deprecated("hidden", level = DeprecationLevel.HIDDEN)
var hiddenProperty: Int = 1 var hiddenProperty: Int = 1
var notHiddenProperty: Int = 1 var notHiddenProperty: Int = 1
@HiddenDeclaration @Deprecated("hidden", level = DeprecationLevel.HIDDEN)
val String.hiddenExtension: Int get() = 1 val String.hiddenExtension: Int get() = 1
// ALLOW_AST_ACCESS
idea/idea-completion/testData/basic/multifile/HiddenDeclarations/HiddenDeclarations.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package test package test
@HiddenDeclaration @Deprecated("hidden", level = DeprecationLevel.HIDDEN)
fun hiddenFunFromSameFile(){} fun hiddenFunFromSameFile(){}
fun String.foo() { fun String.foo() {
idea/testData/inspections/conflictingExtensionProperty/File.kt
Vendored
+1 -1
View File
@@ -15,6 +15,6 @@ class MyFile : File("")
val MyFile.isFile: Boolean val MyFile.isFile: Boolean
get() = isFile() get() = isFile()
@HiddenDeclaration @Deprecated("hidden", level = DeprecationLevel.HIDDEN)
val Thread.priority: Int val Thread.priority: Int
get() = getPriority() get() = getPriority()
libraries/stdlib/src/kotlin/concurrent/Thread.kt
+6 -7
View File
@@ -2,7 +2,9 @@
@file:JvmName("ThreadsKt") @file:JvmName("ThreadsKt")
package kotlin.concurrent package kotlin.concurrent
import java.util.concurrent.* import java.util.concurrent.Executor
import java.util.concurrent.ExecutorService
import java.util.concurrent.Future
/** /**
* Returns the current thread. * Returns the current thread.
@@ -13,8 +15,7 @@ public val currentThread: Thread
/** /**
* Exposes the name of this thread as a property. * Exposes the name of this thread as a property.
*/ */
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("name"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("name"))
public var Thread.name: String public var Thread.name: String
get() = getName() get() = getName()
set(value) { set(value) {
@@ -42,8 +43,7 @@ public val Thread.alive: Boolean
/** /**
* Exposes the priority of this thread as a property. * Exposes the priority of this thread as a property.
*/ */
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("priority"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("priority"))
public var Thread.priority: Int public var Thread.priority: Int
get() = getPriority() get() = getPriority()
set(value) { set(value) {
@@ -53,8 +53,7 @@ public var Thread.priority: Int
/** /**
* Exposes the context class loader of this thread as a property. * Exposes the context class loader of this thread as a property.
*/ */
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("contextClassLoader"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("contextClassLoader"))
public var Thread.contextClassLoader: ClassLoader? public var Thread.contextClassLoader: ClassLoader?
get() = getContextClassLoader() get() = getContextClassLoader()
set(value) { set(value) {
libraries/stdlib/src/kotlin/dom/DomEventsJVM.kt
+15 -30
View File
@@ -7,31 +7,26 @@ import org.w3c.dom.events.EventTarget
import org.w3c.dom.events.MouseEvent import org.w3c.dom.events.MouseEvent
// JavaScript style properties for JVM : TODO could auto-generate these // JavaScript style properties for JVM : TODO could auto-generate these
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("bubbles"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("bubbles"))
public val Event.bubbles: Boolean public val Event.bubbles: Boolean
get() = getBubbles() get() = getBubbles()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("cancelable"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("cancelable"))
public val Event.cancelable: Boolean public val Event.cancelable: Boolean
get() = getCancelable() get() = getCancelable()
public val Event.getCurrentTarget: EventTarget? public val Event.getCurrentTarget: EventTarget?
get() = getCurrentTarget() get() = getCurrentTarget()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("eventPhase"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("eventPhase"))
public val Event.eventPhase: Short public val Event.eventPhase: Short
get() = getEventPhase() get() = getEventPhase()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("target"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("target"))
public val Event.target: EventTarget? public val Event.target: EventTarget?
get() = getTarget() get() = getTarget()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("timeStamp"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("timeStamp"))
public val Event.timeStamp: Long public val Event.timeStamp: Long
get() = getTimeStamp() get() = getTimeStamp()
@@ -40,52 +35,42 @@ public val Event.eventType: String
get() = getType()!! get() = getType()!!
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("altKey"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("altKey"))
public val MouseEvent.altKey: Boolean public val MouseEvent.altKey: Boolean
get() = getAltKey() get() = getAltKey()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("button"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("button"))
public val MouseEvent.button: Short public val MouseEvent.button: Short
get() = getButton() get() = getButton()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("clientX"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("clientX"))
public val MouseEvent.clientX: Int public val MouseEvent.clientX: Int
get() = getClientX() get() = getClientX()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("clientY"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("clientY"))
public val MouseEvent.clientY: Int public val MouseEvent.clientY: Int
get() = getClientY() get() = getClientY()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("ctrlKey"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("ctrlKey"))
public val MouseEvent.ctrlKey: Boolean public val MouseEvent.ctrlKey: Boolean
get() = getCtrlKey() get() = getCtrlKey()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("metaKey"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("metaKey"))
public val MouseEvent.metaKey: Boolean public val MouseEvent.metaKey: Boolean
get() = getMetaKey() get() = getMetaKey()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("relatedTarget"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("relatedTarget"))
public val MouseEvent.relatedTarget: EventTarget? public val MouseEvent.relatedTarget: EventTarget?
get() = getRelatedTarget() get() = getRelatedTarget()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("screenX"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("screenX"))
public val MouseEvent.screenX: Int public val MouseEvent.screenX: Int
get() = getScreenX() get() = getScreenX()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("screenY"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("screenY"))
public val MouseEvent.screenY: Int public val MouseEvent.screenY: Int
get() = getScreenY() get() = getScreenY()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("shiftKey"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("shiftKey"))
public val MouseEvent.shiftKey: Boolean public val MouseEvent.shiftKey: Boolean
get() = getShiftKey() get() = getShiftKey()
libraries/stdlib/src/kotlin/dom/DomJVM.kt
+15 -30
View File
@@ -31,13 +31,11 @@ public val Node.nodeName: String
public val Node.nodeValue: String public val Node.nodeValue: String
get() = getNodeValue() ?: "" get() = getNodeValue() ?: ""
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("nodeType"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("nodeType"))
public val Node.nodeType: Short public val Node.nodeType: Short
get() = getNodeType() get() = getNodeType()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("parentNode"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("parentNode"))
public val Node.parentNode: Node? public val Node.parentNode: Node?
get() = getParentNode() get() = getParentNode()
@@ -45,38 +43,31 @@ public val Node.parentNode: Node?
public val Node.childNodes: NodeList public val Node.childNodes: NodeList
get() = getChildNodes()!! get() = getChildNodes()!!
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("firstChild"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("firstChild"))
public val Node.firstChild: Node? public val Node.firstChild: Node?
get() = getFirstChild() get() = getFirstChild()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("lastChild"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("lastChild"))
public val Node.lastChild: Node? public val Node.lastChild: Node?
get() = getLastChild() get() = getLastChild()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("nextSibling"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("nextSibling"))
public val Node.nextSibling: Node? public val Node.nextSibling: Node?
get() = getNextSibling() get() = getNextSibling()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("previousSibling"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("previousSibling"))
public val Node.previousSibling: Node? public val Node.previousSibling: Node?
get() = getPreviousSibling() get() = getPreviousSibling()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("attributes"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("attributes"))
public val Node.attributes: NamedNodeMap? public val Node.attributes: NamedNodeMap?
get() = getAttributes() get() = getAttributes()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("ownerDocument"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("ownerDocument"))
public val Node.ownerDocument: Document? public val Node.ownerDocument: Document?
get() = getOwnerDocument() get() = getOwnerDocument()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("documentElement"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("documentElement"))
public val Document.documentElement: Element? public val Document.documentElement: Element?
get() = this.getDocumentElement() get() = this.getDocumentElement()
@@ -103,33 +94,27 @@ public var Node.textContent: String
setTextContent(value) setTextContent(value)
} }
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("length"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("length"))
public val DOMStringList.length: Int public val DOMStringList.length: Int
get() = this.getLength() get() = this.getLength()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("length"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("length"))
public val NameList.length: Int public val NameList.length: Int
get() = this.getLength() get() = this.getLength()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("length"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("length"))
public val DOMImplementationList.length: Int public val DOMImplementationList.length: Int
get() = this.getLength() get() = this.getLength()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("length"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("length"))
public val NodeList.length: Int public val NodeList.length: Int
get() = this.getLength() get() = this.getLength()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("length"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("length"))
public val CharacterData.length: Int public val CharacterData.length: Int
get() = this.getLength() get() = this.getLength()
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("length"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("length"))
public val NamedNodeMap.length: Int public val NamedNodeMap.length: Int
get() = this.getLength() get() = this.getLength()
libraries/stdlib/src/kotlin/io/files/Utils.kt
+3 -6
View File
@@ -61,24 +61,21 @@ public val File.parent: File?
/** /**
* Returns the canonical path of this file. * Returns the canonical path of this file.
*/ */
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("canonicalPath"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("canonicalPath"))
public val File.canonicalPath: String public val File.canonicalPath: String
get() = getCanonicalPath() get() = getCanonicalPath()
/** /**
* Returns the file name. * Returns the file name.
*/ */
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("name"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("name"))
public val File.name: String public val File.name: String
get() = getName() get() = getName()
/** /**
* Returns the file path. * Returns the file path.
*/ */
@HiddenDeclaration @Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("path"), level = DeprecationLevel.HIDDEN)
@Deprecated("Is replaced with automatic synthetic extension", ReplaceWith("path"))
public val File.path: String public val File.path: String
get() = getPath() get() = getPath()
libraries/stdlib/src/kotlin/util/Ordering.kt
+1 -2
View File
@@ -19,8 +19,7 @@ package kotlin
import java.util.Comparator import java.util.Comparator
@HiddenDeclaration @Deprecated("Use compareValuesBy", ReplaceWith("compareValuesBy(a, b, *selectors)"), level = DeprecationLevel.HIDDEN)
@Deprecated("Use compareValuesBy", ReplaceWith("compareValuesBy(a, b, *selectors)"))
public fun <T> compareValuesByNullable(a: T, b: T, vararg selectors: (T) -> Comparable<*>?): Int = compareValuesBy(a, b, *selectors) public fun <T> compareValuesByNullable(a: T, b: T, vararg selectors: (T) -> Comparable<*>?): Int = compareValuesBy(a, b, *selectors)
/** /**