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

Fixed JetSimpleNameReference.getElement(): now it returns expression, not identifier leaf element.

Browse Source 
Without it, replacing reference.getElement() with another expression created invalid PSI.
This commit is contained in:
Evgeny Gerashchenko
2013-07-05 23:00:46 +04:00
parent a9a960fd38
commit a394afcce1
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java
+5 -6
View File
@@ -80,10 +80,9 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro
for (PsiReference reference : ReferencesSearch.search(functionPsi, functionPsi.getUseScope())) { for (PsiReference reference : ReferencesSearch.search(functionPsi, functionPsi.getUseScope())) {
PsiElement element = reference.getElement(); PsiElement element = reference.getElement();
PsiElement parent = element.getParent();
if (parent instanceof JetReferenceExpression) { if (element instanceof JetReferenceExpression) {
parent = parent.getParent(); PsiElement parent = element.getParent();
if (parent instanceof JetCallExpression) if (parent instanceof JetCallExpression)
result.add(new JetFunctionCallUsage((JetCallExpression) parent, functionPsi, isInherited)); result.add(new JetFunctionCallUsage((JetCallExpression) parent, functionPsi, isInherited));
@@ -114,9 +113,9 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro
for (PsiReference reference : ReferencesSearch.search(oldParam, oldParam.getUseScope())) { for (PsiReference reference : ReferencesSearch.search(oldParam, oldParam.getUseScope())) {
PsiElement element = reference.getElement(); PsiElement element = reference.getElement();
if (element.getParent() instanceof JetSimpleNameExpression && if (element instanceof JetSimpleNameExpression &&
!(element.getParent().getParent() instanceof JetValueArgumentName)) // Usages in named arguments of the calls usage will be changed when the function call is changed !(element.getParent() instanceof JetValueArgumentName)) // Usages in named arguments of the calls usage will be changed when the function call is changed
result.add(new JetParameterUsage((JetSimpleNameExpression) element.getParent(), parameterInfo, functionPsi, isInherited)); result.add(new JetParameterUsage((JetSimpleNameExpression) element, parameterInfo, functionPsi, isInherited));
} }
} }
} }
idea/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.java
-6
View File
@@ -43,12 +43,6 @@ public class JetSimpleNameReference extends JetPsiReference {
myExpression = jetSimpleNameExpression; myExpression = jetSimpleNameExpression;
} }
@NotNull
@Override
public PsiElement getElement() {
return myExpression.getReferencedNameElement();
}
@NotNull @NotNull
public JetSimpleNameExpression getExpression() { public JetSimpleNameExpression getExpression() {
return myExpression; return myExpression;