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

Added filtering variables in BaseJetVariableMacro

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-02-08 13:55:22 +04:00
parent f0073d0289
commit ca446030ea
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java
+13 -8
View File
@@ -14,6 +14,7 @@ import com.intellij.psi.PsiNamedElement;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.JetScope;
@@ -30,7 +31,7 @@ import java.util.Set;
*/ */
public abstract class BaseJetVariableMacro extends Macro { public abstract class BaseJetVariableMacro extends Macro {
@Nullable @Nullable
private static JetNamedDeclaration[] getVariables(Expression[] params, ExpressionContext context) { private JetNamedDeclaration[] getVariables(Expression[] params, ExpressionContext context) {
if (params.length != 1) return null; if (params.length != 1) return null;
final Result result = params[0].calculateResult(context); final Result result = params[0].calculateResult(context);
if (result == null) return null; if (result == null) return null;
@@ -53,20 +54,24 @@ public abstract class BaseJetVariableMacro extends Macro {
List<JetNamedDeclaration> elements = new ArrayList<JetNamedDeclaration>(); List<JetNamedDeclaration> elements = new ArrayList<JetNamedDeclaration>();
for (DeclarationDescriptor declarationDescriptor : scope.getAllDescriptors()) { for (DeclarationDescriptor declarationDescriptor : scope.getAllDescriptors()) {
PsiElement declaration = bc.get(BindingContext.DESCRIPTOR_TO_DECLARATION, declarationDescriptor); if (declarationDescriptor instanceof VariableDescriptor && isSuitable((VariableDescriptor) declarationDescriptor)) {
assert declaration == null || declaration instanceof PsiNamedElement; PsiElement declaration = bc.get(BindingContext.DESCRIPTOR_TO_DECLARATION, declarationDescriptor);
assert declaration == null || declaration instanceof PsiNamedElement;
if (declaration instanceof JetProperty) { if (declaration instanceof JetProperty) {
elements.add((JetProperty) declaration); elements.add((JetProperty) declaration);
} }
else if (declaration instanceof JetParameter) { else if (declaration instanceof JetParameter) {
elements.add((JetParameter) declaration); elements.add((JetParameter) declaration);
}
} }
} }
return elements.toArray(new JetNamedDeclaration[elements.size()]); return elements.toArray(new JetNamedDeclaration[elements.size()]);
} }
protected abstract boolean isSuitable(@NotNull VariableDescriptor variableDescriptor);
@Nullable @Nullable
private static JetExpression findContextExpression(PsiFile psiFile, int startOffset) { private static JetExpression findContextExpression(PsiFile psiFile, int startOffset) {
PsiElement e = psiFile.findElementAt(startOffset); PsiElement e = psiFile.findElementAt(startOffset);
idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetVariableOfTypeMacro.java
+6
View File
@@ -1,5 +1,7 @@
package org.jetbrains.jet.plugin.liveTemplates.macro; package org.jetbrains.jet.plugin.liveTemplates.macro;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetBundle;
/** /**
@@ -17,5 +19,9 @@ public class JetVariableOfTypeMacro extends BaseJetVariableMacro {
return JetBundle.message("macro.variable.of.type"); return JetBundle.message("macro.variable.of.type");
} }
@Override
protected boolean isSuitable(@NotNull VariableDescriptor variableDescriptor) {
return true;
}
} }