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

Fix type in function name and a better name for another function

Browse Source
This commit is contained in:
Nikolay Krasko
2012-06-09 18:34:37 +04:00
parent ba76e1467c
commit e7d625e37c
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureParsing.java
+1 -1
View File
@@ -177,7 +177,7 @@ class AlternativeSignatureParsing {
private static JetTypeConstraint findTypeParameterConstraint(@NotNull JetFunction function, @NotNull Name typeParameterName, int index) { private static JetTypeConstraint findTypeParameterConstraint(@NotNull JetFunction function, @NotNull Name typeParameterName, int index) {
if (index != 0) { if (index != 0) {
int currentIndex = 0; int currentIndex = 0;
for (JetTypeConstraint constraint : function.getTypeConstaints()) { for (JetTypeConstraint constraint : function.getTypeConstraints()) {
if (typeParameterName.equals(constraint.getSubjectTypeParameterName().getReferencedNameAsName())) { if (typeParameterName.equals(constraint.getSubjectTypeParameterName().getReferencedNameAsName())) {
currentIndex++; currentIndex++;
} }
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwner.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class JetTypeParameterListOwner extends JetNamedDeclaration {
} }
@NotNull @NotNull
public List<JetTypeConstraint> getTypeConstaints() { public List<JetTypeConstraint> getTypeConstraints() {
JetTypeConstraintList typeConstraintList = getTypeConstraintList(); JetTypeConstraintList typeConstraintList = getTypeConstraintList();
if (typeConstraintList == null) { if (typeConstraintList == null) {
return Collections.emptyList(); return Collections.emptyList();
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+1 -1
View File
@@ -376,7 +376,7 @@ public class DescriptorResolver {
deferredUpperBoundCheckerTasks.add(new UpperBoundCheckerTask(extendsBound, type, false)); deferredUpperBoundCheckerTasks.add(new UpperBoundCheckerTask(extendsBound, type, false));
} }
} }
for (JetTypeConstraint constraint : declaration.getTypeConstaints()) { for (JetTypeConstraint constraint : declaration.getTypeConstraints()) {
JetSimpleNameExpression subjectTypeParameterName = constraint.getSubjectTypeParameterName(); JetSimpleNameExpression subjectTypeParameterName = constraint.getSubjectTypeParameterName();
if (subjectTypeParameterName == null) { if (subjectTypeParameterName == null) {
continue; continue;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java
+1 -1
View File
@@ -613,7 +613,7 @@ public class TypeHierarchyResolver {
} }
} }
for (JetTypeConstraint constraint : jetClass.getTypeConstaints()) { for (JetTypeConstraint constraint : jetClass.getTypeConstraints()) {
JetTypeReference extendsBound = constraint.getBoundTypeReference(); JetTypeReference extendsBound = constraint.getBoundTypeReference();
if (extendsBound != null) { if (extendsBound != null) {
JetType type = trace.getBindingContext().get(TYPE, extendsBound); JetType type = trace.getBindingContext().get(TYPE, extendsBound);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java
+1 -1
View File
@@ -112,7 +112,7 @@ public class LazyTypeParameterDescriptor implements TypeParameterDescriptor {
JetClassOrObject classOrObject = PsiTreeUtil.getParentOfType(jetTypeParameter, JetClassOrObject.class); JetClassOrObject classOrObject = PsiTreeUtil.getParentOfType(jetTypeParameter, JetClassOrObject.class);
if (classOrObject instanceof JetClass) { if (classOrObject instanceof JetClass) {
JetClass jetClass = (JetClass) classOrObject; JetClass jetClass = (JetClass) classOrObject;
for (JetTypeConstraint jetTypeConstraint : jetClass.getTypeConstaints()) { for (JetTypeConstraint jetTypeConstraint : jetClass.getTypeConstraints()) {
if (jetTypeConstraint.isClassObjectContraint() != forClassObject) continue; if (jetTypeConstraint.isClassObjectContraint() != forClassObject) continue;
JetSimpleNameExpression constrainedParameterName = jetTypeConstraint.getSubjectTypeParameterName(); JetSimpleNameExpression constrainedParameterName = jetTypeConstraint.getSubjectTypeParameterName();
idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java
+2 -2
View File
@@ -129,7 +129,7 @@ public class JetLineMarkerProvider implements LineMarkerProvider {
new Function<PsiElement, String>() { new Function<PsiElement, String>() {
@Override @Override
public String fun(PsiElement element) { public String fun(PsiElement element) {
return countTooltipString(element); return calculateTooltipString(element);
} }
}, },
new GutterIconNavigationHandler<PsiElement>() { new GutterIconNavigationHandler<PsiElement>() {
@@ -184,7 +184,7 @@ public class JetLineMarkerProvider implements LineMarkerProvider {
} }
} }
private static String countTooltipString(PsiElement element) { private static String calculateTooltipString(PsiElement element) {
JetFile file = (JetFile)element.getContainingFile(); JetFile file = (JetFile)element.getContainingFile();
if (file == null) return ""; if (file == null) return "";