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

reformat code, optimize imports

Browse Source
This commit is contained in:
Mikhail Mutcianko
2014-07-31 12:28:33 +04:00
committed by Yan Zhulanow
parent 2f97e7fadb
commit 395959bf21
9 changed files with 37 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/android/AndroidGotoDeclarationHandler.kt
+3 -6
View File
@@ -20,15 +20,11 @@ import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler
import com.intellij.psi.PsiElement
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.actionSystem.DataContext
import org.jetbrains.jet.lang.psi.JetProperty
import com.intellij.openapi.components.ServiceManager
import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlParser
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.psi.PsiReferenceExpression
import com.intellij.psi.PsiIdentifier
import com.intellij.psi.impl.source.tree.LeafPsiElement
public class AndroidGotoDeclarationHandler: GotoDeclarationHandler {
public class AndroidGotoDeclarationHandler : GotoDeclarationHandler {
override fun getGotoDeclarationTargets(sourceElement: PsiElement?, offset: Int, editor: Editor?): Array<PsiElement>? {
if (sourceElement is LeafPsiElement) {
val parser = ServiceManager.getService(sourceElement.getProject(), javaClass<AndroidUIXmlParser>())
@@ -37,7 +33,8 @@ public class AndroidGotoDeclarationHandler: GotoDeclarationHandler {
return array(psiElement)
}
else return null
} else return null
}
else return null
}
override fun getActionText(context: DataContext?): String? {
idea/src/org/jetbrains/jet/plugin/android/AndroidXmlVisitor.kt
+1 -1
View File
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement
import com.intellij.psi.xml.XmlElement
import com.intellij.psi.xml.XmlTag
class AndroidXmlVisitor(val elementCallback: (String, String)-> Unit): XmlElementVisitor() {
class AndroidXmlVisitor(val elementCallback: (String, String) -> Unit) : XmlElementVisitor() {
override fun visitElement(element: PsiElement) {
element.acceptChildren(this)
idea/src/org/jetbrains/jet/plugin/android/IDEAndroidUIXmlParser.kt
+3 -7
View File
@@ -18,10 +18,7 @@ package org.jetbrains.jet.plugin.android
import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlParser
import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFileManager
import java.util.ArrayList
import com.intellij.openapi.vfs.VirtualFileAdapter
import com.intellij.openapi.vfs.VirtualFileEvent
import com.intellij.psi.PsiFile
import org.jetbrains.jet.lang.resolve.android.AndroidWidget
import org.jetbrains.jet.lang.resolve.android.KotlinStringWriter
@@ -30,9 +27,8 @@ import com.intellij.psi.XmlElementVisitor
import com.intellij.psi.xml.XmlTag
import com.intellij.psi.PsiElement
import java.util.HashMap
import com.intellij.psi.xml.XmlAttribute
class IDEAndroidUIXmlParser(val project: Project): AndroidUIXmlParser() {
class IDEAndroidUIXmlParser(val project: Project) : AndroidUIXmlParser() {
override val searchPath: String? = project.getBasePath() + "/res/layout/"
override var androidAppPackage: String = ""
@@ -74,7 +70,7 @@ class IDEAndroidUIXmlParser(val project: Project): AndroidUIXmlParser() {
override fun parseSingleFileImpl(file: PsiFile): String {
val ids: MutableCollection<AndroidWidget> = ArrayList()
file.accept(AndroidXmlVisitor({ id, wClass -> ids.add(AndroidWidget(id, wClass))}))
file.accept(AndroidXmlVisitor({ id, wClass -> ids.add(AndroidWidget(id, wClass)) }))
return produceKotlinProperties(KotlinStringWriter(), ids).toString()
}
@@ -89,7 +85,7 @@ class IDEAndroidUIXmlParser(val project: Project): AndroidUIXmlParser() {
val idPrefix = "@+id/"
val attribute = tag?.getAttribute("android:id")
if (attribute != null && attribute.getValue() == idPrefix + oldName) {
allRenames[XmlAttributeValueWrapper(attribute.getValueElement()!!)] = idPrefix+newName
allRenames[XmlAttributeValueWrapper(attribute.getValueElement()!!)] = idPrefix + newName
}
tag?.acceptChildren(this)
}
idea/src/org/jetbrains/jet/plugin/android/XmlAttributeValueWrapper.java
+2 -17
View File
@@ -30,13 +30,9 @@ import com.intellij.psi.scope.PsiScopeProcessor;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.PsiElementProcessor;
import com.intellij.psi.search.SearchScope;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.xml.XmlAttribute;
import com.intellij.psi.xml.XmlAttributeValue;
import com.intellij.psi.xml.XmlTag;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.xml.DomElement;
import com.intellij.util.xml.DomManager;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -384,25 +380,14 @@ public class XmlAttributeValueWrapper implements XmlAttributeValue, PsiNamedElem
@Override
public String getName() {
String value = myWrappee.getValue();
return ((NavigationItem) myWrappee).getName();
}
@Override
@Nullable
public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException {
//if (AndroidResourceUtil.isIdDeclaration(myWrappee)) {
XmlAttribute attribute = (XmlAttribute) myWrappee.getParent();
attribute.setValue(name);
//}
//else {
// // then it is a value resource
// XmlTag tag = PsiTreeUtil.getParentOfType(myWrappee, XmlTag.class);
// DomElement domElement = DomManager.getDomManager(getProject()).getDomElement(tag);
// assert domElement instanceof ResourceElement;
// ResourceElement resElement = (ResourceElement) domElement;
// resElement.getName().setValue(name);
//}
XmlAttribute attribute = (XmlAttribute) myWrappee.getParent();
attribute.setValue(name);
return null;
}