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

JetSimpleNameExpression's name is not null

Browse Source 
Modify usages accordingly
This commit is contained in:
Alexander Udalov
2013-01-14 21:20:46 +04:00
parent 173dfc4811
commit 949f5ed834
11 changed files with 9 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
-1
View File
@@ -293,7 +293,6 @@ public class JetControlFlowProcessor {
if (baseExpression == null) return;
if (JetTokens.LABELS.contains(operationType)) {
String referencedName = operationSign.getReferencedName();
referencedName = referencedName == null ? " <?>" : referencedName;
visitLabeledExpression(referencedName.substring(1), baseExpression);
}
else {
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
+1 -2
View File
@@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.psi;
import com.google.common.base.Function;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import com.intellij.psi.impl.CheckUtil;
import com.intellij.psi.impl.source.codeStyle.CodeEditUtil;
@@ -339,7 +338,7 @@ public class JetPsiUtil {
}
//noinspection ConstantConditions
return StringUtil.isNotEmpty(aliasName) ? Name.identifier(aliasName) : null;
return !aliasName.isEmpty() ? Name.identifier(aliasName) : null;
}
@Nullable
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java
+4 -7
View File
@@ -72,19 +72,16 @@ public class JetSimpleNameExpression extends JetReferenceExpression {
parent.getParent() instanceof JetImportDirective;
}
@Nullable @IfNotParsed
@NotNull
public String getReferencedName() {
String text = getReferencedNameElement().getNode().getText();
return text != null ? JetPsiUtil.unquoteIdentifierOrFieldReference(text) : null;
return JetPsiUtil.unquoteIdentifierOrFieldReference(text);
}
@Nullable
@NotNull
public Name getReferencedNameAsName() {
String name = getReferencedName();
if (name != null && name.length() == 0) {
// TODO: fix parser or do something // stepan.koltsov@
}
return name != null ? Name.identifierNoValidate(name) : null;
return Name.identifierNoValidate(name);
}
@NotNull
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
-3
View File
@@ -592,9 +592,6 @@ public class DescriptorResolver {
continue;
}
Name referencedName = subjectTypeParameterName.getReferencedNameAsName();
if (referencedName == null) {
continue;
}
TypeParameterDescriptorImpl typeParameterDescriptor = parameterByName.get(referencedName);
JetTypeReference boundTypeReference = constraint.getBoundTypeReference();
JetType bound = null;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/NamespaceFactoryImpl.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class NamespaceFactoryImpl implements NamespaceFactory {
}
for (JetSimpleNameExpression nameExpression : namespaceHeader.getParentNamespaceNames()) {
Name namespaceName = JetPsiUtil.safeName(nameExpression.getReferencedName());
Name namespaceName = Name.identifier(nameExpression.getReferencedName());
NamespaceDescriptorImpl namespaceDescriptor = createNamespaceDescriptorIfNeeded(
null, currentOwner, namespaceName, nameExpression, handler);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java
-5
View File
@@ -227,12 +227,7 @@ public class QualifiedExpressionResolver {
@NotNull
private LookupResult lookupSimpleNameReference(@NotNull JetSimpleNameExpression referenceExpression,
@NotNull JetScope outerScope, boolean onlyClasses, boolean namespaceLevel) {
Name referencedName = referenceExpression.getReferencedNameAsName();
if (referencedName == null) {
//to store a scope where we tried to resolve this reference
return new SuccessfulLookupResult(Collections.<DeclarationDescriptor>emptyList(), outerScope, namespaceLevel);
}
Set<DeclarationDescriptor> descriptors = Sets.newHashSet();
NamespaceDescriptor namespaceDescriptor = outerScope.getNamespace(referencedName);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java
-4
View File
@@ -90,9 +90,6 @@ public class CallResolver {
assert calleeExpression instanceof JetSimpleNameExpression;
JetSimpleNameExpression nameExpression = (JetSimpleNameExpression) calleeExpression;
Name referencedName = nameExpression.getReferencedNameAsName();
if (referencedName == null) {
return OverloadResolutionResultsImpl.nameNotFound();
}
List<CallableDescriptorCollector<? extends VariableDescriptor>> callableDescriptorCollectors = Lists.newArrayList();
if (nameExpression.getReferencedNameElementType() == JetTokens.FIELD_IDENTIFIER) {
referencedName = Name.identifier(referencedName.getName().substring(1));
@@ -146,7 +143,6 @@ public class CallResolver {
ExpressionTypingUtils.checkWrappingInRef(expression, context.trace, context.scope);
Name name = expression.getReferencedNameAsName();
if (name == null) return checkArgumentTypesAndFail(context);
prioritizedTasks = TaskPrioritizer.<CallableDescriptor, FunctionDescriptor>computePrioritizedTasks(context, name, functionReference, CallableDescriptorCollectors.FUNCTIONS_AND_VARIABLES);
ResolutionTask.DescriptorCheckStrategy abstractConstructorCheck = new ResolutionTask.DescriptorCheckStrategy() {
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
+3 -6
View File
@@ -1017,7 +1017,6 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
assert JetTokens.LABELS.contains(operationSign.getReferencedNameElementType());
String referencedName = operationSign.getReferencedName();
referencedName = referencedName == null ? " <?>" : referencedName;
context.labelResolver.enterLabeledElement(new LabelName(referencedName.substring(1)), baseExpression);
// TODO : Some processing for the label?
JetTypeInfo typeInfo = facade.getTypeInfo(baseExpression, context, isStatement);
@@ -1062,11 +1061,9 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
DataFlowInfo dataFlowInfo = context.dataFlowInfo;
if (operationType == JetTokens.IDENTIFIER) {
Name referencedName = operationSign.getReferencedNameAsName();
if (referencedName != null) {
JetTypeInfo typeInfo = getTypeInfoForBinaryCall(context.scope, referencedName, context, expression);
result = typeInfo.getType();
dataFlowInfo = typeInfo.getDataFlowInfo();
}
JetTypeInfo typeInfo = getTypeInfoForBinaryCall(context.scope, referencedName, context, expression);
result = typeInfo.getType();
dataFlowInfo = typeInfo.getDataFlowInfo();
}
else if (OperatorConventions.BINARY_OPERATION_NAMES.containsKey(operationType)) {
JetTypeInfo typeInfo = getTypeInfoForBinaryCall(context.scope, OperatorConventions.BINARY_OPERATION_NAMES.get(operationType),
idea/src/org/jetbrains/jet/plugin/editor/importOptimizer/JetImportOptimizer.java
-1
View File
@@ -198,7 +198,6 @@ public class JetImportOptimizer implements ImportOptimizer {
FqName fqName = null;
for (JetSimpleNameExpression nameExpression : simpleNameExpressions) {
Name referencedName = nameExpression.getReferencedNameAsName();
assert referencedName != null;
if (fqName == null) {
fqName = new FqName(referencedName.getName());
} else {
idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassAndFunFix.java
-2
View File
@@ -86,8 +86,6 @@ public class ImportClassAndFunFix extends JetHintAction<JetSimpleNameExpression>
return Collections.emptyList();
}
assert referenceName != null;
ResolveSession resolveSession = WholeProjectAnalyzerFacade.getLazyResolveSessionForFile((JetFile) element.getContainingFile());
List<FqName> result = Lists.newArrayList();
idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java
-1
View File
@@ -200,7 +200,6 @@ public class JetNameSuggester {
@Override
public void visitSimpleNameExpression(JetSimpleNameExpression expression) {
String referenceName = expression.getReferencedName();
if (referenceName == null) return;
if (referenceName.equals(referenceName.toUpperCase())) {
addName(result, referenceName, validator);
}