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

Moved function

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-05-11 19:07:02 +03:00
parent 4488a6719d
commit cb320bc0ac
5 changed files with 27 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt
+24 -1
View File
@@ -70,4 +70,27 @@ fun JetCallableDeclaration.canRemoveTypeSpecificationByVisibility(): Boolean {
val isOverride = getModifierList()?.hasModifier(JetTokens.OVERRIDE_KEYWORD) ?: false
if (!isOverride && (descriptor as? DeclarationDescriptorWithVisibility)?.getVisibility()?.isPublicAPI() ?: false) return false
return true
}
}
// returns assignment which replaces initializer
fun splitPropertyDeclaration(property: JetProperty): JetBinaryExpression {
val parent = property.getParent()!!
val initializer = property.getInitializer()!!
val explicitTypeToSet = if (property.getTypeReference() != null) null else initializer.analyze().getType(initializer)
val psiFactory = JetPsiFactory(property)
var assignment = psiFactory.createExpressionByPattern("$0 = $1", property.getName()!!, initializer)
assignment = parent.addAfter(assignment, property) as JetBinaryExpression
parent.addAfter(psiFactory.createNewLine(), property)
property.setInitializer(null)
if (explicitTypeToSet != null) {
property.setType(explicitTypeToSet)
}
return assignment
}
idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToIfIntention.kt
+1 -1
View File
@@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor
import com.intellij.openapi.util.TextRange
import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
import org.jetbrains.kotlin.idea.intentions.branchedTransformations.BranchedUnfoldingUtils
import org.jetbrains.kotlin.idea.intentions.declarations.splitPropertyDeclaration
import org.jetbrains.kotlin.idea.intentions.splitPropertyDeclaration
import org.jetbrains.kotlin.psi.JetIfExpression
import org.jetbrains.kotlin.psi.JetProperty
idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToWhenIntention.kt
+1 -1
View File
@@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor
import com.intellij.openapi.util.TextRange
import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
import org.jetbrains.kotlin.idea.intentions.branchedTransformations.BranchedUnfoldingUtils
import org.jetbrains.kotlin.idea.intentions.declarations.splitPropertyDeclaration
import org.jetbrains.kotlin.idea.intentions.splitPropertyDeclaration
import org.jetbrains.kotlin.psi.JetProperty
import org.jetbrains.kotlin.psi.JetPsiUtil
import org.jetbrains.kotlin.psi.JetWhenExpression
idea/src/org/jetbrains/kotlin/idea/intentions/declarations/DeclarationUtils.kt
-48
View File
@@ -1,48 +0,0 @@
/*
* Copyright 2010-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.idea.intentions.declarations
import com.intellij.psi.PsiDocumentManager
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.intentions.setType
import org.jetbrains.kotlin.psi.JetBinaryExpression
import org.jetbrains.kotlin.psi.JetProperty
import org.jetbrains.kotlin.psi.JetPsiFactory
import org.jetbrains.kotlin.psi.createExpressionByPattern
// returns assignment which replaces initializer
public fun splitPropertyDeclaration(property: JetProperty): JetBinaryExpression {
val parent = property.getParent()!!
val initializer = property.getInitializer()!!
val explicitTypeToSet = if (property.getTypeReference() != null) null else initializer.analyze().getType(initializer)
val psiFactory = JetPsiFactory(property)
var assignment = psiFactory.createExpressionByPattern("$0 = $1", property.getName()!!, initializer)
assignment = parent.addAfter(assignment, property) as JetBinaryExpression
parent.addAfter(psiFactory.createNewLine(), property)
property.setInitializer(null)
if (explicitTypeToSet != null) {
property.setType(explicitTypeToSet)
}
return assignment
}
idea/src/org/jetbrains/kotlin/idea/intentions/declarations/SplitPropertyDeclarationIntention.kt
+1
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.idea.intentions.declarations
import com.intellij.openapi.editor.Editor
import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingOffsetIndependentIntention
import org.jetbrains.kotlin.idea.intentions.splitPropertyDeclaration
import org.jetbrains.kotlin.psi.JetProperty
public class SplitPropertyDeclarationIntention : JetSelfTargetingOffsetIndependentIntention<JetProperty>(javaClass(), "Split property declaration") {