From 6588310736dc9e94755dd2d2e6e2fdd74df64ee0 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 12 Aug 2014 16:29:55 +0400 Subject: [PATCH] Add missing public modifiers in project code --- .../backend-common/src/bridges/bridges.kt | 6 ++-- .../java/diagnostics/JvmDeclarationOrigin.kt | 8 ++--- .../java/jetAsJava/KotlinLightElement.kt | 4 +-- .../KotlinToJvmSignatureMapper.kt | 4 +-- .../src/org/jetbrains/jet/context/context.kt | 12 +++---- .../jet/lang/cfg/PseudocodeTraverser.kt | 6 ++-- .../jet/lang/cfg/pseudocode/TypePredicate.kt | 4 +-- .../jet/lang/cfg/pseudocode/pseudocodeUtil.kt | 2 +- .../jetbrains/jet/lang/psi/JetCodeFragment.kt | 6 ++-- .../lang/resolve/CompositeBindingContext.kt | 2 +- .../jetbrains/jet/lang/resolve/Diagnostics.kt | 8 ++--- .../resolve/calls/model/ArgumentMapping.kt | 14 ++++---- .../jetbrains/jet/asJava/lightClassUtils.kt | 2 +- .../AbstractEvaluateExpressionTest.kt | 2 +- compiler/tests/org/jetbrains/jet/jsonUtils.kt | 4 +-- .../org/jetbrains/jet/utils/addToStdlib.kt | 6 ++-- .../descriptors/LazyJavaPackageFragment.kt | 2 +- .../descriptors/PackageFragmentDescriptor.kt | 4 +-- .../descriptors/annotations/Annotations.kt | 6 ++-- .../error/MissingDependencyErrorClass.kt | 2 +- .../jetbrains/jet/storage/StorageManager.kt | 18 +++++------ .../src/org/jetbrains/jet/storage/storage.kt | 6 ++-- .../src/org/jetbrains/jet/utils/coreLib.kt | 4 +-- .../src/org/jetbrains/eval4j/interpreter.kt | 32 +++++++++---------- .../org/jetbrains/eval4j/interpreterLoop.kt | 14 ++++---- .../src/org/jetbrains/eval4j/jdi/jdiEval.kt | 2 +- .../src/org/jetbrains/eval4j/jdi/jdiValues.kt | 6 ++-- eval4j/src/org/jetbrains/eval4j/members.kt | 2 +- eval4j/src/org/jetbrains/eval4j/values.kt | 10 +++--- .../completion/DataFlowValueRenderingTest.kt | 2 +- .../AbstractSmartCompletionHandlerTest.kt | 2 +- .../debugger/AbstractKotlinSteppingTest.kt | 2 +- .../debugger/AbstractSmartStepIntoTest.kt | 2 +- ...AbstractEditorForEvaluateExpressionTest.kt | 4 +-- .../shortenRefs/AbstractShortenRefsTest.kt | 2 +- .../test/AbstractJavaToKotlinConverterTest.kt | 2 +- 36 files changed, 107 insertions(+), 107 deletions(-) diff --git a/compiler/backend-common/src/bridges/bridges.kt b/compiler/backend-common/src/bridges/bridges.kt index 0ea7f09041f..624b2f996dd 100644 --- a/compiler/backend-common/src/bridges/bridges.kt +++ b/compiler/backend-common/src/bridges/bridges.kt @@ -20,10 +20,10 @@ import org.jetbrains.jet.utils.DFS import java.util.HashSet public trait FunctionHandle { - val isDeclaration: Boolean - val isAbstract: Boolean + public val isDeclaration: Boolean + public val isAbstract: Boolean - fun getOverridden(): Iterable + public fun getOverridden(): Iterable } public data class Bridge( diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/JvmDeclarationOrigin.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/JvmDeclarationOrigin.kt index c928cdfd281..5b5a14090e0 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/JvmDeclarationOrigin.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/JvmDeclarationOrigin.kt @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOriginKind. public enum class MemberKind { FIELD; METHOD } -public data class RawSignature(val name: String, val desc: String, val kind: MemberKind) +public data class RawSignature(public val name: String, public val desc: String, public val kind: MemberKind) public enum class JvmDeclarationOriginKind { OTHER @@ -39,9 +39,9 @@ public enum class JvmDeclarationOriginKind { } public class JvmDeclarationOrigin( - val originKind: JvmDeclarationOriginKind, - val element: PsiElement?, - val descriptor: DeclarationDescriptor? + public val originKind: JvmDeclarationOriginKind, + public val element: PsiElement?, + public val descriptor: DeclarationDescriptor? ) { class object { public val NO_ORIGIN: JvmDeclarationOrigin = JvmDeclarationOrigin(OTHER, null, null) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/KotlinLightElement.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/KotlinLightElement.kt index 6a5af353dcf..074d4964d13 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/KotlinLightElement.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/KotlinLightElement.kt @@ -20,6 +20,6 @@ import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.psi.JetDeclaration public trait KotlinLightElement { - val origin: T? - val delegate: D + public val origin: T? + public val delegate: D } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/KotlinToJvmSignatureMapper.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/KotlinToJvmSignatureMapper.kt index 506880f5b1e..c57502481dc 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/KotlinToJvmSignatureMapper.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/KotlinToJvmSignatureMapper.kt @@ -18,8 +18,8 @@ package org.jetbrains.jet.lang.resolve.java.jvmSignature import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -trait KotlinToJvmSignatureMapper { - fun mapToJvmMethodSignature(function: FunctionDescriptor): JvmMethodSignature +public trait KotlinToJvmSignatureMapper { + public fun mapToJvmMethodSignature(function: FunctionDescriptor): JvmMethodSignature } fun erasedSignaturesEqualIgnoringReturnTypes(subFunction: JvmMethodSignature, superFunction: JvmMethodSignature): Boolean { diff --git a/compiler/frontend/src/org/jetbrains/jet/context/context.kt b/compiler/frontend/src/org/jetbrains/jet/context/context.kt index 311f21e6f4e..74d4743059e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/context/context.kt +++ b/compiler/frontend/src/org/jetbrains/jet/context/context.kt @@ -20,24 +20,24 @@ import org.jetbrains.jet.storage.StorageManager import org.jetbrains.jet.storage.ExceptionTracker import org.jetbrains.jet.storage.LockBasedStorageManager -trait GlobalContext { - val storageManager: StorageManager - val exceptionTracker: ExceptionTracker +public trait GlobalContext { + public val storageManager: StorageManager + public val exceptionTracker: ExceptionTracker } -open class SimpleGlobalContext( +public open class SimpleGlobalContext( override val storageManager: StorageManager, override val exceptionTracker: ExceptionTracker ) : GlobalContext -open class GlobalContextImpl( +public open class GlobalContextImpl( storageManager: LockBasedStorageManager, exceptionTracker: ExceptionTracker ) : SimpleGlobalContext(storageManager, exceptionTracker) { override val storageManager: LockBasedStorageManager = super.storageManager as LockBasedStorageManager } -fun GlobalContext(): GlobalContextImpl { +public fun GlobalContext(): GlobalContextImpl { val tracker = ExceptionTracker() return GlobalContextImpl(LockBasedStorageManager.createWithExceptionHandling(tracker), tracker) } \ No newline at end of file diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.kt b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.kt index d6a40033efa..d6a52edda43 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.kt @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.LocalFunctionD import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.SubroutineEnterInstruction -fun Pseudocode.traverse( +public fun Pseudocode.traverse( traversalOrder: TraversalOrder, analyzeInstruction: (Instruction) -> Unit ) { @@ -37,7 +37,7 @@ fun Pseudocode.traverse( } } -fun Pseudocode.traverse( +public fun Pseudocode.traverse( traversalOrder: TraversalOrder, edgesMap: Map>, analyzeInstruction: (Instruction, D, D) -> Unit @@ -189,7 +189,7 @@ fun traverseFollowingInstructions( return true } -enum class TraversalOrder { +public enum class TraversalOrder { FORWARD BACKWARD } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/TypePredicate.kt b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/TypePredicate.kt index e52501b7a4e..db37112de4c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/TypePredicate.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/TypePredicate.kt @@ -58,14 +58,14 @@ public object AllTypes : TypePredicate { } // todo: simplify computed type predicate when possible -fun and(predicates: Collection): TypePredicate = +public fun and(predicates: Collection): TypePredicate = when (predicates.size) { 0 -> AllTypes 1 -> predicates.first() else -> ForAllTypes(predicates.toList()) } -fun or(predicates: Collection): TypePredicate? = +public fun or(predicates: Collection): TypePredicate? = when (predicates.size) { 0 -> null 1 -> predicates.first() diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/pseudocodeUtil.kt b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/pseudocodeUtil.kt index 6bb4197c948..ab32f035953 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/pseudocodeUtil.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/pseudocodeUtil.kt @@ -52,7 +52,7 @@ fun getReceiverTypePredicate(resolvedCall: ResolvedCall<*>, receiverValue: Recei return null } -fun getExpectedTypePredicate(value: PseudoValue, bindingContext: BindingContext): TypePredicate { +public fun getExpectedTypePredicate(value: PseudoValue, bindingContext: BindingContext): TypePredicate { val pseudocode = value.createdAt?.owner if (pseudocode == null) return AllTypes diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCodeFragment.kt b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCodeFragment.kt index 75391044b12..3be18da69bf 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCodeFragment.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCodeFragment.kt @@ -99,7 +99,7 @@ public abstract class JetCodeFragment( _myImports.addAll(imports.split(IMPORT_SEPARATOR)) } - fun importsAsImportList(): JetImportList? { + public fun importsAsImportList(): JetImportList? { return JetPsiFactory(this).createFile(_myImports.makeString("\n")).getImportList() } @@ -118,9 +118,9 @@ public abstract class JetCodeFragment( } class object { - val IMPORT_SEPARATOR = "," + public val IMPORT_SEPARATOR: String = "," - fun getImportsForElement(elementAtCaret: PsiElement): String { + public fun getImportsForElement(elementAtCaret: PsiElement): String { val containingFile = elementAtCaret.getContainingFile() if (containingFile !is JetFile) return "" diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompositeBindingContext.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompositeBindingContext.kt index 47dbecadb23..333c1996cca 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompositeBindingContext.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompositeBindingContext.kt @@ -22,7 +22,7 @@ import com.google.common.collect.ImmutableMap import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.psi.PsiElement -class CompositeBindingContext private ( +public class CompositeBindingContext private ( private val delegates: List ) : BindingContext { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/Diagnostics.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/Diagnostics.kt index edd5a418d6d..72b2078c7ba 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/Diagnostics.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/Diagnostics.kt @@ -22,13 +22,13 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic import java.util.Collections public trait Diagnostics : Iterable { - fun all(): Collection + public fun all(): Collection - fun forElement(psiElement: PsiElement): Collection + public fun forElement(psiElement: PsiElement): Collection - fun isEmpty(): Boolean + public fun isEmpty(): Boolean - fun noSuppression(): Diagnostics + public fun noSuppression(): Diagnostics class object { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ArgumentMapping.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ArgumentMapping.kt index 3b9e7252e74..6ce4f2f420d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ArgumentMapping.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ArgumentMapping.kt @@ -18,15 +18,15 @@ package org.jetbrains.jet.lang.resolve.calls.model import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor -trait ArgumentMapping { - fun isError(): Boolean +public trait ArgumentMapping { + public fun isError(): Boolean } -object ArgumentUnmapped: ArgumentMapping { +public object ArgumentUnmapped: ArgumentMapping { override fun isError(): Boolean = true } -enum class ArgumentMatchStatus(val isError: Boolean = true) { +public enum class ArgumentMatchStatus(val isError: Boolean = true) { SUCCESS : ArgumentMatchStatus(false) TYPE_MISMATCH : ArgumentMatchStatus() ARGUMENT_HAS_NO_TYPE : ArgumentMatchStatus() @@ -36,9 +36,9 @@ enum class ArgumentMatchStatus(val isError: Boolean = true) { MATCH_MODULO_UNINFERRED_TYPES : ArgumentMatchStatus() } -trait ArgumentMatch : ArgumentMapping { - val valueParameter: ValueParameterDescriptor - val status: ArgumentMatchStatus +public trait ArgumentMatch : ArgumentMapping { + public val valueParameter: ValueParameterDescriptor + public val status: ArgumentMatchStatus override fun isError(): Boolean = status.isError } diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/lightClassUtils.kt b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/lightClassUtils.kt index fac206714eb..9e83b878fbe 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/lightClassUtils.kt +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/lightClassUtils.kt @@ -41,7 +41,7 @@ import org.jetbrains.jet.lang.psi.JetCallableDeclaration import org.jetbrains.jet.lang.psi.psiUtil.isExtensionDeclaration import com.intellij.psi.PsiClass -fun JetClassOrObject.toLightClass(): KotlinLightClass? = LightClassUtil.getPsiClass(this) as KotlinLightClass? +public fun JetClassOrObject.toLightClass(): KotlinLightClass? = LightClassUtil.getPsiClass(this) as KotlinLightClass? public fun JetDeclaration.toLightElements(): List = when (this) { diff --git a/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt b/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt index f2c9aa5c313..77bca56722d 100644 --- a/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt +++ b/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt @@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace import org.jetbrains.jet.lang.types.TypeUtils -abstract class AbstractEvaluateExpressionTest : AbstractAnnotationDescriptorResolveTest() { +public abstract class AbstractEvaluateExpressionTest : AbstractAnnotationDescriptorResolveTest() { // Test directives should look like [// val testedPropertyName: expectedValue] fun doConstantTest(path: String) { diff --git a/compiler/tests/org/jetbrains/jet/jsonUtils.kt b/compiler/tests/org/jetbrains/jet/jsonUtils.kt index 20773019960..05871f0f96f 100644 --- a/compiler/tests/org/jetbrains/jet/jsonUtils.kt +++ b/compiler/tests/org/jetbrains/jet/jsonUtils.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet import com.google.gson.JsonObject -fun JsonObject.getString(name: String): String { +public fun JsonObject.getString(name: String): String { val member = getNullableString(name) if (member == null) { throw IllegalStateException("Member with name '$name' is expected in '$this'") @@ -27,4 +27,4 @@ fun JsonObject.getString(name: String): String { return member } -fun JsonObject.getNullableString(name: String): String? = this[name]?.getAsString() \ No newline at end of file +public fun JsonObject.getNullableString(name: String): String? = this[name]?.getAsString() \ No newline at end of file diff --git a/compiler/util/src/org/jetbrains/jet/utils/addToStdlib.kt b/compiler/util/src/org/jetbrains/jet/utils/addToStdlib.kt index 129706280c6..ec8b08f1d99 100644 --- a/compiler/util/src/org/jetbrains/jet/utils/addToStdlib.kt +++ b/compiler/util/src/org/jetbrains/jet/utils/addToStdlib.kt @@ -20,7 +20,7 @@ import java.util.HashMap import java.util.Collections deprecated("Replace with filterKeys when bootstrapped") -fun Map.filterKeys_tmp(predicate: (K)->Boolean): Map { +public fun Map.filterKeys_tmp(predicate: (K)->Boolean): Map { val result = HashMap() for ((k, v) in this) { if (predicate(k)) { @@ -30,6 +30,6 @@ fun Map.filterKeys_tmp(predicate: (K)->Boolean): Map { return result } -fun T?.singletonOrEmptyList(): List = if (this != null) Collections.singletonList(this) else Collections.emptyList() +public fun T?.singletonOrEmptyList(): List = if (this != null) Collections.singletonList(this) else Collections.emptyList() -fun T?.singletonOrEmptySet(): Set = if (this != null) Collections.singleton(this) else Collections.emptySet() +public fun T?.singletonOrEmptySet(): Set = if (this != null) Collections.singleton(this) else Collections.emptySet() diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragment.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragment.kt index fb092aa5d28..29e31df71e6 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragment.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragment.kt @@ -36,7 +36,7 @@ class LazyPackageFragmentForJavaPackage( override fun createMemberScope() = LazyPackageFragmentScopeForJavaPackage(c, jPackage, this) } -class LazyPackageFragmentForJavaClass( +public class LazyPackageFragmentForJavaClass( c: LazyJavaResolverContext, containingDeclaration: ModuleDescriptor, private val jClass: JavaClass diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentDescriptor.kt b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentDescriptor.kt index 3d4d9a6ce1f..5f769e853ab 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentDescriptor.kt @@ -23,7 +23,7 @@ public trait PackageFragmentDescriptor : ClassOrPackageFragmentDescriptor { override fun getContainingDeclaration(): ModuleDescriptor - val fqName: FqName + public val fqName: FqName - fun getMemberScope(): JetScope + public fun getMemberScope(): JetScope } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/Annotations.kt b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/Annotations.kt index be1a7f930f4..69dfd1ea3e1 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/Annotations.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/Annotations.kt @@ -22,12 +22,12 @@ import java.util.Collections public trait Annotations : Iterable { - fun isEmpty(): Boolean + public fun isEmpty(): Boolean - fun findAnnotation(fqName: FqName): AnnotationDescriptor? + public fun findAnnotation(fqName: FqName): AnnotationDescriptor? class object { - val EMPTY: Annotations = object : Annotations { + public val EMPTY: Annotations = object : Annotations { override fun isEmpty() = true override fun findAnnotation(fqName: FqName) = null diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/error/MissingDependencyErrorClass.kt b/core/descriptors/src/org/jetbrains/jet/lang/types/error/MissingDependencyErrorClass.kt index 22de67fb0ba..5566863d5c4 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/error/MissingDependencyErrorClass.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/error/MissingDependencyErrorClass.kt @@ -20,5 +20,5 @@ import org.jetbrains.jet.lang.resolve.name.FqName // marker for DescriptorRenderer to treat specially in decompiler mode public trait MissingDependencyErrorClass { - val fullFqName: FqName + public val fullFqName: FqName } \ No newline at end of file diff --git a/core/util.runtime/src/org/jetbrains/jet/storage/StorageManager.kt b/core/util.runtime/src/org/jetbrains/jet/storage/StorageManager.kt index 9a93217e413..2bdb6630d97 100644 --- a/core/util.runtime/src/org/jetbrains/jet/storage/StorageManager.kt +++ b/core/util.runtime/src/org/jetbrains/jet/storage/StorageManager.kt @@ -26,13 +26,13 @@ public trait StorageManager { * NOTE: if compute() has side-effects the WEAK reference kind is dangerous: the side-effects will be repeated if * the value gets collected and then re-computed */ - fun createMemoizedFunction(compute: (K) -> V): MemoizedFunctionToNotNull + public fun createMemoizedFunction(compute: (K) -> V): MemoizedFunctionToNotNull - fun createMemoizedFunctionWithNullableValues(compute: (K) -> V?): MemoizedFunctionToNullable + public fun createMemoizedFunctionWithNullableValues(compute: (K) -> V?): MemoizedFunctionToNullable - fun createLazyValue(computable: () -> T): NotNullLazyValue + public fun createLazyValue(computable: () -> T): NotNullLazyValue - fun createRecursionTolerantLazyValue(computable: () -> T, onRecursiveCall: T): NotNullLazyValue + public fun createRecursionTolerantLazyValue(computable: () -> T, onRecursiveCall: T): NotNullLazyValue /** * @param onRecursiveCall is called if the computation calls itself recursively. @@ -41,17 +41,17 @@ public trait StorageManager { * otherwise it's executed and its result is returned * @param postCompute is called after the value is computed, but before any other thread sees it */ - fun createLazyValueWithPostCompute(computable: () -> T, onRecursiveCall: ((Boolean) -> T)?, postCompute: (T) -> Unit): NotNullLazyValue + public fun createLazyValueWithPostCompute(computable: () -> T, onRecursiveCall: ((Boolean) -> T)?, postCompute: (T) -> Unit): NotNullLazyValue - fun createNullableLazyValue(computable: () -> T?): NullableLazyValue + public fun createNullableLazyValue(computable: () -> T?): NullableLazyValue - fun createRecursionTolerantNullableLazyValue(computable: () -> T?, onRecursiveCall: T?): NullableLazyValue + public fun createRecursionTolerantNullableLazyValue(computable: () -> T?, onRecursiveCall: T?): NullableLazyValue /** * {@code postCompute} is called after the value is computed, but before any other thread sees it (the current thread may * see it in between) */ - fun createNullableLazyValueWithPostCompute(computable: () -> T?, postCompute: (T?) -> Unit): NullableLazyValue + public fun createNullableLazyValueWithPostCompute(computable: () -> T?, postCompute: (T?) -> Unit): NullableLazyValue - fun compute(computable: () -> T): T + public fun compute(computable: () -> T): T } diff --git a/core/util.runtime/src/org/jetbrains/jet/storage/storage.kt b/core/util.runtime/src/org/jetbrains/jet/storage/storage.kt index e6e0e2ff875..81b8407809e 100644 --- a/core/util.runtime/src/org/jetbrains/jet/storage/storage.kt +++ b/core/util.runtime/src/org/jetbrains/jet/storage/storage.kt @@ -20,11 +20,11 @@ public trait MemoizedFunctionToNotNull : Function1 public trait MemoizedFunctionToNullable : Function1 public trait NotNullLazyValue : Function0 { - fun isComputed(): Boolean + public fun isComputed(): Boolean } public trait NullableLazyValue : Function0 { - fun isComputed(): Boolean + public fun isComputed(): Boolean } -fun NotNullLazyValue.get(_this: Any?, p: PropertyMetadata): T = invoke() +public fun NotNullLazyValue.get(_this: Any?, p: PropertyMetadata): T = invoke() diff --git a/core/util.runtime/src/org/jetbrains/jet/utils/coreLib.kt b/core/util.runtime/src/org/jetbrains/jet/utils/coreLib.kt index 34b89f5263a..0ca39ceba8c 100644 --- a/core/util.runtime/src/org/jetbrains/jet/utils/coreLib.kt +++ b/core/util.runtime/src/org/jetbrains/jet/utils/coreLib.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.util -fun T?.inn(then: (T) -> R, _else: R): R = if (this != null) then(this) else _else +public fun T?.inn(then: (T) -> R, _else: R): R = if (this != null) then(this) else _else -fun T?.sure(message: String): T = this ?: throw AssertionError(message) +public fun T?.sure(message: String): T = this ?: throw AssertionError(message) fun T.printAndReturn(message: String = ""): T { if (!message.isEmpty()) { diff --git a/eval4j/src/org/jetbrains/eval4j/interpreter.kt b/eval4j/src/org/jetbrains/eval4j/interpreter.kt index c1d916f4fac..f25eca38c02 100644 --- a/eval4j/src/org/jetbrains/eval4j/interpreter.kt +++ b/eval4j/src/org/jetbrains/eval4j/interpreter.kt @@ -32,25 +32,25 @@ import org.jetbrains.org.objectweb.asm.tree.IincInsnNode class UnsupportedByteCodeException(message: String) : RuntimeException(message) -trait Eval { - fun loadClass(classType: Type): Value - fun loadString(str: String): Value - fun newInstance(classType: Type): Value - fun isInstanceOf(value: Value, targetType: Type): Boolean +public trait Eval { + public fun loadClass(classType: Type): Value + public fun loadString(str: String): Value + public fun newInstance(classType: Type): Value + public fun isInstanceOf(value: Value, targetType: Type): Boolean - fun newArray(arrayType: Type, size: Int): Value - fun newMultiDimensionalArray(arrayType: Type, dimensionSizes: List): Value - fun getArrayLength(array: Value): Value - fun getArrayElement(array: Value, index: Value): Value - fun setArrayElement(array: Value, index: Value, newValue: Value) + public fun newArray(arrayType: Type, size: Int): Value + public fun newMultiDimensionalArray(arrayType: Type, dimensionSizes: List): Value + public fun getArrayLength(array: Value): Value + public fun getArrayElement(array: Value, index: Value): Value + public fun setArrayElement(array: Value, index: Value, newValue: Value) - fun getStaticField(fieldDesc: FieldDescription): Value - fun setStaticField(fieldDesc: FieldDescription, newValue: Value) - fun invokeStaticMethod(methodDesc: MethodDescription, arguments: List): Value + public fun getStaticField(fieldDesc: FieldDescription): Value + public fun setStaticField(fieldDesc: FieldDescription, newValue: Value) + public fun invokeStaticMethod(methodDesc: MethodDescription, arguments: List): Value - fun getField(instance: Value, fieldDesc: FieldDescription): Value - fun setField(instance: Value, fieldDesc: FieldDescription, newValue: Value) - fun invokeMethod(instance: Value, methodDesc: MethodDescription, arguments: List, invokespecial: Boolean = false): Value + public fun getField(instance: Value, fieldDesc: FieldDescription): Value + public fun setField(instance: Value, fieldDesc: FieldDescription, newValue: Value) + public fun invokeMethod(instance: Value, methodDesc: MethodDescription, arguments: List, invokespecial: Boolean = false): Value } class SingleInstructionInterpreter(private val eval: Eval) : Interpreter(ASM5) { diff --git a/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt b/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt index e6712a16519..221f9ff8403 100644 --- a/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt +++ b/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt @@ -28,29 +28,29 @@ import org.jetbrains.org.objectweb.asm.tree.TryCatchBlockNode import java.util.ArrayList import org.jetbrains.eval4j.ExceptionThrown.ExceptionKind -trait InterpreterResult { +public trait InterpreterResult { override fun toString(): String } -class ExceptionThrown(val exception: Value, val kind: ExceptionKind): InterpreterResult { +public class ExceptionThrown(public val exception: Value, public val kind: ExceptionKind): InterpreterResult { override fun toString(): String = "Thrown $exception: $kind" - enum class ExceptionKind { + public enum class ExceptionKind { FROM_EVALUATED_CODE FROM_EVALUATOR BROKEN_CODE } } -data class ValueReturned(val result: Value): InterpreterResult { +public data class ValueReturned(public val result: Value): InterpreterResult { override fun toString(): String = "Returned $result" } -class AbnormalTermination(val message: String): InterpreterResult { +public class AbnormalTermination(public val message: String): InterpreterResult { override fun toString(): String = "Terminated abnormally: $message" } -trait InterpretationEventHandler { +public trait InterpretationEventHandler { class object { object NONE : InterpretationEventHandler { @@ -78,7 +78,7 @@ class ThrownFromEvaluatedCodeException(val exception: Value): RuntimeException() override fun toString(): String = "Thrown from evaluated code: $exception" } -fun interpreterLoop( +public fun interpreterLoop( m: MethodNode, initialState: Frame, eval: Eval, diff --git a/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt b/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt index d0596a0c615..e6b8c1bde26 100644 --- a/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt +++ b/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt @@ -27,7 +27,7 @@ import com.sun.jdi.Method val CLASS = Type.getType(javaClass>()) val BOOTSTRAP_CLASS_DESCRIPTORS = setOf("Ljava/lang/String;", "Ljava/lang/ClassLoader;", "Ljava/lang/Class;") -class JDIEval( +public class JDIEval( private val vm: jdi.VirtualMachine, private val classLoader: jdi.ClassLoaderReference, private val thread: jdi.ThreadReference, diff --git a/eval4j/src/org/jetbrains/eval4j/jdi/jdiValues.kt b/eval4j/src/org/jetbrains/eval4j/jdi/jdiValues.kt index d665acfd1a3..c8e5010e8bf 100644 --- a/eval4j/src/org/jetbrains/eval4j/jdi/jdiValues.kt +++ b/eval4j/src/org/jetbrains/eval4j/jdi/jdiValues.kt @@ -23,7 +23,7 @@ import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.Opcodes.* import com.sun.jdi -fun makeInitialFrame(methodNode: MethodNode, arguments: List): Frame { +public fun makeInitialFrame(methodNode: MethodNode, arguments: List): Frame { val isStatic = (methodNode.access and ACC_STATIC) != 0 val params = Type.getArgumentTypes(methodNode.desc) @@ -51,7 +51,7 @@ class JDIFailureException(message: String?, cause: Throwable? = null): RuntimeEx fun T?.sure(message: String? = null): T = this ?: throw JDIFailureException(message) -fun jdi.Value?.asValue(): Value { +public fun jdi.Value?.asValue(): Value { return when (this) { null -> NULL_VALUE is jdi.VoidValue -> VOID_VALUE @@ -76,7 +76,7 @@ val Value.jdiObj: jdi.ObjectReference? val Value.jdiClass: jdi.ClassObjectReference? get() = this.jdiObj as jdi.ClassObjectReference? -fun Value.asJdiValue(vm: jdi.VirtualMachine, expectedType: Type): jdi.Value? { +public fun Value.asJdiValue(vm: jdi.VirtualMachine, expectedType: Type): jdi.Value? { return when (this) { NULL_VALUE -> null VOID_VALUE -> vm.mirrorOfVoid() diff --git a/eval4j/src/org/jetbrains/eval4j/members.kt b/eval4j/src/org/jetbrains/eval4j/members.kt index 9ead8795910..8480fd2f5be 100644 --- a/eval4j/src/org/jetbrains/eval4j/members.kt +++ b/eval4j/src/org/jetbrains/eval4j/members.kt @@ -53,7 +53,7 @@ val MethodDescription.parameterTypes: List get() = Type.getArgumentTypes(desc).toList() -class FieldDescription( +public class FieldDescription( ownerInternalName: String, name: String, desc: String, diff --git a/eval4j/src/org/jetbrains/eval4j/values.kt b/eval4j/src/org/jetbrains/eval4j/values.kt index 971aa6ad9f3..45887e8237a 100644 --- a/eval4j/src/org/jetbrains/eval4j/values.kt +++ b/eval4j/src/org/jetbrains/eval4j/values.kt @@ -19,9 +19,9 @@ package org.jetbrains.eval4j import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.tree.LabelNode -trait Value : org.jetbrains.org.objectweb.asm.tree.analysis.Value { - val asmType: Type - val valid: Boolean +public trait Value : org.jetbrains.org.objectweb.asm.tree.analysis.Value { + public val asmType: Type + public val valid: Boolean override fun getSize(): Int = asmType.getSize() override fun toString(): String @@ -57,7 +57,7 @@ abstract class AbstractValueBase( override val asmType: Type ) : Value { override val valid = true - abstract val value: V + public abstract val value: V override fun toString() = "$value: $asmType" @@ -81,7 +81,7 @@ class IntValue(value: Int, asmType: Type): AbstractValue(value, asmType) class LongValue(value: Long): AbstractValue(value, Type.LONG_TYPE) class FloatValue(value: Float): AbstractValue(value, Type.FLOAT_TYPE) class DoubleValue(value: Double): AbstractValue(value, Type.DOUBLE_TYPE) -class ObjectValue(value: Any?, asmType: Type): AbstractValue(value, asmType) +public class ObjectValue(value: Any?, asmType: Type): AbstractValue(value, asmType) class NewObjectValue(asmType: Type): AbstractValueBase(asmType) { override var value: Any? = null } diff --git a/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTest.kt b/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTest.kt index 9e259860718..75a4f38c33d 100644 --- a/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTest.kt +++ b/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTest.kt @@ -30,7 +30,7 @@ import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase -abstract class AbstractDataFlowValueRenderingTest: JetLightCodeInsightFixtureTestCase() { +public abstract class AbstractDataFlowValueRenderingTest: JetLightCodeInsightFixtureTestCase() { override fun getTestDataPath() : String { return PluginTestCaseBase.getTestDataPathBase() + "/dataFlowValueRendering/" } diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/AbstractSmartCompletionHandlerTest.kt b/idea/tests/org/jetbrains/jet/completion/handlers/AbstractSmartCompletionHandlerTest.kt index ad25a4952d0..6eab9f82817 100644 --- a/idea/tests/org/jetbrains/jet/completion/handlers/AbstractSmartCompletionHandlerTest.kt +++ b/idea/tests/org/jetbrains/jet/completion/handlers/AbstractSmartCompletionHandlerTest.kt @@ -34,7 +34,7 @@ import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture import kotlin.properties.Delegates import org.jetbrains.jet.InTextDirectivesUtils -abstract class AbstractSmartCompletionHandlerTest() : CompletionHandlerTestBase() { +public abstract class AbstractSmartCompletionHandlerTest() : CompletionHandlerTestBase() { private val INVOCATION_COUNT_PREFIX = "INVOCATION_COUNT:" private val LOOKUP_STRING_PREFIX = "ELEMENT:" private val ELEMENT_TEXT_PREFIX = "ELEMENT_TEXT:" diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractKotlinSteppingTest.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractKotlinSteppingTest.kt index be7c533579d..5fb2bae7bd6 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractKotlinSteppingTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractKotlinSteppingTest.kt @@ -28,7 +28,7 @@ import com.intellij.debugger.engine.BasicStepMethodFilter import com.intellij.openapi.util.Computable import org.jetbrains.jet.plugin.refactoring.runReadAction -abstract class AbstractKotlinSteppingTest : KotlinDebuggerTestCase() { +public abstract class AbstractKotlinSteppingTest : KotlinDebuggerTestCase() { protected fun doStepIntoTest(path: String) { createDebugProcess(path) diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractSmartStepIntoTest.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractSmartStepIntoTest.kt index 4aedb151db3..cd63306bd78 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractSmartStepIntoTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractSmartStepIntoTest.kt @@ -28,7 +28,7 @@ import com.intellij.psi.util.PsiFormatUtilBase import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import com.intellij.testFramework.LightProjectDescriptor -abstract class AbstractSmartStepIntoTest : JetLightCodeInsightFixtureTestCase() { +public abstract class AbstractSmartStepIntoTest : JetLightCodeInsightFixtureTestCase() { private val fixture: JavaCodeInsightTestFixture get() = myFixture diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt index 9a574cf9dff..34e2c6af392 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.InTextDirectivesUtils import org.jetbrains.jet.lang.psi.JetCodeFragment -abstract class AbstractCodeFragmentHighlightingTest : AbstractJetPsiCheckerTest() { +public abstract class AbstractCodeFragmentHighlightingTest : AbstractJetPsiCheckerTest() { override fun doTest(filePath: String) { myFixture.configureByCodeFragment(filePath) myFixture.checkHighlighting(true, false, false) @@ -50,7 +50,7 @@ abstract class AbstractCodeFragmentHighlightingTest : AbstractJetPsiCheckerTest( } } -abstract class AbstractCodeFragmentCompletionTest : AbstractJvmBasicCompletionTest() { +public abstract class AbstractCodeFragmentCompletionTest : AbstractJvmBasicCompletionTest() { override fun setUpFixture(testPath: String) { myFixture.configureByCodeFragment(testPath) } diff --git a/idea/tests/org/jetbrains/jet/shortenRefs/AbstractShortenRefsTest.kt b/idea/tests/org/jetbrains/jet/shortenRefs/AbstractShortenRefsTest.kt index a99e6b8be13..e28d2c17dcb 100644 --- a/idea/tests/org/jetbrains/jet/shortenRefs/AbstractShortenRefsTest.kt +++ b/idea/tests/org/jetbrains/jet/shortenRefs/AbstractShortenRefsTest.kt @@ -28,7 +28,7 @@ import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import com.intellij.codeInsight.CodeInsightSettings import org.jetbrains.jet.InTextDirectivesUtils -abstract class AbstractShortenRefsTest : JetLightCodeInsightFixtureTestCase() { +public abstract class AbstractShortenRefsTest : JetLightCodeInsightFixtureTestCase() { override fun getTestDataPath() = JetTestCaseBuilder.getHomeDirectory() override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt index 08d87dab40e..c65e0a078ae 100644 --- a/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt +++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt @@ -35,7 +35,7 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor -abstract class AbstractJavaToKotlinConverterTest() : LightCodeInsightFixtureTestCase() { +public abstract class AbstractJavaToKotlinConverterTest() : LightCodeInsightFixtureTestCase() { val testHeaderPattern = Pattern.compile("//(element|expression|statement|method|class|file|comp)\n") override fun setUp() {