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

Support multi-module configuration in Android plugin

Browse Source
This commit is contained in:
Yan Zhulanow
2014-12-29 14:58:05 +03:00
parent 438d2ee5fa
commit 4f9aba2cdc
48 changed files with 150 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt
+4 -3
View File
@@ -50,6 +50,7 @@ import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyClassDescriptor
import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor
import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.LazyJavaClassDescriptor
import org.jetbrains.jet.lang.resolve.DescriptorUtils
import org.jetbrains.jet.analyzer.ModuleInfo
public object AndroidConfigurationKeys {
@@ -79,8 +80,8 @@ public class AndroidCommandLineProcessor : CommandLineProcessor {
}
}
public class AndroidDeclarationsProvider(private val project: Project) : ExternalDeclarationsProvider {
override fun getExternalDeclarations(): Collection<JetFile> {
public class CliAndroidDeclarationsProvider(private val project: Project) : ExternalDeclarationsProvider {
override fun getExternalDeclarations(moduleInfo: ModuleInfo?): Collection<JetFile> {
val parser = ServiceManager.getService<AndroidUIXmlProcessor>(project, javaClass<AndroidUIXmlProcessor>())
return emptyOrSingletonList(parser?.parseToPsi(project))
}
@@ -219,7 +220,7 @@ public class AndroidComponentRegistrar : ComponentRegistrar {
val androidManifest = configuration.get(AndroidConfigurationKeys.ANDROID_MANIFEST)
project.registerService(javaClass<AndroidUIXmlProcessor>(), CliAndroidUIXmlProcessor(project, androidResPath, androidManifest))
ExternalDeclarationsProvider.registerExtension(project, AndroidDeclarationsProvider(project))
ExternalDeclarationsProvider.registerExtension(project, CliAndroidDeclarationsProvider(project))
ExpressionCodegenExtension.registerExtension(project, AndroidExpressionCodegen())
}
}
plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUIXmlProcessor.kt
+2
View File
@@ -47,6 +47,8 @@ import java.util.Queue
import com.intellij.psi.PsiFile
import com.intellij.openapi.diagnostic.Logger
import org.jetbrains.jet.lang.resolve.android.AndroidConst.*
import org.jetbrains.jet.analyzer.ModuleInfo
import com.intellij.openapi.module.Module
public abstract class AndroidUIXmlProcessor(protected val project: Project) {
plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/layout.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.myapp
package kotlinx.android.synthetic.layout
import android.app.Activity
import android.view.View
plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/layout.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.myapp
package kotlinx.android.synthetic.layout
import android.app.Activity
import android.view.View
plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/layout.kt
+1 -13
View File
@@ -1,4 +1,4 @@
package com.myapp
package kotlinx.android.synthetic.layout
import android.app.Activity
import android.view.View
@@ -16,15 +16,3 @@ val Activity.password: EditText
val Activity.login: Button
get() = findViewById(0) as Button
val Activity.frameLayout: FrameLayout
get() = findViewById(0) as FrameLayout
val Activity.passwordField: TextView
get() = findViewById(0) as TextView
val Activity.passwordCaption: EditText
get() = findViewById(0) as EditText
val Activity.loginButton: Button
get() = findViewById(0) as Button
plugins/android-compiler-plugin/testData/android/converter/simple/noIds/layout.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.myapp
package kotlinx.android.synthetic.layout
import android.app.Activity
import android.view.View
plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/layout.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.myapp
package kotlinx.android.synthetic.layout
import android.app.Activity
import android.view.View
plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/0.kt
+1
View File
@@ -4,6 +4,7 @@ import android.app.Activity
import android.view.View
import android.widget.*
import org.my.cool.MyButton
import kotlinx.android.synthetic.layout.*
class R {
class id {
plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/1.kt
+1
View File
@@ -4,6 +4,7 @@ import android.app.Activity
import android.view.View
import android.widget.*
import org.my.cool.MyButton
import kotlinx.android.synthetic.layout.*
class R {
class id {
plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/0.kt
+1
View File
@@ -4,6 +4,7 @@ import android.app.Activity
import android.view.View
import android.widget.*
import org.my.cool.MyButton
import kotlinx.android.synthetic.layout.*
class R {
class id {
plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/1.kt
+1
View File
@@ -4,6 +4,7 @@ import android.app.Activity
import android.view.View
import android.widget.*
import org.my.cool.MyButton
import kotlinx.android.synthetic.layout.*
class R {
class id {
plugins/android-compiler-plugin/testData/codegen/android/multiFile/0.kt
+2
View File
@@ -3,6 +3,8 @@ package com.myapp
import android.app.Activity
import android.view.View
import android.widget.*
import kotlinx.android.synthetic.layout.*
import kotlinx.android.synthetic.layout1.*
class R {
class id {
plugins/android-compiler-plugin/testData/codegen/android/multiFile/1.kt
+2
View File
@@ -3,6 +3,8 @@ package com.myapp
import android.app.Activity
import android.view.View
import android.widget.*
import kotlinx.android.synthetic.layout.*
import kotlinx.android.synthetic.layout1.*
class R {
class id {
plugins/android-compiler-plugin/testData/codegen/android/singleFile/0.kt
+1
View File
@@ -3,6 +3,7 @@ package com.myapp
import android.app.Activity
import android.view.View
import android.widget.*
import kotlinx.android.synthetic.layout.*
class R {
class id {
plugins/android-compiler-plugin/testData/codegen/android/singleFile/1.kt
+1
View File
@@ -3,6 +3,7 @@ package com.myapp
import android.app.Activity
import android.view.View
import android.widget.*
import kotlinx.android.synthetic.layout.*
class R {
class id {
plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttr/fqNameInAttr.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package com.myapp
import android.app.Activity
import kotlinx.android.synthetic.layout.*
class MyActivity: Activity() {
val button = this.MyButton
plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTag/fqNameInTag.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package com.myapp
import android.app.Activity
import kotlinx.android.synthetic.layout.*
class MyActivity: Activity() {
val button = this.MyButton
plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/multiFile.kt
+2
View File
@@ -1,6 +1,8 @@
package com.myapp
import android.app.Activity
import kotlinx.android.synthetic.layout.*
import kotlinx.android.synthetic.layout1.*
class MyActivity: Activity() {
val button = this.login
plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/simple.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package com.myapp
import android.app.Activity
import android.os.Bundle
import java.io.File
import kotlinx.android.synthetic.layout.*
public class MyActivity : Activity() {
{login}
plugins/android-compiler-plugin/tests/org/jetbrains/jet/lang/resolve/android/test/CompilerTestUtils.kt
+4 -3
View File
@@ -28,13 +28,14 @@ import org.jetbrains.kotlin.android.AndroidExpressionCodegen
import org.jetbrains.jet.config.CompilerConfiguration
import com.intellij.testFramework.UsefulTestCase
import org.jetbrains.jet.lang.resolve.android.CliAndroidUIXmlProcessor
import org.jetbrains.jet.analyzer.ModuleInfo
private class AndroidTestDeclarationsProvider(
private class AndroidTestExternalDeclarationsProvider(
val project: Project,
val resPath: String,
val manifestPath: String
) : ExternalDeclarationsProvider {
override fun getExternalDeclarations(): Collection<JetFile> {
override fun getExternalDeclarations(moduleInfo: ModuleInfo?): Collection<JetFile> {
val parser = CliAndroidUIXmlProcessor(project, resPath, manifestPath)
return emptyOrSingletonList(parser.parseToPsi(project))
}
@@ -49,7 +50,7 @@ fun UsefulTestCase.createAndroidTestEnvironment(
configuration.put(AndroidConfigurationKeys.ANDROID_MANIFEST, manifestPath)
val myEnvironment = JetCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
val project = myEnvironment.getProject()
ExternalDeclarationsProvider.registerExtension(project, AndroidTestDeclarationsProvider(project, resPath, manifestPath))
ExternalDeclarationsProvider.registerExtension(project, AndroidTestExternalDeclarationsProvider(project, resPath, manifestPath))
ExpressionCodegenExtension.registerExtension(project, AndroidExpressionCodegen())
return myEnvironment
}