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

Restore support for 173 branch

Browse Source
This commit is contained in:
Nikolay Krasko
2018-11-21 14:30:55 +03:00
parent 3e11fc1824
commit 9a79f43a50
3 changed files with 57 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt
+1 -2
View File
@@ -23,7 +23,6 @@ import com.intellij.psi.PsiClass
import com.intellij.psi.PsiField
import com.intellij.psi.PsiMethod
import com.intellij.psi.search.GlobalSearchScope
import com.intellij.psi.search.PsiShortNamesCache
import com.intellij.psi.stubs.StubIndex
import com.intellij.util.ArrayUtil
import com.intellij.util.Processor
@@ -46,7 +45,7 @@ import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtNamedDeclaration
import org.jetbrains.kotlin.psi.KtNamedFunction
class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache() {
class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCacheWrapper() {
//region Classes
override fun processAllClassNames(processor: Processor<String>): Boolean {
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/PsiShortNamesCacheCompatibility.kt
+29
View File
@@ -0,0 +1,29 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.caches
import com.intellij.psi.search.PsiShortNamesCache
typealias PsiShortNamesCacheWrapper = PsiShortNamesCache
/*
// Need to implement deprecated methods. Should be removed after abandoning 173 and AS 3.1 branch.
// BUNCH: 181
@Suppress("OverridingDeprecatedMember", "DEPRECATION")
abstract class PsiShortNamesCacheCompatibility : PsiShortNamesCache() {
override fun getAllClassNames(dest: com.intellij.util.containers.HashSet<String>) {
processAllClassNames(com.intellij.util.CommonProcessors.CollectProcessor(dest))
}
override fun getAllMethodNames(set: com.intellij.util.containers.HashSet<String>) {
java.util.Collections.addAll(set, *allMethodNames)
}
override fun getAllFieldNames(set: com.intellij.util.containers.HashSet<String>) {
java.util.Collections.addAll(set, *allFieldNames)
}
}
*/
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/PsiShortNamesCacheCompatibility.kt.173
+27
View File
@@ -0,0 +1,27 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.caches
import com.intellij.psi.search.PsiShortNamesCache
typealias PsiShortNamesCacheWrapper = PsiShortNamesCacheCompatibility
// Need to implement deprecated methods. Should be removed after abandoning 173 and AS 3.1 branch.
// BUNCH: 181
@Suppress("OverridingDeprecatedMember", "DEPRECATION")
abstract class PsiShortNamesCacheCompatibility : PsiShortNamesCache() {
override fun getAllClassNames(dest: com.intellij.util.containers.HashSet<String>) {
processAllClassNames(com.intellij.util.CommonProcessors.CollectProcessor(dest))
}
override fun getAllMethodNames(set: com.intellij.util.containers.HashSet<String>) {
java.util.Collections.addAll(set, *allMethodNames)
}
override fun getAllFieldNames(set: com.intellij.util.containers.HashSet<String>) {
java.util.Collections.addAll(set, *allFieldNames)
}
}