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

Rename jet to kotlin in android-compiler-plugin

Browse Source
This commit is contained in:
Yan Zhulanow
2015-02-04 19:40:43 +03:00
parent b897803f5b
commit 5eec7d3ac2
21 changed files with 53 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidRenameProcessor.kt
+5 -5
View File
@@ -18,9 +18,7 @@ package org.jetbrains.jet.plugin.android
import com.intellij.psi.PsiElement
import com.intellij.refactoring.rename.RenamePsiElementProcessor
import org.jetbrains.jet.lang.resolve.android.isAndroidSyntheticElement
import com.intellij.openapi.components.ServiceManager
import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor
import com.intellij.psi.search.SearchScope
import com.intellij.psi.xml.XmlAttributeValue
import org.jetbrains.android.dom.wrappers.LazyValueResourceElementWrapper
@@ -29,11 +27,11 @@ import com.intellij.psi.xml.XmlAttribute
import com.intellij.psi.impl.light.LightElement
import com.intellij.openapi.module.ModuleServiceManager
import com.intellij.openapi.module.Module
import org.jetbrains.jet.lang.resolve.android.nameToIdDeclaration
import org.jetbrains.jet.lang.resolve.android.idToName
import org.jetbrains.kotlin.lang.resolve.android.nameToIdDeclaration
import org.jetbrains.kotlin.lang.resolve.android.idToName
import com.intellij.psi.PsiField
import com.intellij.psi.PsiClass
import org.jetbrains.jet.lang.resolve.android.AndroidConst
import org.jetbrains.kotlin.lang.resolve.android.AndroidConst
import com.intellij.openapi.module.ModuleUtil
import com.intellij.openapi.module.ModuleUtilCore
import org.jetbrains.kotlin.psi.JetProperty
@@ -42,6 +40,8 @@ import org.jetbrains.kotlin.idea.caches.resolve.getModuleInfo
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.psi.moduleInfo
import org.jetbrains.kotlin.asJava.namedUnwrappedElement
import org.jetbrains.kotlin.lang.resolve.android.isAndroidSyntheticElement
import org.jetbrains.kotlin.lang.resolve.android.AndroidUIXmlProcessor
public class AndroidRenameProcessor : RenamePsiElementProcessor() {
plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidXmlVisitor.kt
+3 -2
View File
@@ -22,8 +22,9 @@ 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
import org.jetbrains.jet.lang.resolve.android.idToName
import org.jetbrains.jet.lang.resolve.android.AndroidConst
import org.jetbrains.kotlin.lang.resolve.android.idToName
import org.jetbrains.kotlin.lang.resolve.android.AndroidConst
import org.jetbrains.kotlin.lang.resolve.android.AndroidResourceManager
class AndroidXmlVisitor(
val resourceManager: AndroidResourceManager,