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

Moved code from DeclarationUtils and refactored code

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-10-01 15:16:21 +04:00
parent d71c481606
commit 593e93b88b
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java
-13
View File
@@ -16,16 +16,12 @@
package org.jetbrains.jet.plugin.intentions.declarations;
import com.google.common.base.Predicate;
import com.intellij.psi.PsiComment;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiWhiteSpace;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache;
import org.jetbrains.jet.renderer.DescriptorRenderer;
@@ -44,15 +40,6 @@ public class DeclarationUtils {
return property.hasInitializer() && property.isLocal();
}
public static final Predicate<PsiElement> SKIP_DELIMITERS = new Predicate<PsiElement>() {
@Override
public boolean apply(@Nullable PsiElement input) {
return input == null
|| input instanceof PsiWhiteSpace || input instanceof PsiComment
|| input.getNode().getElementType() == JetTokens.SEMICOLON;
}
};
@Nullable
private static JetType getPropertyTypeIfNeeded(@NotNull JetProperty property) {
if (property.getTypeRef() != null) return null;
idea/src/org/jetbrains/jet/plugin/intentions/declarations/JetDeclarationJoinLinesHandler.kt
+10 -2
View File
@@ -26,11 +26,16 @@ 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
public class JetDeclarationJoinLinesHandler : JoinRawLinesHandlerDelegate {
override fun tryJoinRawLines(document: Document, file: PsiFile, start: Int, end: Int): Int {
val element = JetPsiUtil.skipSiblingsBackwardByPredicate(file.findElementAt(start), DeclarationUtils.SKIP_DELIMITERS) ?: return -1
val element = file.findElementAt(start)
?.siblings(forward = false, withItself = false)
?.firstOrNull { !isToSkip(it) } ?: return -1
val pair = element.parents(withItself = true)
.map { getPropertyAndAssignment(it) }
@@ -49,7 +54,8 @@ public class JetDeclarationJoinLinesHandler : JoinRawLinesHandlerDelegate {
val property = element as? JetProperty ?: return null
if (property.hasInitializer()) return null
val assignment = JetPsiUtil.skipSiblingsForwardByPredicate(element, DeclarationUtils.SKIP_DELIMITERS) as? JetBinaryExpression ?: return null
val assignment = element.siblings(forward = true, withItself = false)
.firstOrNull { !isToSkip(it) } as? JetBinaryExpression ?: return null
if (assignment.getOperationToken() != JetTokens.EQ) return null
val left = assignment.getLeft() as? JetSimpleNameExpression ?: return null
@@ -64,4 +70,6 @@ public class JetDeclarationJoinLinesHandler : JoinRawLinesHandlerDelegate {
property.getParent()!!.deleteChildRange(property.getNextSibling(), assignment) //TODO: should we remove range?
}
private fun isToSkip(element: PsiElement)
= element is PsiWhiteSpace || element is PsiComment || element.getNode()!!.getElementType() == JetTokens.SEMICOLON
}