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

Moved and renamed class + added check for JetFile

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-10-01 15:51:39 +04:00
parent 593e93b88b
commit 53983774d0
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/META-INF/plugin.xml
+1 -1
View File
@@ -431,7 +431,7 @@
implementation="org.jetbrains.jet.plugin.codeInsight.upDownMover.JetDeclarationMover"
order="before jetExpression" />
<joinLinesHandler implementation="org.jetbrains.jet.plugin.intentions.declarations.JetDeclarationJoinLinesHandler"/>
<joinLinesHandler implementation="org.jetbrains.jet.plugin.joinLines.JoinDeclarationAndAssignmentHandler"/>
<targetElementEvaluator
language="jet"
idea/src/org/jetbrains/jet/plugin/intentions/declarations/JetDeclarationJoinLinesHandler.kt → idea/src/org/jetbrains/jet/plugin/joinLines/JoinDeclarationAndAssignmentHandler.kt
+10 -8
View File
@@ -14,25 +14,27 @@
* limitations under the License.
*/
package org.jetbrains.jet.plugin.intentions.declarations
package org.jetbrains.jet.plugin.joinLines
import org.jetbrains.jet.lang.psi.psiUtil.siblings
import org.jetbrains.jet.lang.psi.psiUtil.parents
import com.intellij.codeInsight.editorActions.JoinRawLinesHandlerDelegate
import com.intellij.openapi.editor.Document
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import org.jetbrains.jet.lang.psi.JetPsiUtil
import org.jetbrains.jet.lang.psi.psiUtil.*
import org.jetbrains.jet.lang.psi.JetFile
import com.intellij.psi.PsiElement
import org.jetbrains.jet.lang.psi.JetProperty
import org.jetbrains.jet.lang.psi.JetBinaryExpression
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression
import org.jetbrains.jet.lexer.JetTokens
import com.intellij.psi.PsiWhiteSpace
import com.intellij.psi.PsiComment
import com.google.common.base.Predicate
import org.jetbrains.jet.lexer.JetTokens
public class JetDeclarationJoinLinesHandler : JoinRawLinesHandlerDelegate {
public class JoinDeclarationAndAssignmentHandler : JoinRawLinesHandlerDelegate {
override fun tryJoinRawLines(document: Document, file: PsiFile, start: Int, end: Int): Int {
if (file !is JetFile) return -1
val element = file.findElementAt(start)
?.siblings(forward = false, withItself = false)
?.firstOrNull { !isToSkip(it) } ?: return -1
@@ -67,7 +69,7 @@ public class JetDeclarationJoinLinesHandler : JoinRawLinesHandlerDelegate {
private fun doJoin(property: JetProperty, assignment: JetBinaryExpression) {
property.setInitializer(assignment.getRight())
property.getParent()!!.deleteChildRange(property.getNextSibling(), assignment) //TODO: should we remove range?
property.getParent()!!.deleteChildRange(property.getNextSibling(), assignment) //TODO: should we delete range?
}
private fun isToSkip(element: PsiElement)