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

KotlinIsReferenceToExtension was renamed to SimpleNameReferenceExtension

Browse Source
This commit is contained in:
Yan Zhulanow
2014-12-09 00:35:58 +03:00
parent 359376f797
commit 9f66777185
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/references/KotlinIsReferenceToExtension.kt → idea/idea-analysis/src/org/jetbrains/jet/plugin/references/SimpleNameReferenceExtension.kt
+2 -2
View File
@@ -21,9 +21,9 @@ import com.intellij.psi.PsiElement
import org.jetbrains.jet.plugin.references.JetSimpleNameReference
import org.jetbrains.jet.lang.psi.JetPsiFactory
public trait KotlinIsReferenceToExtension {
public trait SimpleNameReferenceExtension {
class object {
public val EP_NAME: ExtensionPointName<KotlinIsReferenceToExtension> = ExtensionPointName.create("org.jetbrains.kotlin.isReferenceToExtension")!!
public val EP_NAME: ExtensionPointName<SimpleNameReferenceExtension> = ExtensionPointName.create("org.jetbrains.kotlin.simpleNameReferenceExtension")!!
}
fun isReferenceTo(reference: JetSimpleNameReference, element: PsiElement): Boolean?
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt
+3 -3
View File
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.psi.psiUtil.*
import com.intellij.psi.impl.light.LightElement
import com.intellij.openapi.extensions.Extensions
import org.jetbrains.jet.plugin.findUsages.handlers.KotlinIsReferenceToExtension
import org.jetbrains.jet.plugin.findUsages.handlers.SimpleNameReferenceExtension
public class JetSimpleNameReference(
jetSimpleNameExpression: JetSimpleNameExpression
@@ -46,7 +46,7 @@ public class JetSimpleNameReference(
override fun isReferenceTo(element: PsiElement?): Boolean {
if (element != null) {
val extensions = Extensions.getArea(element.getProject()).getExtensionPoint(
KotlinIsReferenceToExtension.EP_NAME).getExtensions()
SimpleNameReferenceExtension.EP_NAME).getExtensions()
for (extension in extensions) {
val value = extension.isReferenceTo(this, element)
if (value != null) {
@@ -87,7 +87,7 @@ public class JetSimpleNameReference(
JetTokens.LABEL_IDENTIFIER -> psiFactory.createClassLabel(newElementName)
else -> {
val extensions = Extensions.getArea(expression.getProject()).getExtensionPoint(
KotlinIsReferenceToExtension.EP_NAME).getExtensions()
SimpleNameReferenceExtension.EP_NAME).getExtensions()
var handled: PsiElement? = null
for (extension in extensions) {
idea/src/META-INF/extensions/common.xml
+2 -2
View File
@@ -17,8 +17,8 @@
<extensionPoint name="findUsagesHandlerDecorator"
interface="org.jetbrains.jet.plugin.findUsages.handlers.KotlinFindUsagesHandlerDecorator"
area="IDEA_PROJECT"/>
<extensionPoint name="isReferenceToExtension"
interface="org.jetbrains.jet.plugin.findUsages.handlers.KotlinIsReferenceToExtension"
<extensionPoint name="simpleNameReferenceExtension"
interface="org.jetbrains.jet.plugin.findUsages.handlers.SimpleNameReferenceExtension"
area="IDEA_PROJECT"/>
</extensionPoints>
</idea-plugin>
plugins/android-idea-plugin/src/META-INF/plugin.xml
+1 -1
View File
@@ -25,6 +25,6 @@
<externalDeclarationsProvider implementation="org.jetbrains.kotlin.android.AndroidDeclarationsProvider"/>
<expressionCodegenExtension implementation="org.jetbrains.kotlin.android.AndroidExpressionCodegen"/>
<findUsagesHandlerDecorator implementation="org.jetbrains.jet.plugin.android.AndroidFindUsageHandlerDecorator"/>
<isReferenceToExtension implementation="org.jetbrains.jet.plugin.android.AndroidKotlinIsReferenceToExtension"/>
<simpleNameReferenceExtension implementation="org.jetbrains.jet.plugin.android.AndroidSimpleNameReferenceExtension"/>
</extensions>
</idea-plugin>
plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidKotlinIsReferenceToExtension.kt → plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidSimpleNameReferenceExtension.kt
+2 -2
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.plugin.android
import org.jetbrains.jet.plugin.findUsages.handlers.KotlinIsReferenceToExtension
import org.jetbrains.jet.plugin.findUsages.handlers.SimpleNameReferenceExtension
import org.jetbrains.jet.plugin.references.JetSimpleNameReference
import com.intellij.psi.PsiElement
import org.jetbrains.jet.lang.resolve.android.isAndroidSyntheticElement
@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.psi.JetProperty
import com.intellij.psi.impl.light.LightElement
import org.jetbrains.jet.lang.psi.JetPsiFactory
public class AndroidKotlinIsReferenceToExtension : KotlinIsReferenceToExtension {
public class AndroidSimpleNameReferenceExtension : SimpleNameReferenceExtension {
override fun isReferenceTo(reference: JetSimpleNameReference, element: PsiElement): Boolean? {
val resolvedElement = reference.resolve()
if (resolvedElement == null) {