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

Better code in j2k

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-05-06 14:11:04 +03:00
parent 709573db69
commit 830e3ba073
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/kotlin/j2k/ConstructorConverter.kt
+1 -1
View File
@@ -265,7 +265,7 @@ class ConstructorConverter(
if (target is PsiParameter) { if (target is PsiParameter) {
val scope = target.getDeclarationScope() val scope = target.getDeclarationScope()
// we do not check for exactly this constructor because default values reference parameters in other constructors // we do not check for exactly this constructor because default values reference parameters in other constructors
if (scope.isConstructor() && scope.getParent() == psiClass) { if (scope is PsiMember && scope.isConstructor() && scope.getParent() == psiClass) {
return Identifier(replacement, codeConverter.typeConverter.variableNullability(target).isNullable(codeConverter.settings)) return Identifier(replacement, codeConverter.typeConverter.variableNullability(target).isNullable(codeConverter.settings))
} }
} }
j2k/src/org/jetbrains/kotlin/j2k/Utils.kt
+4 -4
View File
@@ -92,8 +92,8 @@ fun PsiElement.isInSingleLine(): Boolean {
var child = getFirstChild() var child = getFirstChild()
while (child != null) { while (child != null) {
if (!child!!.isInSingleLine()) return false if (!child.isInSingleLine()) return false
child = child!!.getNextSibling() child = child.getNextSibling()
} }
return true return true
} }
@@ -102,7 +102,7 @@ fun PsiElement.isInSingleLine(): Boolean {
fun PsiElement.getContainingMethod(): PsiMethod? { fun PsiElement.getContainingMethod(): PsiMethod? {
var context = getContext() var context = getContext()
while (context != null) { while (context != null) {
val _context = context!! val _context = context
if (_context is PsiMethod) return _context if (_context is PsiMethod) return _context
context = _context.getContext() context = _context.getContext()
} }
@@ -114,7 +114,7 @@ fun PsiElement.getContainingConstructor(): PsiMethod? {
return if (method?.isConstructor() == true) method else null return if (method?.isConstructor() == true) method else null
} }
fun PsiElement.isConstructor(): Boolean = this is PsiMethod && this.isConstructor() fun PsiMember.isConstructor(): Boolean = this is PsiMethod && this.isConstructor()
fun PsiModifierListOwner.accessModifier(): String = when { fun PsiModifierListOwner.accessModifier(): String = when {
hasModifierProperty(PsiModifier.PUBLIC) -> PsiModifier.PUBLIC hasModifierProperty(PsiModifier.PUBLIC) -> PsiModifier.PUBLIC