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

Refactored methods for val/var in PSI

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-05-29 23:14:20 +03:00
parent 034b74d3e5
commit 8fd6a64be9
71 changed files with 241 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java
+1 -1
View File
@@ -134,7 +134,7 @@ public class JetSourceNavigationHelper {
// property constructor parameters
List<JetParameter> constructorParameters = containingClass.getPrimaryConstructorParameters();
for (JetParameter constructorParameter : constructorParameters) {
if (memberName.equals(constructorParameter.getNameAsName()) && constructorParameter.hasValOrVarNode()) {
if (memberName.equals(constructorParameter.getNameAsName()) && constructorParameter.hasValOrVar()) {
return constructorParameter;
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
+2 -2
View File
@@ -129,7 +129,7 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
val typeArgumentsWithoutReceiverAndReturnType
= typeArgumentList.subList(if (isExtensionFunctionType) 1 else 0, typeArgumentList.size() - 1)
typeArgumentsWithoutReceiverAndReturnType.forEach { argument ->
val parameter = KotlinParameterStubImpl(parameterList, fqName = null, name = null, isMutable = false, hasValOrVarNode = false, hasDefaultValue = false)
val parameter = KotlinParameterStubImpl(parameterList, fqName = null, name = null, isMutable = false, hasValOrVar = false, hasDefaultValue = false)
createTypeReferenceStub(parameter, argument.getType())
}
@@ -150,7 +150,7 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
name = name.ref(),
fqName = null,
hasDefaultValue = false,
hasValOrVarNode = false,
hasValOrVar = false,
isMutable = false
)
val isVararg = valueParameterProto.hasVarargElementType()
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt
+2 -2
View File
@@ -87,9 +87,9 @@ private object DeclarationKindDetector : JetVisitor<AnnotationHostKind?, Unit?>(
override fun visitNamedFunction(d: JetNamedFunction, _: Unit?) = detect(d, "fun")
override fun visitProperty(d: JetProperty, _: Unit?) = detect(d, d.getValOrVarNode().getText()!!)
override fun visitProperty(d: JetProperty, _: Unit?) = detect(d, d.getValOrVarKeyword().getText()!!)
override fun visitMultiDeclaration(d: JetMultiDeclaration, _: Unit?) = detect(d, d.getValOrVarNode()?.getText() ?: "val",
override fun visitMultiDeclaration(d: JetMultiDeclaration, _: Unit?) = detect(d, d.getValOrVarKeyword()?.getText() ?: "val",
name = d.getEntries().map { it.getName() }.join(", ", "(", ")"))
override fun visitTypeParameter(d: JetTypeParameter, _: Unit?) = detect(d, "type parameter", newLineNeeded = false)
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.java
+1 -1
View File
@@ -128,7 +128,7 @@ public class KotlinReferencesSearcher extends QueryExecutorBase<PsiReference, Re
else if (element instanceof KotlinLightMethod) {
JetDeclaration declaration = ((KotlinLightMethod) element).getOrigin();
if (declaration instanceof JetProperty
|| (declaration instanceof JetParameter && ((JetParameter) declaration).hasValOrVarNode())) {
|| (declaration instanceof JetParameter && ((JetParameter) declaration).hasValOrVar())) {
searchNamedElement(queryParameters, (PsiNamedElement) declaration);
}
else if (declaration instanceof JetPropertyAccessor) {
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt
+2 -2
View File
@@ -59,7 +59,7 @@ fun PsiNamedElement.getAccessorNames(readable: Boolean = true, writable: Boolean
is JetProperty ->
return LightClassUtil.getLightClassPropertyMethods(this).toNameList()
is JetParameter ->
if (hasValOrVarNode()) {
if (hasValOrVar()) {
return LightClassUtil.getLightClassPropertyMethods(this).toNameList()
}
}
@@ -90,7 +90,7 @@ public fun PsiNamedElement.getSpecialNamesToSearch(): List<String> {
}
fun JetParameter.dataClassComponentFunctionName(): Name? {
if (!hasValOrVarNode()) return null
if (!hasValOrVar()) return null
// Forcing full resolve of owner class: otherwise DATA_CLASS_COMPONENT_FUNCTION won't be calculated.
// This is a hack, but better solution would need refactoring of data class component function resolution: they need to be resolved
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt
+1 -1
View File
@@ -194,7 +194,7 @@ fun PsiReference.isUsageInContainingDeclaration(declaration: JetNamedDeclaration
fun PsiReference.isCallableOverrideUsage(declaration: JetNamedDeclaration): Boolean {
val decl2Desc = { declaration: JetDeclaration ->
if (declaration is JetParameter && declaration.hasValOrVarNode()) declaration.propertyDescriptor else declaration.descriptor
if (declaration is JetParameter && declaration.hasValOrVar()) declaration.propertyDescriptor else declaration.descriptor
}
return checkUsageVsOriginalDescriptor(declaration, decl2Desc) { usageDescriptor, targetDescriptor ->
idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewElement.java
+1 -1
View File
@@ -156,7 +156,7 @@ public class JetStructureViewElement implements StructureViewTreeElement, Querya
JetClass jetClass = (JetClass) element;
List<JetDeclaration> declarations = new ArrayList<JetDeclaration>();
for (JetParameter parameter : jetClass.getPrimaryConstructorParameters()) {
if (parameter.hasValOrVarNode()) {
if (parameter.hasValOrVar()) {
declarations.add(parameter);
}
}