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

Introduce JetParameter#hasValOrVarNode() and use it instead of getValOrVarNode()

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-04-07 17:48:49 +04:00
parent 26452c845c
commit 9aa5681d80
22 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java
+1 -1
View File
@@ -150,7 +150,7 @@ public class JetSourceNavigationHelper {
// property constructor parameters
List<JetParameter> constructorParameters = containingClass.getPrimaryConstructorParameters();
for (JetParameter constructorParameter : constructorParameters) {
if (memberName.equals(constructorParameter.getNameAsName()) && constructorParameter.getValOrVarNode() != null) {
if (memberName.equals(constructorParameter.getNameAsName()) && constructorParameter.hasValOrVarNode()) {
return constructorParameter;
}
}
idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java
+1 -1
View File
@@ -89,7 +89,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).getValOrVarNode() != null)) {
|| (declaration instanceof JetParameter && ((JetParameter) declaration).hasValOrVarNode())) {
searchNamedElement(queryParameters, (PsiNamedElement) declaration);
}
else if (declaration instanceof JetPropertyAccessor) {
idea/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt
+1 -1
View File
@@ -61,7 +61,7 @@ fun JetNamedDeclaration.namesWithAccessors(readable: Boolean = true, writable: B
is JetProperty ->
return LightClassUtil.getLightClassPropertyMethods(this).toNameList()
is JetParameter ->
if (getValOrVarNode() != null) {
if (hasValOrVarNode()) {
return LightClassUtil.getLightClassPropertyMethods(this).toNameList()
}
}
idea/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt
+1 -1
View File
@@ -139,7 +139,7 @@ fun PsiReference.isUsageInContainingDeclaration(declaration: JetNamedDeclaration
fun PsiReference.isCallableOverrideUsage(declaration: JetNamedDeclaration): Boolean {
val decl2Desc = {(declaration: JetDeclaration) ->
if (declaration is JetParameter && declaration.getValOrVarNode() != null) declaration.propertyDescriptor else declaration.descriptor
if (declaration is JetParameter && declaration.hasValOrVarNode()) declaration.propertyDescriptor else declaration.descriptor
}
return checkUsageVsOriginalDescriptor(declaration, decl2Desc) { (usageDescriptor, targetDescriptor) ->
idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java
+1 -1
View File
@@ -126,7 +126,7 @@ public class JetStructureViewElement implements StructureViewTreeElement {
JetClass jetClass = (JetClass) myElement;
List<JetDeclaration> declarations = new ArrayList<JetDeclaration>();
for (JetParameter parameter : jetClass.getPrimaryConstructorParameters()) {
if (parameter.getValOrVarNode() != null) {
if (parameter.hasValOrVarNode()) {
declarations.add(parameter);
}
}