diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index 4c28b134333..33c5eaef130 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -2758,7 +2758,7 @@ public class ExpressionCodegen extends JetVisitor implem JetType type = bindingContext.getType(expression); assert type != null; - assert state.getReflectionTypes().getTEMP_kClass().getTypeConstructor().equals(type.getConstructor()) + assert state.getReflectionTypes().getkClass().getTypeConstructor().equals(type.getConstructor()) : "::class expression should be type checked to a KClass: " + type; return generateClassLiteralReference(typeMapper, KotlinPackage.single(type.getArguments()).getType()); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CoveringTryCatchNodeProcessor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CoveringTryCatchNodeProcessor.kt index 7284b1e353d..7320c9f2ba8 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CoveringTryCatchNodeProcessor.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CoveringTryCatchNodeProcessor.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen.inline import com.google.common.collect.LinkedListMultimap import java.util.ArrayList import com.intellij.util.containers.Stack -import org.jetbrains.kotlin.codegen.optimization.common.TEMP_isMeaningful +import org.jetbrains.kotlin.codegen.optimization.common.isMeaningful import org.jetbrains.org.objectweb.asm.Opcodes import org.jetbrains.org.objectweb.asm.tree.* import java.util.Comparator @@ -157,7 +157,7 @@ class IntervalMetaInfo> { private fun Interval.isMeaningless(): Boolean { val start = this.startLabel var end: AbstractInsnNode = this.endLabel - while (end != start && !end.TEMP_isMeaningful) { + while (end != start && !end.isMeaningful) { end = end.getPrevious() } return start == end diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InternalFinallyBlockInliner.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InternalFinallyBlockInliner.java index d903bb0499d..f57d10f40e9 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InternalFinallyBlockInliner.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InternalFinallyBlockInliner.java @@ -522,7 +522,7 @@ public class InternalFinallyBlockInliner extends CoveringTryCatchNodeProcessor { @Nullable private static AbstractInsnNode getNextMeaningful(@NotNull AbstractInsnNode node) { AbstractInsnNode result = node.getNext(); - while (result != null && !CommonPackage.getTEMP_isMeaningful(result)) { + while (result != null && !CommonPackage.getIsMeaningful(result)) { result = result.getNext(); } return result; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/DeadCodeEliminationMethodTransformer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/DeadCodeEliminationMethodTransformer.kt index 938aebfae3b..86b08a18827 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/DeadCodeEliminationMethodTransformer.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/DeadCodeEliminationMethodTransformer.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen.optimization import org.jetbrains.org.objectweb.asm.tree.MethodNode import org.jetbrains.kotlin.codegen.optimization.transformer.MethodTransformer import org.jetbrains.kotlin.codegen.optimization.common.OptimizationBasicInterpreter -import org.jetbrains.kotlin.codegen.optimization.common.TEMP_isMeaningful +import org.jetbrains.kotlin.codegen.optimization.common.isMeaningful public class DeadCodeEliminationMethodTransformer : MethodTransformer() { override fun transform(internalClassName: String, methodNode: MethodNode) { @@ -31,7 +31,7 @@ public class DeadCodeEliminationMethodTransformer : MethodTransformer() { // by try/catch blocks or local variables table // We remove unneeded ones further after all optimizations by calling CommonPackage.prepareForEmitting(methodNode) insnsArray.zip(frames).filter { - it.second == null && it.first.TEMP_isMeaningful + it.second == null && it.first.isMeaningful }.forEach { insnList.remove(it.first) } } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/RedundantGotoMethodTransformer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/RedundantGotoMethodTransformer.kt index 772692ed7b7..f28eacb676b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/RedundantGotoMethodTransformer.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/RedundantGotoMethodTransformer.kt @@ -22,7 +22,7 @@ import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode import org.jetbrains.org.objectweb.asm.tree.LabelNode import org.jetbrains.org.objectweb.asm.Opcodes import org.jetbrains.org.objectweb.asm.tree.JumpInsnNode -import org.jetbrains.kotlin.codegen.optimization.common.TEMP_isMeaningful +import org.jetbrains.kotlin.codegen.optimization.common.isMeaningful public class RedundantGotoMethodTransformer : MethodTransformer() { /** @@ -34,7 +34,7 @@ public class RedundantGotoMethodTransformer : MethodTransformer() { val currentLabels = hashSetOf() for (insn in insns.reverse()) { - if (insn.TEMP_isMeaningful) { + if (insn.isMeaningful) { if (insn.getOpcode() == Opcodes.GOTO && (insn as JumpInsnNode).label in currentLabels) { insnsToRemove.add(insn) } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/Util.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/Util.kt index 599c3edb9fc..62679d28c1b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/Util.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/Util.kt @@ -21,7 +21,7 @@ import org.jetbrains.org.objectweb.asm.tree.InsnList import org.jetbrains.org.objectweb.asm.tree.MethodNode import org.jetbrains.org.objectweb.asm.tree.analysis.BasicValue -val AbstractInsnNode.TEMP_isMeaningful: Boolean get() = +val AbstractInsnNode.isMeaningful: Boolean get() = when (this.getType()) { AbstractInsnNode.LABEL, AbstractInsnNode.LINE, AbstractInsnNode.FRAME -> false else -> true @@ -46,21 +46,21 @@ public class InsnSequence(val from: AbstractInsnNode, val to: AbstractInsnNode?) fun MethodNode.prepareForEmitting() { tryCatchBlocks = tryCatchBlocks.filter { tcb -> InsnSequence(tcb.start, tcb.end).any { insn -> - insn.TEMP_isMeaningful + insn.isMeaningful } } // local variables with live ranges starting after last meaningful instruction lead to VerifyError localVariables = localVariables.filter { lv -> InsnSequence(lv.start, lv.end).any { insn -> - insn.TEMP_isMeaningful + insn.isMeaningful } } // We should remove linenumbers after last meaningful instruction // because they point to index of non-existing instruction and it leads to VerifyError var current = instructions.getLast() - while (!current.TEMP_isMeaningful) { + while (!current.isMeaningful) { val prev = current.getPrevious() if (current.getType() == AbstractInsnNode.LINE) { diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java index d7cca01807e..86c5ef18814 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java @@ -363,7 +363,7 @@ public class ReplInterpreter { private void setReplScriptExecuting(boolean isExecuting) { if (replReader != null) { - replReader.setTEMP_isReplScriptExecuting(isExecuting); + replReader.setIsReplScriptExecuting(isExecuting); } } diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/messages/ReplSystemInWrapper.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/messages/ReplSystemInWrapper.kt index e9ddbda1e93..6932d0b3976 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/messages/ReplSystemInWrapper.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/messages/ReplSystemInWrapper.kt @@ -33,11 +33,11 @@ public class ReplSystemInWrapper( private val isAtBufferEnd: Boolean get() = curBytePos == inputByteArray.size() - @Volatile var TEMP_isReplScriptExecuting = false + @Volatile var isReplScriptExecuting = false override fun read(): Int { if (isLastByteProcessed) { - if (TEMP_isReplScriptExecuting) { + if (isReplScriptExecuting) { isReadLineStartSent = false replWriter.printlnReadLineEnd() } @@ -47,7 +47,7 @@ public class ReplSystemInWrapper( } while (isXmlIncomplete) { - if (!isReadLineStartSent && TEMP_isReplScriptExecuting) { + if (!isReadLineStartSent && isReplScriptExecuting) { replWriter.printlnReadLineStart() isReadLineStartSent = true } @@ -71,7 +71,7 @@ public class ReplSystemInWrapper( val xmlInput = byteBuilder.toString() val unescapedXml = parseXml(xmlInput) - val resultLine = if (TEMP_isReplScriptExecuting) + val resultLine = if (isReplScriptExecuting) unescapeLineBreaks(unescapedXml) else unescapedXml diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatformConfigurator.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatformConfigurator.kt index f0a5af961ee..929f592c0e8 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatformConfigurator.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatformConfigurator.kt @@ -273,7 +273,7 @@ public class OverloadsAnnotationChecker: DeclarationChecker { if (descriptor is FunctionDescriptor && descriptor.getModality() == Modality.ABSTRACT) { diagnosticHolder.report(ErrorsJvm.OVERLOADS_ABSTRACT.on(declaration)) } - else if ((!descriptor.getVisibility().TEMP_isPublicAPI && descriptor.getVisibility() != Visibilities.INTERNAL) || + else if ((!descriptor.getVisibility().isPublicAPI && descriptor.getVisibility() != Visibilities.INTERNAL) || DescriptorUtils.isLocal(descriptor)) { diagnosticHolder.report(ErrorsJvm.OVERLOADS_PRIVATE.on(declaration)) } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/syntheticExtensionsUtils.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/syntheticExtensionsUtils.kt index d20810df5ae..eb859606ded 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/syntheticExtensionsUtils.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/syntheticExtensionsUtils.kt @@ -34,7 +34,7 @@ fun syntheticExtensionVisibility(originalDescriptor: DeclarationDescriptorWithVi return when (originalVisibility) { Visibilities.PUBLIC -> Visibilities.PUBLIC - else -> object : Visibility(originalVisibility.name, originalVisibility.TEMP_isPublicAPI) { + else -> object : Visibility(originalVisibility.name, originalVisibility.isPublicAPI) { override fun isVisible(receiver: ReceiverValue, what: DeclarationDescriptorWithVisibility, from: DeclarationDescriptor) = originalVisibility.isVisible(receiver, originalDescriptor, from) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java index 9a35f7d0151..61f18d77b46 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java @@ -336,7 +336,7 @@ public class JetFlowInformationProvider { } if (!(instruction instanceof WriteValueInstruction)) return; WriteValueInstruction writeValueInstruction = (WriteValueInstruction) instruction; - JetElement element = writeValueInstruction.getTEMP_lValue(); + JetElement element = writeValueInstruction.getlValue(); boolean error = checkBackingField(ctxt, element); if (!(element instanceof JetExpression)) return; if (!error) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/TailRecursionDetector.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/TailRecursionDetector.java index a7abccc1ef7..bb4330ed666 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/TailRecursionDetector.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/TailRecursionDetector.java @@ -50,7 +50,7 @@ public class TailRecursionDetector extends InstructionVisitorWithResult @Override public Boolean visitSubroutineExit(@NotNull SubroutineExitInstruction instruction) { - return !instruction.getTEMP_isError() && instruction.getSubroutine() == subroutine; + return !instruction.getIsError() && instruction.getSubroutine() == subroutine; } @Override diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java index 7a51f4ea78f..31360d9cd6c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java @@ -89,7 +89,7 @@ public class PseudocodeUtil { element = ((ReadValueInstruction) instruction).getElement(); } else if (instruction instanceof WriteValueInstruction) { - element = ((WriteValueInstruction) instruction).getTEMP_lValue(); + element = ((WriteValueInstruction) instruction).getlValue(); } else if (instruction instanceof VariableDeclarationInstruction) { element = ((VariableDeclarationInstruction) instruction).getVariableDeclarationElement(); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt index 2f0a53c3a44..2312e875e70 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt @@ -91,7 +91,7 @@ public class WriteValueInstruction( lexicalScope: LexicalScope, target: AccessTarget, receiverValues: Map, - public val TEMP_lValue: JetElement, + public val lValue: JetElement, public val rValue: PseudoValue ) : AccessValueInstruction(assignment, lexicalScope, target, receiverValues) { override val inputValues: List @@ -106,10 +106,10 @@ public class WriteValueInstruction( } override fun toString(): String { - val lhs = (TEMP_lValue as? JetNamedDeclaration)?.getName() ?: render(TEMP_lValue) + val lhs = (lValue as? JetNamedDeclaration)?.getName() ?: render(lValue) return "w($lhs|${inputValues.joinToString(", ")})" } override fun createCopy(): InstructionImpl = - WriteValueInstruction(element, lexicalScope, target, receiverValues, TEMP_lValue, rValue) + WriteValueInstruction(element, lexicalScope, target, receiverValues, lValue, rValue) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineExitInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineExitInstruction.kt index 20a6516d78b..9eb7f05f1d2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineExitInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineExitInstruction.kt @@ -23,7 +23,7 @@ import java.util.* public class SubroutineExitInstruction( public val subroutine: JetElement, lexicalScope: LexicalScope, - public val TEMP_isError: Boolean + public val isError: Boolean ) : InstructionImpl(lexicalScope) { private var _sink: SubroutineSinkInstruction? = null @@ -44,8 +44,8 @@ public class SubroutineExitInstruction( return visitor.visitSubroutineExit(this) } - override fun toString(): String = if (TEMP_isError) "" else "" + override fun toString(): String = if (isError) "" else "" override fun createCopy(): InstructionImpl = - SubroutineExitInstruction(subroutine, lexicalScope, TEMP_isError) + SubroutineExitInstruction(subroutine, lexicalScope, isError) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java index 9ace216d8b5..de4be006fa7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java @@ -110,7 +110,7 @@ public class BodyResolver { // SCRIPT: resolve script bodies scriptBodyResolverResolver.resolveScriptBodies(c); - if (!c.getTopDownAnalysisMode().getTEMP_isLocalDeclarations()) { + if (!c.getTopDownAnalysisMode().getIsLocalDeclarations()) { computeDeferredTypes(); } } @@ -732,7 +732,7 @@ public class BodyResolver { LexicalScope scope = c.getDeclaringScope(declaration); assert scope != null : "Scope is null: " + PsiUtilPackage.getElementTextWithContext(declaration); - if (!c.getTopDownAnalysisMode().getTEMP_isLocalDeclarations() && !(bodyResolveCache instanceof BodyResolveCache.ThrowException) && + if (!c.getTopDownAnalysisMode().getIsLocalDeclarations() && !(bodyResolveCache instanceof BodyResolveCache.ThrowException) && expressionTypingServices.getStatementFilter() != StatementFilter.NONE) { bodyResolveCache.resolveFunctionBody(declaration).addOwnDataTo(trace, true); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ControlFlowAnalyzer.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ControlFlowAnalyzer.java index bb2f4a31bbf..d860f723095 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ControlFlowAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ControlFlowAnalyzer.java @@ -74,7 +74,7 @@ public class ControlFlowAnalyzer { // A pseudocode of class/object initialization corresponds to a class/object // or initialization of properties corresponds to a package declared in a file JetFlowInformationProvider flowInformationProvider = new JetFlowInformationProvider((JetElement) declarationContainer, trace); - if (c.getTopDownAnalysisMode().getTEMP_isLocalDeclarations()) { + if (c.getTopDownAnalysisMode().getIsLocalDeclarations()) { flowInformationProvider.checkForLocalClassOrObjectMode(); return; } @@ -95,7 +95,7 @@ public class ControlFlowAnalyzer { private void checkFunction(@NotNull BodiesResolveContext c, @NotNull JetDeclarationWithBody function, @Nullable JetType expectedReturnType) { if (!function.hasBody()) return; JetFlowInformationProvider flowInformationProvider = new JetFlowInformationProvider(function, trace); - if (c.getTopDownAnalysisMode().getTEMP_isLocalDeclarations()) { + if (c.getTopDownAnalysisMode().getIsLocalDeclarations()) { flowInformationProvider.checkForLocalClassOrObjectMode(); return; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisMode.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisMode.kt index c582dbee109..2ae88b93122 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisMode.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisMode.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.resolve -public enum class TopDownAnalysisMode(public val TEMP_isLocalDeclarations: Boolean) { +public enum class TopDownAnalysisMode(public val isLocalDeclarations: Boolean) { LocalDeclarations(true), TopLevelDeclarations(false) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.java index a84a1d5aeff..fb609151c2b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.java @@ -385,7 +385,7 @@ public class CallExpressionResolver { } CompileTimeConstant value = constantExpressionEvaluator.evaluateExpression(expression, context.trace, context.expectedType); - if (value != null && value.getTEMP_isPure()) { + if (value != null && value.getIsPure()) { return dataFlowAnalyzer.createCompileTimeConstantTypeInfo(value, expression, context); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.java index d076cef82ad..c580b49c48c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.java @@ -43,7 +43,7 @@ import java.util.Set; import static org.jetbrains.kotlin.diagnostics.Errors.NON_LOCAL_RETURN_NOT_ALLOWED; import static org.jetbrains.kotlin.diagnostics.Errors.USAGE_IS_NOT_INLINABLE; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getTEMP_isEffectivelyPublicApi; +import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getIsEffectivelyPublicApi; import static org.jetbrains.kotlin.resolve.inline.InlineUtil.allowsNonLocalReturns; import static org.jetbrains.kotlin.resolve.inline.InlineUtil.checkNonLocalReturnUsage; @@ -55,7 +55,7 @@ class InlineChecker implements CallChecker { public InlineChecker(@NotNull SimpleFunctionDescriptor descriptor) { assert InlineUtil.isInline(descriptor) : "This extension should be created only for inline functions: " + descriptor; this.descriptor = descriptor; - this.isEffectivelyPublicApiFunction = getTEMP_isEffectivelyPublicApi(descriptor); + this.isEffectivelyPublicApiFunction = getIsEffectivelyPublicApi(descriptor); for (ValueParameterDescriptor param : descriptor.getValueParameters()) { if (isInlinableParameter(param)) { @@ -236,7 +236,7 @@ class InlineChecker implements CallChecker { } private void checkVisibility(@NotNull CallableDescriptor declarationDescriptor, @NotNull JetElement expression, @NotNull BasicCallResolutionContext context){ - boolean declarationDescriptorIsPublicApi = getTEMP_isEffectivelyPublicApi(declarationDescriptor) || isDefinedInInlineFunction(declarationDescriptor); + boolean declarationDescriptorIsPublicApi = getIsEffectivelyPublicApi(declarationDescriptor) || isDefinedInInlineFunction(declarationDescriptor); if (isEffectivelyPublicApiFunction && !declarationDescriptorIsPublicApi && declarationDescriptor.getVisibility() != Visibilities.LOCAL) { context.trace.report(Errors.INVISIBLE_MEMBER_FROM_INLINE.on(expression, declarationDescriptor, descriptor)); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt index 6591dece104..c83139a3cb0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt @@ -443,7 +443,7 @@ private class ConstantExpressionEvaluatorVisitor( private fun canBeUsedInAnnotation(expression: JetExpression) = ConstantExpressionEvaluator.getConstant(expression, trace.getBindingContext())?.canBeUsedInAnnotations ?: false - private fun isPureConstant(expression: JetExpression) = ConstantExpressionEvaluator.getConstant(expression, trace.getBindingContext())?.TEMP_isPure ?: false + private fun isPureConstant(expression: JetExpression) = ConstantExpressionEvaluator.getConstant(expression, trace.getBindingContext())?.isPure ?: false private fun evaluateUnaryAndCheck(receiver: OperationArgument, name: String, callExpression: JetExpression): Any? { val functions = unaryOperations[UnaryOperationKey(receiver.ctcType, name)] diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt index 0ac9bb72a0f..e20be760786 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt @@ -52,7 +52,7 @@ public abstract class AbstractEvaluateExpressionTest : AbstractAnnotationDescrip fun doIsPureTest(path: String) { doTest(path) { property, context -> - evaluateInitializer(context, property)?.TEMP_isPure.toString() + evaluateInitializer(context, property)?.isPure.toString() } } diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt index bf69d0437df..5d3e4b37483 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt +++ b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt @@ -21,7 +21,7 @@ import javax.xml.bind.DatatypeConverter.parseBase64Binary import javax.xml.bind.DatatypeConverter.printBase64Binary public class KotlinJavascriptMetadata(public val abiVersion: Int, public val moduleName: String, public val body: ByteArray) { - public val TEMP_isAbiVersionCompatible: Boolean = KotlinJavascriptMetadataUtils.isAbiVersionCompatible(abiVersion) + public val isAbiVersionCompatible: Boolean = KotlinJavascriptMetadataUtils.isAbiVersionCompatible(abiVersion) } public object KotlinJavascriptMetadataUtils { diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt index 3cc13f6544c..fa163059227 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt @@ -70,7 +70,7 @@ fun LazyJavaResolverContext.resolveKotlinBinaryClass(kotlinClass: KotlinJvmBinar val header = kotlinClass.classHeader return when { - !header.TEMP_isCompatibleAbiVersion -> { + !header.isCompatibleAbiVersion -> { components.errorReporter.reportIncompatibleAbiVersion(kotlinClass.classId, kotlinClass.location, header.version) KotlinClassLookupResult.NotFound } diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt index 67d798a8cf2..169332bf382 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt @@ -134,7 +134,7 @@ class LazyJavaTypeResolver( private fun mapKotlinClass(fqName: FqName): ClassDescriptor? { if (attr.isForAnnotationParameter && fqName == JAVA_LANG_CLASS_FQ_NAME) { - return c.reflectionTypes.TEMP_kClass + return c.reflectionTypes.kClass } val javaToKotlin = JavaToKotlinClassMap.INSTANCE diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java index 0ce1365cf55..1dd78a0bfa8 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java @@ -112,7 +112,7 @@ public final class DeserializedDescriptorResolver { @Nullable public String[] readData(@NotNull KotlinJvmBinaryClass kotlinClass, @NotNull Set expectedKinds) { KotlinClassHeader header = kotlinClass.getClassHeader(); - if (!header.getTEMP_isCompatibleAbiVersion()) { + if (!header.getIsCompatibleAbiVersion()) { errorReporter.reportIncompatibleAbiVersion(kotlinClass.getClassId(), kotlinClass.getLocation(), header.getVersion()); } else if (expectedKinds.contains(header.getKind())) { diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt index 29c7d6b596d..23d42d37600 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt @@ -31,7 +31,7 @@ public class KotlinClassHeader( public val filePartClassNames: Array?, public val multifileClassName: String? ) { - public val TEMP_isCompatibleAbiVersion: Boolean get() = AbiVersionUtil.isAbiVersionCompatible(version) + public val isCompatibleAbiVersion: Boolean get() = AbiVersionUtil.isAbiVersionCompatible(version) public enum class Kind { CLASS, @@ -49,9 +49,9 @@ public class KotlinClassHeader( "version=$version" } -public fun KotlinClassHeader.isCompatibleClassKind(): Boolean = TEMP_isCompatibleAbiVersion && kind == KotlinClassHeader.Kind.CLASS -public fun KotlinClassHeader.isCompatiblePackageFacadeKind(): Boolean = TEMP_isCompatibleAbiVersion && kind == KotlinClassHeader.Kind.PACKAGE_FACADE -public fun KotlinClassHeader.isCompatibleFileFacadeKind(): Boolean = TEMP_isCompatibleAbiVersion && kind == KotlinClassHeader.Kind.FILE_FACADE -public fun KotlinClassHeader.isCompatibleMultifileClassKind(): Boolean = TEMP_isCompatibleAbiVersion && kind == KotlinClassHeader.Kind.MULTIFILE_CLASS -public fun KotlinClassHeader.isCompatibleMultifileClassPartKind(): Boolean = TEMP_isCompatibleAbiVersion && kind == KotlinClassHeader.Kind.MULTIFILE_CLASS_PART -public fun KotlinClassHeader.isCompatibleSyntheticClassKind(): Boolean = TEMP_isCompatibleAbiVersion && kind == KotlinClassHeader.Kind.SYNTHETIC_CLASS +public fun KotlinClassHeader.isCompatibleClassKind(): Boolean = isCompatibleAbiVersion && kind == KotlinClassHeader.Kind.CLASS +public fun KotlinClassHeader.isCompatiblePackageFacadeKind(): Boolean = isCompatibleAbiVersion && kind == KotlinClassHeader.Kind.PACKAGE_FACADE +public fun KotlinClassHeader.isCompatibleFileFacadeKind(): Boolean = isCompatibleAbiVersion && kind == KotlinClassHeader.Kind.FILE_FACADE +public fun KotlinClassHeader.isCompatibleMultifileClassKind(): Boolean = isCompatibleAbiVersion && kind == KotlinClassHeader.Kind.MULTIFILE_CLASS +public fun KotlinClassHeader.isCompatibleMultifileClassPartKind(): Boolean = isCompatibleAbiVersion && kind == KotlinClassHeader.Kind.MULTIFILE_CLASS_PART +public fun KotlinClassHeader.isCompatibleSyntheticClassKind(): Boolean = isCompatibleAbiVersion && kind == KotlinClassHeader.Kind.SYNTHETIC_CLASS diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt index b07d4b1da55..5f70886408b 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt @@ -49,11 +49,7 @@ public class ReflectionTypes(private val module: ModuleDescriptor) { public fun getKFunction(n: Int): ClassDescriptor = find("KFunction$n") -// public val TEMP_kClass: ClassDescriptor by ClassLookup - //TODO: temporary - public val TEMP_kClass: ClassDescriptor - get() = find("KClass") - + public val kClass: ClassDescriptor by ClassLookup public val kProperty0: ClassDescriptor by ClassLookup public val kProperty1: ClassDescriptor by ClassLookup public val kProperty2: ClassDescriptor by ClassLookup @@ -61,7 +57,7 @@ public class ReflectionTypes(private val module: ModuleDescriptor) { public val kMutableProperty1: ClassDescriptor by ClassLookup public fun getKClassType(annotations: Annotations, type: JetType): JetType { - val descriptor = TEMP_kClass + val descriptor = kClass if (ErrorUtils.isError(descriptor)) { return descriptor.getDefaultType() } diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibility.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibility.kt index a47dbed07bf..4db61bd1756 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibility.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibility.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue public abstract class Visibility protected constructor( public val name: String, - public val TEMP_isPublicAPI: Boolean + public val isPublicAPI: Boolean ) { public abstract fun isVisible(receiver: ReceiverValue, what: DeclarationDescriptorWithVisibility, from: DeclarationDescriptor): Boolean diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt index 2832a163d96..5f31e67ea76 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt @@ -28,7 +28,6 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqNameUnsafe import org.jetbrains.kotlin.resolve.DescriptorUtils -import org.jetbrains.kotlin.resolve.constants.BooleanValue import org.jetbrains.kotlin.resolve.constants.EnumValue import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.utils.DFS @@ -90,12 +89,12 @@ public val ClassDescriptor.classObjectType: JetType? return correspondingDescriptor?.getDefaultType() } -public val DeclarationDescriptorWithVisibility.TEMP_isEffectivelyPublicApi: Boolean +public val DeclarationDescriptorWithVisibility.isEffectivelyPublicApi: Boolean get() { var parent: DeclarationDescriptorWithVisibility? = this while (parent != null) { - if (!parent.getVisibility().TEMP_isPublicAPI) return false + if (!parent.getVisibility().isPublicAPI) return false parent = DescriptorUtils.getParentOfType(parent, javaClass()) } diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstant.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstant.kt index a12f85ce99f..eef3728ddda 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstant.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstant.kt @@ -36,7 +36,7 @@ public interface CompileTimeConstant { public val usesNonConstValAsConstant: Boolean get() = parameters.usesNonConstValAsConstant - public val TEMP_isPure: Boolean get() = parameters.isPure + public val isPure: Boolean get() = parameters.isPure public class Parameters( public val canBeUsedInAnnotation: Boolean, diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsAnalyzerFacade.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsAnalyzerFacade.kt index 7295ac3fb4a..7ce57877b7c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsAnalyzerFacade.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsAnalyzerFacade.kt @@ -61,7 +61,7 @@ public object JsAnalyzerFacade : AnalyzerFacade() { if (moduleInfo is LibraryInfo && KotlinJavaScriptLibraryDetectionUtil.isKotlinJavaScriptLibrary(moduleInfo.library)) { val providers = moduleInfo.library.getFiles(OrderRootType.CLASSES) .flatMap { KotlinJavascriptMetadataUtils.loadMetadata(PathUtil.getLocalPath(it)!!) } - .filter { it.TEMP_isAbiVersionCompatible } + .filter { it.isAbiVersionCompatible } .map { KotlinJavascriptSerializationUtil.createPackageFragmentProvider(moduleDescriptor, it.body, moduleContext.storageManager) } .filterNotNull() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/DecompiledUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/DecompiledUtils.kt index 83c5336b728..e8b3f2867e9 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/DecompiledUtils.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/DecompiledUtils.kt @@ -56,7 +56,7 @@ public fun isKotlinWithCompatibleAbiVersion(file: VirtualFile): Boolean { if (!isKotlinJvmCompiledFile(file)) return false val header = KotlinBinaryClassCache.getKotlinBinaryClass(file)?.getClassHeader() - return header != null && header.TEMP_isCompatibleAbiVersion + return header != null && header.isCompatibleAbiVersion } /** diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinClsStubBuilder.kt index bbc90397eb5..997e8179139 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinClsStubBuilder.kt @@ -55,7 +55,7 @@ public open class KotlinClsStubBuilder : ClsStubBuilder() { val header = kotlinBinaryClass.getClassHeader() val classId = kotlinBinaryClass.getClassId() val packageFqName = classId.getPackageFqName() - if (!header.TEMP_isCompatibleAbiVersion) { + if (!header.isCompatibleAbiVersion) { return createIncompatibleAbiVersionFileStub() } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt index 1bcdd5a6f11..f26df58541c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt @@ -60,7 +60,7 @@ public fun buildDecompiledText( val packageFqName = classId.getPackageFqName() return when { - !classHeader.TEMP_isCompatibleAbiVersion -> { + !classHeader.isCompatibleAbiVersion -> { DecompiledText( INCOMPATIBLE_ABI_VERSION_COMMENT .replace(CURRENT_ABI_VERSION_MARKER, JvmAbi.VERSION.toString()) @@ -78,7 +78,7 @@ public fun buildDecompiledText( buildDecompiledText(packageFqName, partMembers) } else -> - throw UnsupportedOperationException("Unknown header kind: ${classHeader.kind} ${classHeader.TEMP_isCompatibleAbiVersion}") + throw UnsupportedOperationException("Unknown header kind: ${classHeader.kind} ${classHeader.isCompatibleAbiVersion}") } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt index ea7c627e689..8610bb4667c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt @@ -80,7 +80,7 @@ public object KotlinClassFileIndex : KotlinFileIndexBase(K private val INDEXER = indexer() { file -> val kotlinClass = KotlinBinaryClassCache.getKotlinBinaryClass(file) - if (kotlinClass != null && kotlinClass.classHeader.TEMP_isCompatibleAbiVersion) kotlinClass.classId.asSingleFqName() else null + if (kotlinClass != null && kotlinClass.classHeader.isCompatibleAbiVersion) kotlinClass.classId.asSingleFqName() else null } } diff --git a/idea/idea-js/src/org/jetbrains/kotlin/idea/js/KotlinJavaScriptLibraryManager.kt b/idea/idea-js/src/org/jetbrains/kotlin/idea/js/KotlinJavaScriptLibraryManager.kt index 42a052ea5c9..99852c09809 100644 --- a/idea/idea-js/src/org/jetbrains/kotlin/idea/js/KotlinJavaScriptLibraryManager.kt +++ b/idea/idea-js/src/org/jetbrains/kotlin/idea/js/KotlinJavaScriptLibraryManager.kt @@ -130,7 +130,7 @@ public class KotlinJavaScriptLibraryManager private constructor(private var myPr assert(path != null) { "expected not-null path for ${clsRootFile.name}" } val metadataList = KotlinJavascriptMetadataUtils.loadMetadata(path!!) - if (metadataList.filter { !it.TEMP_isAbiVersionCompatible }.isNotEmpty()) continue + if (metadataList.filter { !it.isAbiVersionCompatible }.isNotEmpty()) continue VfsUtil.findFileByIoFile(File(path), true)?.let { rootFiles.add(it) } val classRoot = KotlinJavaScriptMetaFileSystem.getInstance().refreshAndFindFileByPath("$path!/") diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt index f7043173c3f..fed4540f743 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt @@ -189,7 +189,7 @@ public open class JetChangeInfo( public fun getNewSignature(inheritedCallable: JetCallableDefinitionUsage): String { val buffer = StringBuilder() - val defaultVisibility = if (kind.TEMP_isConstructor) Visibilities.PUBLIC else Visibilities.DEFAULT_VISIBILITY + val defaultVisibility = if (kind.isConstructor) Visibilities.PUBLIC else Visibilities.DEFAULT_VISIBILITY if (kind == Kind.PRIMARY_CONSTRUCTOR) { buffer.append(name) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.kt index b0351c0a56a..aade7a0a4fe 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.kt @@ -32,15 +32,13 @@ import com.intellij.usageView.UsageViewDescriptor import com.intellij.util.containers.MultiMap import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.JetUsageInfo import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinWrapperForJavaUsageInfos -import java.util.ArrayList -import java.util.Arrays -import java.util.LinkedHashSet +import java.util.* public class JetChangeSignatureProcessor(project: Project, changeInfo: JetChangeInfo, private val commandName: String) : ChangeSignatureProcessorBase(project, changeInfo) { override fun createUsageViewDescriptor(usages: Array): UsageViewDescriptor { - val subject = if (getChangeInfo().kind.TEMP_isConstructor) "constructor" else "function" + val subject = if (getChangeInfo().kind.isConstructor) "constructor" else "function" return JetUsagesViewDescriptor(myChangeInfo.getMethod(), RefactoringBundle.message("0.to.change.signature", subject)) } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java index 41b5cf63985..4a35b5da4b3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java @@ -619,7 +619,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro JetScope callableScope = org.jetbrains.kotlin.idea.refactoring.RefactoringPackage.getContainingScope(oldDescriptor, bindingContext); JetMethodDescriptor.Kind kind = ChangeSignaturePackage.getKind(changeInfo); - if (!kind.getTEMP_isConstructor() && callableScope != null && !info.getNewName().isEmpty()) { + if (!kind.getIsConstructor() && callableScope != null && !info.getNewName().isEmpty()) { Name newName = Name.identifier(info.getNewName()); Collection conflicts = oldDescriptor instanceof FunctionDescriptor ? ScopeUtils.getAllAccessibleFunctions(callableScope, newName) @@ -703,7 +703,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro } ); for (JetParameterInfo parameterInfo : changeInfo.getNonReceiverParameters()) { - if (!(parameterInfo.getTEMP_isNewParameter())) continue; + if (!(parameterInfo.getIsNewParameter())) continue; String name = parameterInfo.getName(); JetParameter parameter = existingParameters.get(name); diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetMethodDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetMethodDescriptor.kt index ab6089a5246..1e8ac4d35b4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetMethodDescriptor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetMethodDescriptor.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.JetCallableD import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers public interface JetMethodDescriptor : MethodDescriptor { - enum class Kind(val TEMP_isConstructor: Boolean) { + enum class Kind(val isConstructor: Boolean) { FUNCTION(false), PRIMARY_CONSTRUCTOR(true), SECONDARY_CONSTRUCTOR(true) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetParameterInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetParameterInfo.kt index 8386810310c..64218da444e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetParameterInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetParameterInfo.kt @@ -130,7 +130,7 @@ public class JetParameterInfo( override fun getOldIndex(): Int = originalIndex - public val TEMP_isNewParameter: Boolean + public val isNewParameter: Boolean get() = originalIndex == -1 override fun getDefaultValue(): String? = null @@ -143,7 +143,7 @@ public class JetParameterInfo( override fun getTypeText(): String = currentTypeText - public val TEMP_isTypeChanged: Boolean get() = getOldTypeText() != currentTypeText + public val isTypeChanged: Boolean get() = getOldTypeText() != currentTypeText override fun isUseAnySingleVariable(): Boolean = false diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangeSignatureDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangeSignatureDialog.kt index 9b7dcb9a694..17bdca71e47 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangeSignatureDialog.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangeSignatureDialog.kt @@ -156,7 +156,7 @@ public class JetChangeSignatureDialog( // Forbid receiver propagation override fun mayPropagateParameters() = - getParameters().any { it.TEMP_isNewParameter && it != parametersTableModel.getReceiver() } + getParameters().any { it.isNewParameter && it != parametersTableModel.getReceiver() } override fun getTableEditor(table: JTable, item: ParameterTableModelItemBase): JBTableRowEditor? { return object : JBTableRowEditor() { @@ -168,7 +168,7 @@ public class JetChangeSignatureDialog( } private fun isDefaultColumnEnabled() = - item.parameter.TEMP_isNewParameter && item.parameter != myMethod.receiver + item.parameter.isNewParameter && item.parameter != myMethod.receiver override fun prepareEditor(table: JTable, row: Int) { setLayout(BoxLayout(this, BoxLayout.X_AXIS)) @@ -371,7 +371,7 @@ public class JetChangeSignatureDialog( public fun getMethodDescriptor(): JetMethodDescriptor = myMethod override fun getSelectedIdx(): Int { - return myMethod.getParameters().withIndex().firstOrNull { it.value.TEMP_isNewParameter }?.index + return myMethod.getParameters().withIndex().firstOrNull { it.value.isNewParameter }?.index ?: super.getSelectedIdx() } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetPrimaryConstructorParameterTableModel.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetPrimaryConstructorParameterTableModel.java index a7f4d3ce7fe..82553775fe5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetPrimaryConstructorParameterTableModel.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetPrimaryConstructorParameterTableModel.java @@ -52,7 +52,7 @@ public class JetPrimaryConstructorParameterTableModel extends JetCallableParamet @Override public boolean isCellEditable(ParameterTableModelItemBase item) { - return !item.isEllipsisType() && item.parameter.getTEMP_isNewParameter(); + return !item.isEllipsisType() && item.parameter.getIsNewParameter(); } @Override diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.java index 91a81d85a58..5912975dd57 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.java @@ -376,7 +376,7 @@ public class JetCallableDefinitionUsage extends JetUsageIn parameter.addBefore(psiFactory.createWhiteSpace(), firstChild); } - if (parameterInfo.getTEMP_isTypeChanged() && parameter.getTypeReference() != null) { + if (parameterInfo.getIsTypeChanged() && parameter.getTypeReference() != null) { String renderedType = parameterInfo.renderType(parameterIndex, this); parameter.setTypeReference(psiFactory.createType(renderedType)); } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallerUsages.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallerUsages.kt index f78b476850d..885d03fe841 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallerUsages.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallerUsages.kt @@ -38,7 +38,7 @@ public class KotlinCallerUsage(element: JetNamedDeclaration): JetUsageInfo