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

Refactoring: drop unused AbstractKotlinReferenceContributor.kt

Browse Source
This commit is contained in:
Nikolay Krasko
2019-04-25 20:51:36 +03:00
parent 9b9bfe7ba3
commit 8c83beb086
3 changed files with 4 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/AbstractKotlinReferenceContributor.kt
-56
View File
@@ -1,56 +0,0 @@
/*
* Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.idea.references
import com.intellij.patterns.ElementPattern
import com.intellij.patterns.PlatformPatterns
import com.intellij.psi.*
import com.intellij.util.ProcessingContext
import org.jetbrains.kotlin.psi.KtElement
abstract class AbstractKotlinReferenceContributor : PsiReferenceContributor() {
protected inline fun <reified E : KtElement> PsiReferenceRegistrar.registerProvider(
priority: Double = PsiReferenceRegistrar.DEFAULT_PRIORITY,
crossinline factory: (E) -> PsiReference?
) {
registerMultiProvider<E>(priority) { factory(it)?.let { arrayOf(it) } ?: PsiReference.EMPTY_ARRAY }
}
protected inline fun <reified E : KtElement> PsiReferenceRegistrar.registerMultiProvider(
priority: Double = PsiReferenceRegistrar.DEFAULT_PRIORITY,
crossinline factory: (E) -> Array<PsiReference>
) {
registerMultiProvider(PlatformPatterns.psiElement(E::class.java), priority, factory)
}
protected inline fun <E : KtElement> PsiReferenceRegistrar.registerMultiProvider(
pattern: ElementPattern<E>,
priority: Double = PsiReferenceRegistrar.DEFAULT_PRIORITY,
crossinline factory: (E) -> Array<PsiReference>
) {
registerReferenceProvider(
pattern,
object : PsiReferenceProvider() {
override fun getReferencesByElement(element: PsiElement, context: ProcessingContext): Array<PsiReference> {
@Suppress("UNCHECKED_CAST")
return factory(element as E)
}
},
priority
)
}
}
idea/idea-jvm/src/org/jetbrains/kotlin/idea/properties/KotlinPropertiesReferenceContributor.kt
+2 -2
View File
@@ -17,11 +17,11 @@
package org.jetbrains.kotlin.idea.properties
import com.intellij.patterns.PlatformPatterns
import com.intellij.psi.PsiReferenceContributor
import com.intellij.psi.PsiReferenceRegistrar
import org.jetbrains.kotlin.idea.references.AbstractKotlinReferenceContributor
import org.jetbrains.kotlin.psi.KtStringTemplateExpression
class KotlinPropertiesReferenceContributor : AbstractKotlinReferenceContributor() {
class KotlinPropertiesReferenceContributor : PsiReferenceContributor() {
override fun registerReferenceProviders(registrar: PsiReferenceRegistrar) {
registrar.registerReferenceProvider(
PlatformPatterns.psiElement(KtStringTemplateExpression::class.java),
idea/src/org/jetbrains/kotlin/idea/references/KotlinFilePathReferenceContributor.kt
+2 -1
View File
@@ -20,6 +20,7 @@ import com.intellij.codeInsight.lookup.LookupElement
import com.intellij.patterns.PlatformPatterns
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiReference
import com.intellij.psi.PsiReferenceContributor
import com.intellij.psi.PsiReferenceRegistrar
import com.intellij.psi.impl.source.resolve.reference.impl.providers.FilePathReferenceProvider
import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReference
@@ -30,7 +31,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getContentRange
import org.jetbrains.kotlin.psi.psiUtil.isPlain
import org.jetbrains.kotlin.psi.psiUtil.plainContent
class KotlinFilePathReferenceContributor : AbstractKotlinReferenceContributor() {
class KotlinFilePathReferenceContributor : PsiReferenceContributor() {
object KotlinFilePathReferenceProvider : FilePathReferenceProvider() {
override fun getReferencesByElement(element: PsiElement, context: ProcessingContext): Array<out PsiReference> {
if (element !is KtStringTemplateExpression) return PsiReference.EMPTY_ARRAY