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

correct interpretation of android id usage mixed with id declarations

Browse Source
This commit is contained in:
Mikhail Mutcianko
2014-08-08 14:42:23 +04:00
committed by Yan Zhulanow
parent 8e8b626994
commit 85e18a3d73
7 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/android/AndroidGotoDeclarationHandler.kt
-4
View File
@@ -23,14 +23,10 @@ import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.components.ServiceManager
import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor
import com.intellij.psi.impl.source.tree.LeafPsiElement
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.psi.PsiReferenceExpression
import org.jetbrains.jet.plugin.references.JetSimpleNameReference
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression
import org.jetbrains.jet.lang.psi.JetProperty
import com.intellij.psi.impl.light.LightElement
import org.jetbrains.android.augment.AndroidInternalRClass
import com.intellij.psi.xml.XmlAttributeValue
import com.intellij.psi.xml.XmlAttribute
public class AndroidGotoDeclarationHandler : GotoDeclarationHandler {
idea/src/org/jetbrains/jet/plugin/android/AndroidRenameProcessor.kt
+1 -1
View File
@@ -55,7 +55,7 @@ public class AndroidRenameProcessor : RenamePsiElementProcessor() {
val processor = ServiceManager.getService(jetProperty.getProject(), javaClass<AndroidUIXmlProcessor>())
val resourceManager = processor!!.resourceManager
val attr = resourceManager.idToXmlAttribute(oldName) as XmlAttribute
allRenames[XmlAttributeValueWrapper(attr.getValueElement()!!)] = resourceManager.nameToId(newName!!)
allRenames[XmlAttributeValueWrapper(attr.getValueElement()!!)] = resourceManager.nameToIdDeclaration(newName!!)
val name = AndroidResourceUtil.getResourceNameByReferenceText(newName)
for (resField in AndroidResourceUtil.findIdFields(attr)) {
allRenames.put(resField, AndroidResourceUtil.getFieldNameByResourceName(name!!))
idea/src/org/jetbrains/jet/plugin/android/AndroidXmlVisitor.kt
+4 -4
View File
@@ -21,8 +21,9 @@ import com.intellij.psi.PsiElement
import com.intellij.psi.xml.XmlElement
import com.intellij.psi.xml.XmlTag
import com.intellij.psi.xml.XmlAttribute
import org.jetbrains.jet.lang.resolve.android.AndroidResourceManager
class AndroidXmlVisitor(val elementCallback: (String, String, XmlAttribute) -> Unit) : XmlElementVisitor() {
class AndroidXmlVisitor(val resourceManager: AndroidResourceManager, val elementCallback: (String, String, XmlAttribute) -> Unit) : XmlElementVisitor() {
override fun visitElement(element: PsiElement) {
element.acceptChildren(this)
@@ -33,10 +34,9 @@ class AndroidXmlVisitor(val elementCallback: (String, String, XmlAttribute) -> U
}
override fun visitXmlTag(tag: XmlTag?) {
val idPrefix = "@+id/"
val attribute = tag?.getAttribute("android:id")
val attribute = tag?.getAttribute(resourceManager.idAttribute)
if (attribute != null && attribute.getValue() != null) {
elementCallback(attribute.getValue()!!.replace(idPrefix, ""), tag!!.getLocalName(), attribute)
elementCallback(resourceManager.idToName(attribute.getValue()), tag!!.getLocalName(), attribute)
}
tag?.acceptChildren(this)
}
idea/src/org/jetbrains/jet/plugin/android/IDEAndroidUIXmlProcessor.kt
+2 -2
View File
@@ -39,10 +39,10 @@ class IDEAndroidUIXmlProcessor(project: Project) : AndroidUIXmlProcessor(project
override fun parseSingleFileImpl(file: PsiFile): String {
val ids: MutableCollection<AndroidWidget> = ArrayList()
resourceManager.resetAttributeCache()
file.accept(AndroidXmlVisitor { id, wClass, valueElement ->
file.accept(AndroidXmlVisitor(resourceManager, { id, wClass, valueElement ->
ids.add(AndroidWidget(id, wClass))
resourceManager.addMapping(id, valueElement)
})
}))
return produceKotlinProperties(KotlinStringWriter(), ids).toString()
}
}