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

Get rid of deprecated annotations and modifiers in project code

Browse Source
This commit is contained in:
Denis Zharkov
2015-09-14 16:26:59 +03:00
parent 02aafe4262
commit 9c4564a5a6
204 changed files with 485 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt
+2 -4
View File
@@ -45,8 +45,7 @@ import org.jetbrains.kotlin.types.typeUtil.TypeNullability
import org.jetbrains.kotlin.types.typeUtil.nullability
import java.util.*
@tailRecursive
fun <T : Any> LookupElement.putUserDataDeep(key: Key<T>, value: T?) {
tailrec fun <T : Any> LookupElement.putUserDataDeep(key: Key<T>, value: T?) {
if (this is LookupElementDecorator<*>) {
getDelegate().putUserDataDeep(key, value)
}
@@ -55,8 +54,7 @@ fun <T : Any> LookupElement.putUserDataDeep(key: Key<T>, value: T?) {
}
}
@tailRecursive
fun <T : Any> LookupElement.getUserDataDeep(key: Key<T>): T? {
tailrec fun <T : Any> LookupElement.getUserDataDeep(key: Key<T>): T? {
if (this is LookupElementDecorator<*>) {
return getDelegate().getUserDataDeep(key)
}
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt
+1 -1
View File
@@ -169,7 +169,7 @@ fun<TDescriptor: DeclarationDescriptor?> MutableCollection<LookupElement>.addLoo
for (info in expectedInfos) {
val classification = infoClassifier(info)
if (classification.substitutor != null) {
@suppress("UNCHECKED_CAST")
@Suppress("UNCHECKED_CAST")
val substitutedDescriptor = descriptor.substituteFixed(classification.substitutor)
val map = if (classification.makeNotNullable) makeNullableInfos else matchedInfos
map.getOrPut(ItemData(substitutedDescriptor, info.itemOptions)) { ArrayList() }.add(info)
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTest.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
import java.io.File
deprecated("All tests from here to be moved to the generated test")
@Deprecated("All tests from here to be moved to the generated test")
public class BasicCompletionHandlerTest : CompletionHandlerTestBase(){
private fun checkResult(){
fixture.checkResultByFile(getTestName(false) + ".kt.after")