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

Minor. Got rid of warnings in JetSourceNavigationHelper.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-01-10 14:05:26 +04:00
parent 27bbca7fe4
commit 14a033cbd4
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java
+17 -8
View File
@@ -391,15 +391,22 @@ public class JetSourceNavigationHelper {
} }
for (JetTypeConstraint typeConstraint : typeParameterListOwner.getTypeConstraints()) { for (JetTypeConstraint typeConstraint : typeParameterListOwner.getTypeConstraints()) {
Name name = typeConstraint.getSubjectTypeParameterName().getReferencedNameAsName(); JetSimpleNameExpression typeParameterName = typeConstraint.getSubjectTypeParameterName();
decompiledParameterToBounds.put(name, typeConstraint.getBoundTypeReference().getText()); assert typeParameterName != null;
JetTypeReference bound = typeConstraint.getBoundTypeReference();
assert bound != null;
decompiledParameterToBounds.put(typeParameterName.getReferencedNameAsName(), bound.getText());
} }
for (int i = 0; i < decompiledParameters.size(); i++) { for (int i = 0; i < decompiledParameters.size(); i++) {
JetTypeParameter decompiledParameter = decompiledParameters.get(i); JetTypeParameter decompiledParameter = decompiledParameters.get(i);
TypeParameterDescriptor descriptor = typeParameterDescriptors.get(i); TypeParameterDescriptor descriptor = typeParameterDescriptors.get(i);
if (!decompiledParameter.getNameAsName().equals(descriptor.getName())) { Name name = decompiledParameter.getNameAsName();
assert name != null;
if (!name.equals(descriptor.getName())) {
return false; return false;
} }
@@ -504,14 +511,16 @@ public class JetSourceNavigationHelper {
return false; return false;
} }
JetModifierList modifierList = declarationParameter.getModifierList(); JetModifierList modifierList = declarationParameter.getModifierList();
boolean vararg = modifierList != null && modifierList.hasModifier(JetTokens.VARARG_KEYWORD); boolean varargInDeclaration = modifierList != null && modifierList.hasModifier(JetTokens.VARARG_KEYWORD);
if (vararg != (descriptorParameter.getVarargElementType() != null)) { boolean varargInDescriptor = descriptorParameter.getVarargElementType() != null;
if (varargInDeclaration != varargInDescriptor) {
return false; return false;
} }
String declarationTypeText = typeReference.getText(); String declarationTypeText = typeReference.getText();
String descriptorParameterText = DescriptorRenderer.TEXT.renderType(vararg
? descriptorParameter.getVarargElementType() JetType typeToRender = varargInDeclaration ? descriptorParameter.getVarargElementType() : descriptorParameter.getType();
: descriptorParameter.getType()); assert typeToRender != null;
String descriptorParameterText = DescriptorRenderer.TEXT.renderType(typeToRender);
if (!declarationTypeText.equals(descriptorParameterText)) { if (!declarationTypeText.equals(descriptorParameterText)) {
return false; return false;
} }