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

rename Jet* classes to Kt*

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-10-19 18:43:17 +02:00
parent 660972b12d
commit 49033e0002
1965 changed files with 23732 additions and 23757 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Conditional.kt
+3 -3
View File
@@ -51,13 +51,13 @@ interface Conditional {
}
}
fun JetAnnotated.parseConditionalAnnotations(): List<Conditional> =
fun KtAnnotated.parseConditionalAnnotations(): List<Conditional> =
annotationEntries.map {
val parser = Conditional.ANNOTATIONS.get(it.typeReferenceName)
parser?.parse?.invoke(it.valueArguments.splitToPositionalAndNamed())
}.filterNotNull()
val JetAnnotationEntry.typeReferenceName: String? get() =
(typeReference?.typeElement as? JetUserType)?.referencedName
val KtAnnotationEntry.typeReferenceName: String? get() =
(typeReference?.typeElement as? KtUserType)?.referencedName
compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Modifications.kt
+4 -4
View File
@@ -22,16 +22,16 @@ import org.jetbrains.kotlin.psi.*
data class Modification(val range: TextRange, val apply: (String) -> String)
class CollectModificationsVisitor(evaluators: List<Evaluator>) : JetTreeVisitorVoid() {
class CollectModificationsVisitor(evaluators: List<Evaluator>) : KtTreeVisitorVoid() {
val elementModifications: Map<Evaluator, MutableList<Modification>> =
evaluators.toMap(selector = { it }, transform = { arrayListOf<Modification>() })
override fun visitDeclaration(declaration: JetDeclaration) {
override fun visitDeclaration(declaration: KtDeclaration) {
super.visitDeclaration(declaration)
val annotations = declaration.parseConditionalAnnotations()
val name = (declaration as? JetNamedDeclaration)?.nameAsSafeName ?: declaration.name
val name = (declaration as? KtNamedDeclaration)?.nameAsSafeName ?: declaration.name
val declResults = arrayListOf<Pair<Evaluator, Boolean>>()
for ((evaluator, modifications) in elementModifications) {
@@ -48,7 +48,7 @@ class CollectModificationsVisitor(evaluators: List<Evaluator>) : JetTreeVisitorV
else {
val targetName = annotations.filterIsInstance<Conditional.TargetName>().singleOrNull()
if (targetName != null) {
val placeholderName = (declaration as JetNamedDeclaration).nameAsName!!.asString()
val placeholderName = (declaration as KtNamedDeclaration).nameAsName!!.asString()
val realName = targetName.name
modifications.add(Modification(declaration.textRange) { it.replace(placeholderName, realName) })
}
compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Preprocessor.kt
+4 -4
View File
@@ -22,7 +22,7 @@ import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.util.text.StringUtil
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.idea.JetFileType
import org.jetbrains.kotlin.idea.KotlinFileType
import org.jetbrains.kotlin.psi.*
import java.io.File
import java.io.IOException
@@ -46,15 +46,15 @@ public fun createProfile(name: String, targetRoot: File): Profile {
public class Preprocessor(val logger: Logger = SystemOutLogger) {
val fileType = JetFileType.INSTANCE
val jetPsiFactory: JetPsiFactory
val fileType = KotlinFileType.INSTANCE
val jetPsiFactory: KtPsiFactory
init {
val configuration = CompilerConfiguration()
val environment = KotlinCoreEnvironment.createForProduction(Disposable { }, configuration, emptyList())
val project = environment.project
jetPsiFactory = JetPsiFactory(project)
jetPsiFactory = KtPsiFactory(project)
}
sealed class FileProcessingResult {
compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/ValueArguments.kt
+2 -2
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.preprocessor
import org.jetbrains.kotlin.psi.JetStringTemplateEntry
import org.jetbrains.kotlin.psi.KtStringTemplateEntry
import org.jetbrains.kotlin.psi.ValueArgument
import org.jetbrains.kotlin.psi.psiUtil.getChildrenOfType
@@ -32,4 +32,4 @@ fun List<ValueArgument>.splitToPositionalAndNamed(): PositionalAndNamedArguments
}
fun ValueArgument.parseIntegerValue(): Int = getArgumentExpression()!!.text.toInt()
fun ValueArgument.parseStringValue(): String = getArgumentExpression()!!.getChildrenOfType<JetStringTemplateEntry>().joinToString("") { it.text }
fun ValueArgument.parseStringValue(): String = getArgumentExpression()!!.getChildrenOfType<KtStringTemplateEntry>().joinToString("") { it.text }