Removed methods not need anymore

This commit is contained in:
Valentin Kipyatkov
2015-03-26 14:34:32 +03:00
parent fb4075cc2f
commit 16295b875b
3 changed files with 2 additions and 5 deletions
@@ -123,7 +123,7 @@ class ForConverter(
private fun convertToForeach(): ForeachStatement? {
if (initialization is PsiDeclarationStatement) {
val loopVar = initialization.getDeclaredElements().singleOrNull2() as? PsiLocalVariable
val loopVar = initialization.getDeclaredElements().singleOrNull() as? PsiLocalVariable
if (loopVar != null
&& !loopVar.hasWriteAccesses(referenceSearcher, body)
&& !loopVar.hasWriteAccesses(referenceSearcher, condition)
@@ -93,7 +93,7 @@ class SwitchConverter(private val codeConverter: CodeConverter) {
false
}
else {
val block = case.statements.singleOrNull2() as? PsiBlockStatement
val block = case.statements.singleOrNull() as? PsiBlockStatement
val statements = if (block != null) block.getCodeBlock().getStatements().toList() else case.statements
!statements.any { it is PsiBreakStatement || it is PsiContinueStatement || it is PsiReturnStatement || it is PsiThrowStatement }
}
@@ -120,9 +120,6 @@ fun PsiModifierListOwner.accessModifier(): String = when {
fun PsiMethod.isMainMethod(): Boolean = PsiMethodUtil.isMainMethod(this)
fun <T: Any> List<T>.singleOrNull2(): T? = if (size() == 1) this[0] else null
fun <T: Any> Array<T>.singleOrNull2(): T? = if (size() == 1) this[0] else null
fun PsiMember.isImported(file: PsiJavaFile): Boolean {
if (this is PsiClass) {
val fqName = getQualifiedName()