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

UastKotlinPsiVariable: factory methods reformatting

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2017-10-23 15:56:48 +03:00
committed by xiexed
parent 81615fa551
commit 8e17bab56f
1 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/psi/UastKotlinPsiVariable.kt
+35 -29
View File
@@ -71,8 +71,8 @@ class UastKotlinPsiVariable private constructor(
companion object {
fun create(
declaration: KtVariableDeclaration,
parent: PsiElement?,
declaration: KtVariableDeclaration,
parent: PsiElement?,
containingElement: KotlinUDeclarationsExpression,
initializer: KtExpression? = null
): PsiLocalVariable {
@@ -89,32 +89,38 @@ class UastKotlinPsiVariable private constructor(
ktElement = declaration)
}
fun create(declaration: KtDestructuringDeclaration, containingElement: UElement): PsiLocalVariable = UastKotlinPsiVariable(
manager = declaration.manager,
name = "var" + Integer.toHexString(declaration.getHashCode()),
typeProducer = { declaration.getType(containingElement) ?: UastErrorType },
ktInitializer = declaration.initializer,
psiParentProducer = { containingElement.getParentOfType<UDeclaration>()?.psi ?: declaration.parent },
containingElement = containingElement,
ktElement = declaration)
fun create(declaration: KtDestructuringDeclaration, containingElement: UElement): PsiLocalVariable =
UastKotlinPsiVariable(
manager = declaration.manager,
name = "var" + Integer.toHexString(declaration.getHashCode()),
typeProducer = { declaration.getType(containingElement) ?: UastErrorType },
ktInitializer = declaration.initializer,
psiParentProducer = { containingElement.getParentOfType<UDeclaration>()?.psi ?: declaration.parent },
containingElement = containingElement,
ktElement = declaration
)
fun create(initializer: KtExpression, containingElement: UElement, parent: PsiElement): PsiLocalVariable = UastKotlinPsiVariable(
manager = initializer.manager,
name = "var" + Integer.toHexString(initializer.getHashCode()),
typeProducer = { initializer.getType(containingElement) ?: UastErrorType },
ktInitializer = initializer,
psiParentProducer = { containingElement.getParentOfType<UDeclaration>()?.psi ?: parent },
containingElement = containingElement,
ktElement = initializer)
fun create(initializer: KtExpression, containingElement: UElement, parent: PsiElement): PsiLocalVariable =
UastKotlinPsiVariable(
manager = initializer.manager,
name = "var" + Integer.toHexString(initializer.getHashCode()),
typeProducer = { initializer.getType(containingElement) ?: UastErrorType },
ktInitializer = initializer,
psiParentProducer = { containingElement.getParentOfType<UDeclaration>()?.psi ?: parent },
containingElement = containingElement,
ktElement = initializer
)
fun create(name: String, localFunction: KtFunction, containingElement: UElement): PsiLocalVariable = UastKotlinPsiVariable(
manager = localFunction.manager,
name = name,
typeProducer = { localFunction.getFunctionType(containingElement) ?: UastErrorType },
ktInitializer = localFunction,
psiParentProducer = { containingElement.getParentOfType<UDeclaration>()?.psi ?: localFunction.parent },
containingElement = containingElement,
ktElement = localFunction)
fun create(name: String, localFunction: KtFunction, containingElement: UElement): PsiLocalVariable =
UastKotlinPsiVariable(
manager = localFunction.manager,
name = name,
typeProducer = { localFunction.getFunctionType(containingElement) ?: UastErrorType },
ktInitializer = localFunction,
psiParentProducer = { containingElement.getParentOfType<UDeclaration>()?.psi ?: localFunction.parent },
containingElement = containingElement,
ktElement = localFunction
)
}
}
@@ -141,9 +147,9 @@ private fun KtExpression.getType(parent: UElement): PsiType? =
private fun KtDeclaration.getType(parent: UElement): PsiType? {
return (analyze()[BindingContext.DECLARATION_TO_DESCRIPTOR, this] as? CallableDescriptor)
?.returnType
?.takeIf { !it.isError }
?.toPsiType(parent, this, false)
?.returnType
?.takeIf { !it.isError }
?.toPsiType(parent, this, false)
}
private fun PsiElement.getHashCode(): Int {