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

Rename AndroidExpressionCodegen to AndroidExpressionCodegenExtension

Browse Source
This commit is contained in:
Yan Zhulanow
2015-02-27 15:30:33 +03:00
parent 8760beeed1
commit 19d24c3c50
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt
+2 -2
View File
@@ -88,7 +88,7 @@ public class CliAndroidDeclarationsProvider(private val project: Project) : Exte
} }
} }
public class AndroidExpressionCodegen : ExpressionCodegenExtension { public class AndroidExpressionCodegenExtension : ExpressionCodegenExtension {
default object { default object {
private val PROPERTY_NAME = "_\$_findViewCache" private val PROPERTY_NAME = "_\$_findViewCache"
private val METHOD_NAME = "_\$_findCachedViewById" private val METHOD_NAME = "_\$_findCachedViewById"
@@ -243,7 +243,7 @@ public class AndroidComponentRegistrar : ComponentRegistrar {
project.registerService(javaClass<AndroidUIXmlProcessor>(), CliAndroidUIXmlProcessor(project, androidManifest, androidResPath)) project.registerService(javaClass<AndroidUIXmlProcessor>(), CliAndroidUIXmlProcessor(project, androidManifest, androidResPath))
ExternalDeclarationsProvider.registerExtension(project, CliAndroidDeclarationsProvider(project)) ExternalDeclarationsProvider.registerExtension(project, CliAndroidDeclarationsProvider(project))
ExpressionCodegenExtension.registerExtension(project, AndroidExpressionCodegen()) ExpressionCodegenExtension.registerExtension(project, AndroidExpressionCodegenExtension())
} }
} }
} }
plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt
+2 -2
View File
@@ -20,7 +20,7 @@ import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.extensions.ExternalDeclarationsProvider import org.jetbrains.kotlin.extensions.ExternalDeclarationsProvider
import org.jetbrains.kotlin.android.AndroidConfigurationKeys import org.jetbrains.kotlin.android.AndroidConfigurationKeys
import org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension import org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension
import org.jetbrains.kotlin.android.AndroidExpressionCodegen import org.jetbrains.kotlin.android.AndroidExpressionCodegenExtension
import com.intellij.testFramework.UsefulTestCase import com.intellij.testFramework.UsefulTestCase
import org.jetbrains.kotlin.analyzer.ModuleInfo import org.jetbrains.kotlin.analyzer.ModuleInfo
import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetFile
@@ -50,6 +50,6 @@ fun UsefulTestCase.createAndroidTestEnvironment(
val myEnvironment = JetCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) val myEnvironment = JetCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
val project = myEnvironment.getProject() val project = myEnvironment.getProject()
ExternalDeclarationsProvider.registerExtension(project, AndroidTestExternalDeclarationsProvider(project, resPath, manifestPath)) ExternalDeclarationsProvider.registerExtension(project, AndroidTestExternalDeclarationsProvider(project, resPath, manifestPath))
ExpressionCodegenExtension.registerExtension(project, AndroidExpressionCodegen()) ExpressionCodegenExtension.registerExtension(project, AndroidExpressionCodegenExtension())
return myEnvironment return myEnvironment
} }
plugins/android-idea-plugin/src/META-INF/plugin.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<extensions defaultExtensionNs="org.jetbrains.kotlin"> <extensions defaultExtensionNs="org.jetbrains.kotlin">
<externalDeclarationsProvider implementation="org.jetbrains.kotlin.plugin.android.IDEAndroidExternalDeclarationsProvider"/> <externalDeclarationsProvider implementation="org.jetbrains.kotlin.plugin.android.IDEAndroidExternalDeclarationsProvider"/>
<expressionCodegenExtension implementation="org.jetbrains.kotlin.android.AndroidExpressionCodegen"/> <expressionCodegenExtension implementation="org.jetbrains.kotlin.android.AndroidExpressionCodegenExtension"/>
<findUsagesHandlerDecorator implementation="org.jetbrains.kotlin.plugin.android.AndroidFindUsageHandlerDecorator"/> <findUsagesHandlerDecorator implementation="org.jetbrains.kotlin.plugin.android.AndroidFindUsageHandlerDecorator"/>
<simpleNameReferenceExtension implementation="org.jetbrains.kotlin.plugin.android.AndroidSimpleNameReferenceExtension"/> <simpleNameReferenceExtension implementation="org.jetbrains.kotlin.plugin.android.AndroidSimpleNameReferenceExtension"/>
</extensions> </extensions>