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

Changed completion for 'iter' live template, now check is the same as used in checking real for loops.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-02-09 21:47:20 +04:00
parent 447114f063
commit 47764add22
4 changed files with 29 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/compiler/TipsManager.java
+2 -2
View File
@@ -76,8 +76,8 @@ public final class TipsManager {
return Collections.emptyList();
}
private static Collection<DeclarationDescriptor> excludeNotCallableExtensions(
@NotNull Collection<DeclarationDescriptor> descriptors, @NotNull final JetScope scope
public static Collection<DeclarationDescriptor> excludeNotCallableExtensions(
@NotNull Collection<? extends DeclarationDescriptor> descriptors, @NotNull final JetScope scope
) {
final Set<DeclarationDescriptor> descriptorsSet = Sets.newHashSet(descriptors);
idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java
+19 -17
View File
@@ -13,6 +13,7 @@ import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiNamedElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.compiler.TipsManager;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
import org.jetbrains.jet.lang.psi.*;
@@ -20,10 +21,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.*;
/**
* @author Evgeny Gerashchenko
@@ -49,26 +47,30 @@ public abstract class BaseJetVariableMacro extends Macro {
return null;
}
List<JetNamedDeclaration> elements = new ArrayList<JetNamedDeclaration>();
List<VariableDescriptor> filteredDescriptors = new ArrayList<VariableDescriptor>();
for (DeclarationDescriptor declarationDescriptor : scope.getAllDescriptors()) {
if (declarationDescriptor instanceof VariableDescriptor && isSuitable((VariableDescriptor) declarationDescriptor)) {
PsiElement declaration = bc.get(BindingContext.DESCRIPTOR_TO_DECLARATION, declarationDescriptor);
assert declaration == null || declaration instanceof PsiNamedElement;
if (declaration instanceof JetProperty) {
elements.add((JetProperty) declaration);
}
else if (declaration instanceof JetParameter) {
elements.add((JetParameter) declaration);
if (declarationDescriptor instanceof VariableDescriptor) {
VariableDescriptor variableDescriptor = (VariableDescriptor) declarationDescriptor;
if (isSuitable(variableDescriptor, scope, project)) {
filteredDescriptors.add(variableDescriptor);
}
}
}
return elements.toArray(new JetNamedDeclaration[elements.size()]);
List<JetNamedDeclaration> declarations = new ArrayList<JetNamedDeclaration>();
for (DeclarationDescriptor declarationDescriptor : TipsManager.excludeNotCallableExtensions(filteredDescriptors, scope)) {
PsiElement declaration = bc.get(BindingContext.DESCRIPTOR_TO_DECLARATION, declarationDescriptor);
assert declaration == null || declaration instanceof PsiNamedElement;
if (declaration instanceof JetProperty || declaration instanceof JetParameter) {
declarations.add((JetNamedDeclaration) declaration);
}
}
return declarations.toArray(new JetNamedDeclaration[declarations.size()]);
}
protected abstract boolean isSuitable(@NotNull VariableDescriptor variableDescriptor);
protected abstract boolean isSuitable(@NotNull VariableDescriptor variableDescriptor, @NotNull JetScope scope, @NotNull Project project);
@Nullable
private static JetExpression findContextExpression(PsiFile psiFile, int startOffset) {
idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnyVariableMacro.java
+3 -1
View File
@@ -1,7 +1,9 @@
package org.jetbrains.jet.plugin.liveTemplates.macro;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.plugin.JetBundle;
/**
@@ -20,7 +22,7 @@ public class JetAnyVariableMacro extends BaseJetVariableMacro {
}
@Override
protected boolean isSuitable(@NotNull VariableDescriptor variableDescriptor) {
protected boolean isSuitable(@NotNull VariableDescriptor variableDescriptor, @NotNull JetScope scope, @NotNull Project project) {
return true;
}
}
idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetIterableVariableMacro.java
+5 -25
View File
@@ -1,26 +1,17 @@
package org.jetbrains.jet.plugin.liveTemplates.macro;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor;
import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.TypeUtils;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils;
import org.jetbrains.jet.plugin.JetBundle;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* @author Evgeny Gerashchenko
* @since 2/7/12
*/
public class JetIterableVariableMacro extends BaseJetVariableMacro {
private static final List<String> ACCEPTED_FQ_NAMES = Arrays.asList(
"jet.Array", "java.lang.Iterable", "<java_root>.java.lang.Iterable", "jet.Iterable");
@Override
public String getName() {
return "kotlinIterableVariable";
@@ -32,18 +23,7 @@ public class JetIterableVariableMacro extends BaseJetVariableMacro {
}
@Override
protected boolean isSuitable(@NotNull VariableDescriptor variableDescriptor) {
// TODO more sophisticated check needed
JetType outType = variableDescriptor.getOutType();
List<JetType> types = new ArrayList<JetType>(TypeUtils.getAllSupertypes(outType));
types.add(outType);
for (JetType type : types) {
ClassifierDescriptor declarationDescriptor = type.getConstructor().getDeclarationDescriptor();
if (ACCEPTED_FQ_NAMES.contains(DescriptorUtils.getFQName(declarationDescriptor))) {
return true;
}
}
return false;
protected boolean isSuitable(@NotNull VariableDescriptor variableDescriptor, @NotNull JetScope scope, @NotNull Project project) {
return ExpressionTypingUtils.isVariableIterable(project, variableDescriptor, scope);
}
}