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

Fix warnings

Browse Source
This commit is contained in:
Alexey Sedunov
2014-01-13 17:13:30 +04:00
parent b1c3dc9a48
commit f30d4f042e
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/psiUtil/jetPsiUtil.kt
+1 -1
View File
@@ -87,7 +87,7 @@ fun JetClassOrObject.effectiveDeclarations(): List<JetDeclaration> =
fun JetClass.isAbstract() = isTrait() || hasModifier(JetTokens.ABSTRACT_KEYWORD) fun JetClass.isAbstract() = isTrait() || hasModifier(JetTokens.ABSTRACT_KEYWORD)
[suppress("UNCHECKED_CAST")] [suppress("UNCHECKED_CAST")]
fun <T: PsiElement> PsiElement.replaced(newElement: T): T = replace(newElement)!! as T fun <T: PsiElement> PsiElement.replaced(newElement: T): T = replace(newElement) as T
fun JetElement.blockExpressionsOrSingle(): Iterator<JetElement> = fun JetElement.blockExpressionsOrSingle(): Iterator<JetElement> =
if (this is JetBlockExpression) getStatements().iterator() else SingleIterator(this) if (this is JetBlockExpression) getStatements().iterator() else SingleIterator(this)
idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class KotlinCallHierarchyNodeDescriptor extends HierarchyNodeDescriptor i
@Override @Override
public final boolean isValid(){ public final boolean isValid(){
return myElement != null && myElement.isValid(); return myElement.isValid();
} }
@Override @Override
idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java
+6 -10
View File
@@ -23,7 +23,6 @@ import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiClass; import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiMethod;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
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;
@@ -93,8 +92,9 @@ public class KotlinCalleeMethodsTreeStructure extends KotlinCallTreeStructure {
return result; return result;
} }
@NotNull
@Override @Override
protected Object[] buildChildren(HierarchyNodeDescriptor descriptor) { protected Object[] buildChildren(@NotNull HierarchyNodeDescriptor descriptor) {
PsiElement targetElement = getTargetElement(descriptor); PsiElement targetElement = getTargetElement(descriptor);
// Kotlin class constructor invoked from Java code // Kotlin class constructor invoked from Java code
@@ -118,14 +118,10 @@ public class KotlinCalleeMethodsTreeStructure extends KotlinCallTreeStructure {
return buildChildrenByKotlinTarget(descriptor, (JetElement) targetElement); return buildChildrenByKotlinTarget(descriptor, (JetElement) targetElement);
} }
if (javaTreeStructure != null) { CallHierarchyNodeDescriptor javaDescriptor = descriptor instanceof CallHierarchyNodeDescriptor
CallHierarchyNodeDescriptor javaDescriptor = descriptor instanceof CallHierarchyNodeDescriptor ? (CallHierarchyNodeDescriptor) descriptor
? (CallHierarchyNodeDescriptor) descriptor : ((KotlinCallHierarchyNodeDescriptor)descriptor).getJavaDelegate();
: ((KotlinCallHierarchyNodeDescriptor)descriptor).getJavaDelegate(); return javaTreeStructure.getChildElements(javaDescriptor);
return javaTreeStructure.getChildElements(javaDescriptor);
}
return ArrayUtil.EMPTY_OBJECT_ARRAY;
} }
private Object[] buildChildrenByKotlinTarget(HierarchyNodeDescriptor descriptor, JetElement targetElement) { private Object[] buildChildrenByKotlinTarget(HierarchyNodeDescriptor descriptor, JetElement targetElement) {
idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java
+5 -3
View File
@@ -57,8 +57,9 @@ public abstract class KotlinCallerMethodsTreeStructure extends KotlinCallTreeStr
this.codeBlockForLocalDeclaration = codeBlockForLocalDeclaration; this.codeBlockForLocalDeclaration = codeBlockForLocalDeclaration;
} }
@NotNull
@Override @Override
protected Object[] buildChildren(HierarchyNodeDescriptor descriptor) { protected Object[] buildChildren(@NotNull HierarchyNodeDescriptor descriptor) {
final PsiElement element = getTargetElement(descriptor); final PsiElement element = getTargetElement(descriptor);
BindingContext bindingContext = BindingContext bindingContext =
@@ -97,8 +98,9 @@ public abstract class KotlinCallerMethodsTreeStructure extends KotlinCallTreeStr
this.javaTreeStructure = new CallerMethodsTreeStructure(project, basePsiMethod, scopeType); this.javaTreeStructure = new CallerMethodsTreeStructure(project, basePsiMethod, scopeType);
} }
@NotNull
@Override @Override
protected Object[] buildChildren(HierarchyNodeDescriptor descriptor) { protected Object[] buildChildren(@NotNull HierarchyNodeDescriptor descriptor) {
PsiElement element = getTargetElement(descriptor); PsiElement element = getTargetElement(descriptor);
SearchScope searchScope = getSearchScope(scopeType, basePsiClass); SearchScope searchScope = getSearchScope(scopeType, basePsiClass);
@@ -106,7 +108,7 @@ public abstract class KotlinCallerMethodsTreeStructure extends KotlinCallTreeStr
new HashMap<PsiElement, HierarchyNodeDescriptor>(); new HashMap<PsiElement, HierarchyNodeDescriptor>();
Object[] javaCallers = null; Object[] javaCallers = null;
if (element instanceof PsiMethod && javaTreeStructure != null) { if (element instanceof PsiMethod) {
javaCallers = javaTreeStructure.getChildElements(getJavaNodeDescriptor(descriptor)); javaCallers = javaTreeStructure.getChildElements(getJavaNodeDescriptor(descriptor));
processPsiMethodCallers((PsiMethod) element, descriptor, methodToDescriptorMap, searchScope, true); processPsiMethodCallers((PsiMethod) element, descriptor, methodToDescriptorMap, searchScope, true);
} }