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

Refactor: Remove context parameter from BindingContextUtils.descriptorToDeclaration utilities family

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-07-08 18:17:04 +04:00
parent 723b3d75c9
commit d988256831
87 changed files with 225 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java
+1 -1
View File
@@ -279,7 +279,7 @@ public abstract class ExpectedResolveData {
PsiElement actual = referenceTarget == null
? bindingContext.get(BindingContext.LABEL_TARGET, referenceExpression)
: BindingContextUtils.descriptorToDeclaration(bindingContext, referenceTarget);
: BindingContextUtils.descriptorToDeclaration(referenceTarget);
if (actual instanceof JetSimpleNameExpression) {
actual = ((JetSimpleNameExpression)actual).getIdentifier();
}
compiler/tests/org/jetbrains/jet/resolve/constraintSystem/MyDeclarations.kt
+2 -2
View File
@@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.types.JetTypeImpl
import org.jetbrains.jet.lang.descriptors.annotations.Annotations
public class MyDeclarations(
private val context: BindingContext,
context: BindingContext,
private val project: Project,
private val typeResolver: TypeResolver
) {
@@ -40,7 +40,7 @@ public class MyDeclarations(
{
val functions = context.getSliceContents(BindingContext.FUNCTION)
functionFoo = findFunctionByName(functions.values(), "foo")
val function = (BindingContextUtils.descriptorToDeclaration(context, functionFoo) as JetFunction)
val function = BindingContextUtils.descriptorToDeclaration(functionFoo) as JetFunction
val fooBody = function.getBodyExpression()
scopeToResolveTypeParameters = context.get(BindingContext.RESOLUTION_SCOPE, fooBody)!!
}