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

Do not pass resource manager to AndroidXmlVisitor and AndroidXmlHandler

Browse Source
This commit is contained in:
Yan Zhulanow
2015-02-27 21:05:49 +03:00
parent 13fee64003
commit c56347058f
5 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidXmlHandler.kt
+1 -4
View File
@@ -20,10 +20,7 @@ import org.xml.sax.helpers.DefaultHandler
import org.xml.sax.Attributes
import java.util.HashMap
class AndroidXmlHandler(
private val resourceManager: AndroidResourceManager,
private val elementCallback: (String, String) -> Unit
) : DefaultHandler() {
class AndroidXmlHandler(private val elementCallback: (String, String) -> Unit) : DefaultHandler() {
override fun startDocument() {
super<DefaultHandler>.startDocument()
plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/CliAndroidUIXmlProcessor.kt
+1 -1
View File
@@ -40,7 +40,7 @@ public class CliAndroidUIXmlProcessor(
override fun parseSingleFile(file: PsiFile): Collection<AndroidWidget> {
val widgets: MutableCollection<AndroidWidget> = ArrayList()
val handler = AndroidXmlHandler(resourceManager, { id, clazz -> widgets.add(AndroidWidget(id, clazz)) })
val handler = AndroidXmlHandler { id, clazz -> widgets.add(AndroidWidget(id, clazz)) }
try {
val inputStream = ByteArrayInputStream(file.getVirtualFile().contentsToByteArray())
plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidXmlVisitor.kt
+5 -6
View File
@@ -26,10 +26,7 @@ import org.jetbrains.kotlin.lang.resolve.android.AndroidConst
import org.jetbrains.kotlin.lang.resolve.android
import org.jetbrains.kotlin.lang.resolve.android.idToName
class AndroidXmlVisitor(
val resourceManager: AndroidResourceManager,
val elementCallback: (String, String, XmlAttribute) -> Unit
) : XmlElementVisitor() {
class AndroidXmlVisitor(val elementCallback: (String, String, XmlAttribute) -> Unit) : XmlElementVisitor() {
override fun visitElement(element: PsiElement) {
element.acceptChildren(this)
@@ -45,8 +42,10 @@ class AndroidXmlVisitor(
val attributeValue = attribute.getValue()
if (attributeValue != null) {
val classNameAttr = tag?.getAttribute(AndroidConst.CLASS_ATTRIBUTE_NO_NAMESPACE)?.getValue() ?: tag?.getLocalName()
val name = idToName(attributeValue)
if (name != null) elementCallback(name, classNameAttr!!, attribute)
if (classNameAttr != null) {
val name = idToName(attributeValue)
if (name != null) elementCallback(name, classNameAttr!!, attribute)
}
}
}
tag?.acceptChildren(this)
plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/IDEAndroidResourceManager.kt
+1 -1
View File
@@ -31,7 +31,7 @@ public class IDEAndroidResourceManager(val module: Module) : AndroidResourceMana
override fun idToXmlAttribute(id: String): PsiElement? {
var ret: PsiElement? = null
for (file in getLayoutXmlFiles()) {
file.accept(AndroidXmlVisitor(this, { retId, wClass, valueElement ->
file.accept(AndroidXmlVisitor({ retId, wClass, valueElement ->
if (retId == id) ret = valueElement
}))
}
plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/IDEAndroidUIXmlProcessor.kt
+1 -1
View File
@@ -35,7 +35,7 @@ class IDEAndroidUIXmlProcessor(val module: Module) : AndroidUIXmlProcessor(modul
override fun parseSingleFile(file: PsiFile): List<AndroidWidget> {
val widgets = arrayListOf<AndroidWidget>()
file.accept(AndroidXmlVisitor(resourceManager, { id, wClass, valueElement ->
file.accept(AndroidXmlVisitor({ id, wClass, valueElement ->
widgets.add(AndroidWidget(id, wClass))
}))