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

compiler: cleanup 'public', property access syntax

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-01-07 17:57:35 +01:00
parent b72ea1ff07
commit 117a0d8b7b
488 changed files with 3147 additions and 3287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt
+17 -17
View File
@@ -42,7 +42,7 @@ import org.jetbrains.kotlin.test.KotlinTestUtils
import java.io.File
import java.util.ArrayList
public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment() {
abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment() {
protected open fun getDescriptor(declaration: KtDeclaration, container: ComponentProvider): DeclarationDescriptor {
return container.get<ResolveSession>().resolveToDescriptor(declaration)
}
@@ -50,11 +50,11 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment
protected open val targetEnvironment: TargetEnvironment
get() = CompilerEnvironment
public fun doTest(path: String) {
fun doTest(path: String) {
val fileText = FileUtil.loadFile(File(path), true)
val psiFile = KtPsiFactory(getProject()).createFile(fileText)
val psiFile = KtPsiFactory(project).createFile(fileText)
val context = TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(getProject(), environment.getModuleName())
val context = TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(project, environment.getModuleName())
val container = createContainerForLazyResolve(
@@ -67,14 +67,14 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment
val resolveSession = container.get<ResolveSession>()
context.initializeModuleContents(resolveSession.getPackageFragmentProvider())
context.initializeModuleContents(resolveSession.packageFragmentProvider)
val descriptors = ArrayList<DeclarationDescriptor>()
psiFile.accept(object : KtVisitorVoid() {
override fun visitKtFile(file: KtFile) {
val fqName = file.getPackageFqName()
if (!fqName.isRoot()) {
val fqName = file.packageFqName
if (!fqName.isRoot) {
val packageDescriptor = context.module.getPackage(fqName)
descriptors.add(packageDescriptor)
}
@@ -82,7 +82,7 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment
}
override fun visitParameter(parameter: KtParameter) {
val declaringElement = parameter.getParent().getParent()
val declaringElement = parameter.parent.parent
when (declaringElement) {
is KtFunctionType -> return
is KtNamedFunction ->
@@ -90,7 +90,7 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment
is KtPrimaryConstructor -> {
val ktClassOrObject: KtClassOrObject = declaringElement.getContainingClassOrObject()
val classDescriptor = getDescriptor(ktClassOrObject, container) as ClassDescriptor
addCorrespondingParameterDescriptor(classDescriptor.getUnsubstitutedPrimaryConstructor()!!, parameter)
addCorrespondingParameterDescriptor(classDescriptor.unsubstitutedPrimaryConstructor!!, parameter)
}
else -> super.visitParameter(parameter)
}
@@ -99,11 +99,11 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment
override fun visitPropertyAccessor(accessor: KtPropertyAccessor) {
val property = accessor.property
val propertyDescriptor = getDescriptor(property, container) as PropertyDescriptor
if (accessor.isGetter()) {
descriptors.add(propertyDescriptor.getGetter()!!)
if (accessor.isGetter) {
descriptors.add(propertyDescriptor.getter!!)
}
else {
descriptors.add(propertyDescriptor.getSetter()!!)
descriptors.add(propertyDescriptor.setter!!)
}
accessor.acceptChildren(this)
}
@@ -118,8 +118,8 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment
if (descriptor is ClassDescriptor) {
// if class has primary constructor then we visit it later, otherwise add it artificially
if (element !is KtClassOrObject || !element.hasExplicitPrimaryConstructor()) {
if (descriptor.getUnsubstitutedPrimaryConstructor() != null) {
descriptors.add(descriptor.getUnsubstitutedPrimaryConstructor()!!)
if (descriptor.unsubstitutedPrimaryConstructor != null) {
descriptors.add(descriptor.unsubstitutedPrimaryConstructor!!)
}
}
}
@@ -131,8 +131,8 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment
}
private fun addCorrespondingParameterDescriptor(functionDescriptor: FunctionDescriptor, parameter: KtParameter) {
for (valueParameterDescriptor in functionDescriptor.getValueParameters()) {
if (valueParameterDescriptor.getName() == parameter.getNameAsName()) {
for (valueParameterDescriptor in functionDescriptor.valueParameters) {
if (valueParameterDescriptor.name == parameter.nameAsName) {
descriptors.add(valueParameterDescriptor)
}
}
@@ -146,7 +146,7 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment
}
val renderedDescriptors = descriptors.map { renderer.render(it) }.joinToString(separator = "\n")
val document = DocumentImpl(psiFile.getText())
val document = DocumentImpl(psiFile.text)
UsefulTestCase.assertSameLines(KotlinTestUtils.getLastCommentedLines(document), renderedDescriptors.toString())
}
compiler/tests/org/jetbrains/kotlin/renderer/AbstractFunctionDescriptorInExpressionRendererTest.kt
+5 -5
View File
@@ -34,10 +34,10 @@ import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.utils.addIfNotNull
import java.io.File
abstract public class AbstractFunctionDescriptorInExpressionRendererTest : KotlinTestWithEnvironment() {
public fun doTest(path: String) {
abstract class AbstractFunctionDescriptorInExpressionRendererTest : KotlinTestWithEnvironment() {
fun doTest(path: String) {
val fileText = FileUtil.loadFile(File(path), true)
val file = KtPsiFactory(getProject()).createFile(fileText)
val file = KtPsiFactory(project).createFile(fileText)
val bindingContext = JvmResolveUtil.analyzeOneFileWithJavaIntegration(file).bindingContext
val descriptors = arrayListOf<DeclarationDescriptor>()
@@ -49,7 +49,7 @@ abstract public class AbstractFunctionDescriptorInExpressionRendererTest : Kotli
}
override fun visitLambdaExpression(lambdaExpression: KtLambdaExpression) {
lambdaExpression.acceptChildren(this)
descriptors.add(bindingContext.get(BindingContext.FUNCTION, lambdaExpression.getFunctionLiteral())!!)
descriptors.add(bindingContext.get(BindingContext.FUNCTION, lambdaExpression.functionLiteral)!!)
}
})
@@ -60,7 +60,7 @@ abstract public class AbstractFunctionDescriptorInExpressionRendererTest : Kotli
}
val renderedDescriptors = descriptors.map { renderer.render(it) }.joinToString(separator = "\n")
val document = DocumentImpl(file.getText())
val document = DocumentImpl(file.text)
UsefulTestCase.assertSameLines(KotlinTestUtils.getLastCommentedLines(document), renderedDescriptors.toString())
}