From 98da621ab350dc4bc8d37f1d6efb45223775eeaf Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Wed, 23 Sep 2015 18:52:20 +0300 Subject: [PATCH] Temporary rename of properties starting with "is" and used from java code (will revert back after changing accessor naming policy) --- .../kotlin/codegen/CodegenFileClassesProvider.kt | 2 +- .../kotlin/codegen/KotlinCodegenFacade.java | 4 ++-- .../jetbrains/kotlin/codegen/PackageCodegen.java | 2 +- .../inline/CoveringTryCatchNodeProcessor.kt | 4 ++-- .../inline/InternalFinallyBlockInliner.java | 2 +- .../DeadCodeEliminationMethodTransformer.kt | 4 ++-- .../RedundantGotoMethodTransformer.kt | 4 ++-- .../kotlin/codegen/optimization/common/Util.kt | 13 +++++-------- .../kotlin/cli/jvm/repl/ReplInterpreter.java | 2 +- .../cli/jvm/repl/messages/ReplSystemInWrapper.kt | 8 ++++---- .../kotlin/fileClasses/JvmFileClassInfo.kt | 7 +++---- .../jvm/platform/JvmPlatformConfigurator.kt | 2 +- .../kotlin/synthetic/syntheticExtensionsUtils.kt | 2 +- .../kotlin/cfg/TailRecursionDetector.java | 2 +- .../special/SubroutineExitInstruction.kt | 14 +++++--------- .../jetbrains/kotlin/resolve/BodyResolver.java | 4 ++-- .../kotlin/resolve/ControlFlowAnalyzer.java | 4 ++-- .../kotlin/resolve/TopDownAnalysisMode.kt | 2 +- .../resolve/calls/CallExpressionResolver.java | 3 +-- .../resolve/calls/checkers/InlineChecker.java | 7 +++---- .../evaluate/ConstantExpressionEvaluator.kt | 2 +- .../asJava/KotlinJavaFileStubProvider.java | 2 +- .../evaluate/AbstractEvaluateExpressionTest.kt | 2 +- .../utils/KotlinJavascriptMetadataUtils.kt | 2 +- .../jetbrains/kotlin/load/java/lazy/resolvers.kt | 2 +- .../kotlin/DeserializedDescriptorResolver.java | 2 +- .../load/kotlin/header/KotlinClassHeader.kt | 16 ++++++++-------- .../jetbrains/kotlin/descriptors/Visibility.kt | 2 +- .../jetbrains/kotlin/resolve/DescriptorUtils.kt | 4 ++-- .../resolve/constants/CompileTimeConstant.kt | 2 +- .../idea/caches/resolve/JsAnalyzerFacade.kt | 2 +- .../kotlin/idea/decompiler/DecompiledUtils.kt | 2 +- .../stubBuilder/KotlinClsStubBuilder.kt | 2 +- .../textBuilder/DecompiledTextFactory.kt | 4 ++-- .../kotlin/idea/vfilefinder/fileIndexes.kt | 2 +- .../idea/js/KotlinJavaScriptLibraryManager.kt | 2 +- .../refactoring/changeSignature/JetChangeInfo.kt | 2 +- .../JetChangeSignatureProcessor.kt | 2 +- .../JetChangeSignatureUsageProcessor.java | 4 ++-- .../changeSignature/JetMethodDescriptor.kt | 2 +- .../changeSignature/JetParameterInfo.kt | 6 +++--- .../ui/JetChangeSignatureDialog.kt | 6 +++--- ...JetPrimaryConstructorParameterTableModel.java | 2 +- .../usages/JetCallableDefinitionUsage.java | 3 +-- .../changeSignature/usages/KotlinCallerUsages.kt | 4 ++-- .../org/jetbrains/kotlin/js/config/Config.java | 2 +- .../kotlin/js/config/LibrarySourcesConfig.java | 2 +- .../translate/expression/FunctionTranslator.java | 4 ++-- .../kotlin/js/translate/utils/ManglingUtils.java | 4 ++-- 49 files changed, 87 insertions(+), 98 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenFileClassesProvider.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenFileClassesProvider.kt index 7822282596e..6a7833530f6 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenFileClassesProvider.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenFileClassesProvider.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.JetFile public class CodegenFileClassesProvider(private val packageFacadesAsMultifileClasses: Boolean) : JvmFileClassesProvider { override public fun getFileClassInfo(file: JetFile): JvmFileClassInfo { val fileClassInfo = JvmFileClassUtil.getFileClassInfoNoResolve(file) - if (packageFacadesAsMultifileClasses && !fileClassInfo.isMultifileClass) { + if (packageFacadesAsMultifileClasses && !fileClassInfo.TEMP_isMultifileClass) { return JvmFileClassUtil.getMultifilePackageFacadePartInfo(file) } else { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java index ed36e85bf45..12581188c87 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java @@ -71,12 +71,12 @@ public class KotlinCodegenFacade { JvmFileClassInfo fileClassInfo = state.getFileClassesProvider().getFileClassInfo(file); - if (fileClassInfo.getIsMultifileClass()) { + if (fileClassInfo.getTEMP_isMultifileClass()) { filesInMultifileClasses.putValue(fileClassInfo.getFacadeClassFqName(), file); } if (state.getPackageFacadesAsMultifileClasses()) { - if (!fileClassInfo.getIsMultifileClass()) { + if (!fileClassInfo.getTEMP_isMultifileClass()) { filesInMultifileClasses.putValue(PackageClassUtils.getPackageClassFqName(file.getPackageFqName()), file); } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java index d585581e0b7..bd57e5e672c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java @@ -305,7 +305,7 @@ public class PackageCodegen { private ClassBuilder generateFile(@NotNull JetFile file, @NotNull Map generateCallableMemberTasks) { JvmFileClassInfo fileClassInfo = state.getFileClassesProvider().getFileClassInfo(file); - if (fileClassInfo.getIsMultifileClass()) { + if (fileClassInfo.getTEMP_isMultifileClass()) { Type fileFacadeType = AsmUtil.asmTypeByFqNameWithoutInnerClasses(fileClassInfo.getFacadeClassFqName()); addDelegateToFileClassMemberTasks(file, generateCallableMemberTasks, fileFacadeType); return null; 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 7320c9f2ba8..7284b1e353d 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.isMeaningful +import org.jetbrains.kotlin.codegen.optimization.common.TEMP_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.isMeaningful) { + while (end != start && !end.TEMP_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 f57d10f40e9..d903bb0499d 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.getIsMeaningful(result)) { + while (result != null && !CommonPackage.getTEMP_isMeaningful(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 86b08a18827..938aebfae3b 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.isMeaningful +import org.jetbrains.kotlin.codegen.optimization.common.TEMP_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.isMeaningful + it.second == null && it.first.TEMP_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 f28eacb676b..772692ed7b7 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.isMeaningful +import org.jetbrains.kotlin.codegen.optimization.common.TEMP_isMeaningful public class RedundantGotoMethodTransformer : MethodTransformer() { /** @@ -34,7 +34,7 @@ public class RedundantGotoMethodTransformer : MethodTransformer() { val currentLabels = hashSetOf() for (insn in insns.reverse()) { - if (insn.isMeaningful) { + if (insn.TEMP_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 b291df1fc78..599c3edb9fc 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 @@ -17,14 +17,11 @@ package org.jetbrains.kotlin.codegen.optimization.common import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode -import org.jetbrains.org.objectweb.asm.Opcodes import org.jetbrains.org.objectweb.asm.tree.InsnList -import org.jetbrains.org.objectweb.asm.tree.LabelNode -import org.jetbrains.org.objectweb.asm.tree.analysis.Frame -import org.jetbrains.org.objectweb.asm.tree.analysis.BasicValue import org.jetbrains.org.objectweb.asm.tree.MethodNode +import org.jetbrains.org.objectweb.asm.tree.analysis.BasicValue -val AbstractInsnNode.isMeaningful : Boolean get() = +val AbstractInsnNode.TEMP_isMeaningful: Boolean get() = when (this.getType()) { AbstractInsnNode.LABEL, AbstractInsnNode.LINE, AbstractInsnNode.FRAME -> false else -> true @@ -49,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.isMeaningful + insn.TEMP_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.isMeaningful + insn.TEMP_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.isMeaningful) { + while (!current.TEMP_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 86c5ef18814..d7cca01807e 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.setIsReplScriptExecuting(isExecuting); + replReader.setTEMP_isReplScriptExecuting(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 6932d0b3976..e9ddbda1e93 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 isReplScriptExecuting = false + @Volatile var TEMP_isReplScriptExecuting = false override fun read(): Int { if (isLastByteProcessed) { - if (isReplScriptExecuting) { + if (TEMP_isReplScriptExecuting) { isReadLineStartSent = false replWriter.printlnReadLineEnd() } @@ -47,7 +47,7 @@ public class ReplSystemInWrapper( } while (isXmlIncomplete) { - if (!isReadLineStartSent && isReplScriptExecuting) { + if (!isReadLineStartSent && TEMP_isReplScriptExecuting) { replWriter.printlnReadLineStart() isReadLineStartSent = true } @@ -71,7 +71,7 @@ public class ReplSystemInWrapper( val xmlInput = byteBuilder.toString() val unescapedXml = parseXml(xmlInput) - val resultLine = if (isReplScriptExecuting) + val resultLine = if (TEMP_isReplScriptExecuting) unescapeLineBreaks(unescapedXml) else unescapedXml diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassInfo.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassInfo.kt index 014dee25985..01f4dbc1f4f 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassInfo.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassInfo.kt @@ -17,13 +17,12 @@ package org.jetbrains.kotlin.fileClasses import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.psi.JetFile public interface JvmFileClassInfo { public val fileClassFqName: FqName public val facadeClassFqName: FqName public val isWithJvmName: Boolean - public val isMultifileClass: Boolean + public val TEMP_isMultifileClass: Boolean } public class JvmSimpleFileClassInfo( @@ -31,7 +30,7 @@ public class JvmSimpleFileClassInfo( override val isWithJvmName: Boolean ) : JvmFileClassInfo { override val facadeClassFqName: FqName get() = fileClassFqName - override val isMultifileClass: Boolean get() = false + override val TEMP_isMultifileClass: Boolean get() = false } public class JvmMultifileClassPartInfo( @@ -39,6 +38,6 @@ public class JvmMultifileClassPartInfo( override val facadeClassFqName: FqName ) : JvmFileClassInfo { override val isWithJvmName: Boolean get() = true - override val isMultifileClass: Boolean get() = true + override val TEMP_isMultifileClass: Boolean get() = true } 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 929f592c0e8..f0a5af961ee 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().isPublicAPI && descriptor.getVisibility() != Visibilities.INTERNAL) || + else if ((!descriptor.getVisibility().TEMP_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 eb859606ded..d20810df5ae 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.isPublicAPI) { + else -> object : Visibility(originalVisibility.name, originalVisibility.TEMP_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/TailRecursionDetector.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/TailRecursionDetector.java index bb4330ed666..a7abccc1ef7 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.getIsError() && instruction.getSubroutine() == subroutine; + return !instruction.getTEMP_isError() && instruction.getSubroutine() == subroutine; } @Override 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 d3af1d4431e..20a6516d78b 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 @@ -16,18 +16,14 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.special +import org.jetbrains.kotlin.cfg.pseudocode.instructions.* import org.jetbrains.kotlin.psi.JetElement -import java.util.Collections -import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope -import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionImpl -import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction -import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor -import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult +import java.util.* public class SubroutineExitInstruction( public val subroutine: JetElement, lexicalScope: LexicalScope, - public val isError: Boolean + public val TEMP_isError: Boolean ) : InstructionImpl(lexicalScope) { private var _sink: SubroutineSinkInstruction? = null @@ -48,8 +44,8 @@ public class SubroutineExitInstruction( return visitor.visitSubroutineExit(this) } - override fun toString(): String = if (isError) "" else "" + override fun toString(): String = if (TEMP_isError) "" else "" override fun createCopy(): InstructionImpl = - SubroutineExitInstruction(subroutine, lexicalScope, isError) + SubroutineExitInstruction(subroutine, lexicalScope, TEMP_isError) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java index de4be006fa7..9ace216d8b5 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().getIsLocalDeclarations()) { + if (!c.getTopDownAnalysisMode().getTEMP_isLocalDeclarations()) { 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().getIsLocalDeclarations() && !(bodyResolveCache instanceof BodyResolveCache.ThrowException) && + if (!c.getTopDownAnalysisMode().getTEMP_isLocalDeclarations() && !(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 d860f723095..bb2f4a31bbf 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().getIsLocalDeclarations()) { + if (c.getTopDownAnalysisMode().getTEMP_isLocalDeclarations()) { 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().getIsLocalDeclarations()) { + if (c.getTopDownAnalysisMode().getTEMP_isLocalDeclarations()) { 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 2ae88b93122..c582dbee109 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 isLocalDeclarations: Boolean) { +public enum class TopDownAnalysisMode(public val TEMP_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 713d7c59072..a84a1d5aeff 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.java @@ -21,7 +21,6 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; @@ -386,7 +385,7 @@ public class CallExpressionResolver { } CompileTimeConstant value = constantExpressionEvaluator.evaluateExpression(expression, context.trace, context.expectedType); - if (value != null && value.getIsPure()) { + if (value != null && value.getTEMP_isPure()) { 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 0da5b61f77b..d076cef82ad 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 @@ -35,7 +35,6 @@ import org.jetbrains.kotlin.resolve.inline.InlineUtil; import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.kotlin.resolve.scopes.receivers.ExtensionReceiver; import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; -import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.expressions.OperatorConventions; import java.util.LinkedHashSet; @@ -44,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.getIsEffectivelyPublicApi; +import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getTEMP_isEffectivelyPublicApi; import static org.jetbrains.kotlin.resolve.inline.InlineUtil.allowsNonLocalReturns; import static org.jetbrains.kotlin.resolve.inline.InlineUtil.checkNonLocalReturnUsage; @@ -56,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 = getIsEffectivelyPublicApi(descriptor); + this.isEffectivelyPublicApiFunction = getTEMP_isEffectivelyPublicApi(descriptor); for (ValueParameterDescriptor param : descriptor.getValueParameters()) { if (isInlinableParameter(param)) { @@ -237,7 +236,7 @@ class InlineChecker implements CallChecker { } private void checkVisibility(@NotNull CallableDescriptor declarationDescriptor, @NotNull JetElement expression, @NotNull BasicCallResolutionContext context){ - boolean declarationDescriptorIsPublicApi = getIsEffectivelyPublicApi(declarationDescriptor) || isDefinedInInlineFunction(declarationDescriptor); + boolean declarationDescriptorIsPublicApi = getTEMP_isEffectivelyPublicApi(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 c83139a3cb0..6591dece104 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())?.isPure ?: false + private fun isPureConstant(expression: JetExpression) = ConstantExpressionEvaluator.getConstant(expression, trace.getBindingContext())?.TEMP_isPure ?: false private fun evaluateUnaryAndCheck(receiver: OperationArgument, name: String, callExpression: JetExpression): Any? { val functions = unaryOperations[UnaryOperationKey(receiver.ctcType, name)] diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java index 920376c61ef..3e2a61390e2 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java @@ -220,7 +220,7 @@ public class KotlinJavaFileStubProvider - evaluateInitializer(context, property)?.isPure.toString() + evaluateInitializer(context, property)?.TEMP_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 5d3e4b37483..bf69d0437df 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 isAbiVersionCompatible: Boolean = KotlinJavascriptMetadataUtils.isAbiVersionCompatible(abiVersion) + public val TEMP_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 fa163059227..3cc13f6544c 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.isCompatibleAbiVersion -> { + !header.TEMP_isCompatibleAbiVersion -> { components.errorReporter.reportIncompatibleAbiVersion(kotlinClass.classId, kotlinClass.location, header.version) KotlinClassLookupResult.NotFound } 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 1dd78a0bfa8..0ce1365cf55 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.getIsCompatibleAbiVersion()) { + if (!header.getTEMP_isCompatibleAbiVersion()) { 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 3e10999ce98..29c7d6b596d 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 @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.load.kotlin.header -import org.jetbrains.kotlin.serialization.deserialization.BinaryVersion import org.jetbrains.kotlin.load.java.AbiVersionUtil import org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinClass import org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass +import org.jetbrains.kotlin.serialization.deserialization.BinaryVersion public class KotlinClassHeader( public val kind: KotlinClassHeader.Kind, @@ -31,7 +31,7 @@ public class KotlinClassHeader( public val filePartClassNames: Array?, public val multifileClassName: String? ) { - public val isCompatibleAbiVersion: Boolean get() = AbiVersionUtil.isAbiVersionCompatible(version) + public val TEMP_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 = 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 +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 diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibility.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibility.kt index 4db61bd1756..a47dbed07bf 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 isPublicAPI: Boolean + public val TEMP_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 e99060c91a4..2832a163d96 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt @@ -90,12 +90,12 @@ public val ClassDescriptor.classObjectType: JetType? return correspondingDescriptor?.getDefaultType() } -public val DeclarationDescriptorWithVisibility.isEffectivelyPublicApi: Boolean +public val DeclarationDescriptorWithVisibility.TEMP_isEffectivelyPublicApi: Boolean get() { var parent: DeclarationDescriptorWithVisibility? = this while (parent != null) { - if (!parent.getVisibility().isPublicAPI) return false + if (!parent.getVisibility().TEMP_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 eef3728ddda..a12f85ce99f 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 isPure: Boolean get() = parameters.isPure + public val TEMP_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 7ce57877b7c..7295ac3fb4a 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.isAbiVersionCompatible } + .filter { it.TEMP_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 e8b3f2867e9..83c5336b728 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.isCompatibleAbiVersion + return header != null && header.TEMP_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 997e8179139..bbc90397eb5 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.isCompatibleAbiVersion) { + if (!header.TEMP_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 f26df58541c..1bcdd5a6f11 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.isCompatibleAbiVersion -> { + !classHeader.TEMP_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.isCompatibleAbiVersion}") + throw UnsupportedOperationException("Unknown header kind: ${classHeader.kind} ${classHeader.TEMP_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 8610bb4667c..ea7c627e689 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.isCompatibleAbiVersion) kotlinClass.classId.asSingleFqName() else null + if (kotlinClass != null && kotlinClass.classHeader.TEMP_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 99852c09809..42a052ea5c9 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.isAbiVersionCompatible }.isNotEmpty()) continue + if (metadataList.filter { !it.TEMP_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 90dd5199d5b..1c92bb85192 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.isConstructor) Visibilities.PUBLIC else Visibilities.DEFAULT_VISIBILITY + val defaultVisibility = if (kind.TEMP_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 8d2d07354ae..b0351c0a56a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.kt @@ -40,7 +40,7 @@ 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.isConstructor) "constructor" else "function" + val subject = if (getChangeInfo().kind.TEMP_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 4a35b5da4b3..41b5cf63985 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.getIsConstructor() && callableScope != null && !info.getNewName().isEmpty()) { + if (!kind.getTEMP_isConstructor() && 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.getIsNewParameter())) continue; + if (!(parameterInfo.getTEMP_isNewParameter())) 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 1e8ac4d35b4..ab6089a5246 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 isConstructor: Boolean) { + enum class Kind(val TEMP_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 cb7c607204d..8386810310c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetParameterInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetParameterInfo.kt @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.scopes.receivers.ThisReceiver import org.jetbrains.kotlin.types.JetType -import java.util.LinkedHashMap +import java.util.* public class JetParameterInfo( val callableDescriptor: CallableDescriptor, @@ -130,7 +130,7 @@ public class JetParameterInfo( override fun getOldIndex(): Int = originalIndex - public val isNewParameter: Boolean + public val TEMP_isNewParameter: Boolean get() = originalIndex == -1 override fun getDefaultValue(): String? = null @@ -143,7 +143,7 @@ public class JetParameterInfo( override fun getTypeText(): String = currentTypeText - public val isTypeChanged: Boolean get() = getOldTypeText() != currentTypeText + public val TEMP_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 17bdca71e47..9b7dcb9a694 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.isNewParameter && it != parametersTableModel.getReceiver() } + getParameters().any { it.TEMP_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.isNewParameter && item.parameter != myMethod.receiver + item.parameter.TEMP_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.isNewParameter }?.index + return myMethod.getParameters().withIndex().firstOrNull { it.value.TEMP_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 82553775fe5..a7f4d3ce7fe 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.getIsNewParameter(); + return !item.isEllipsisType() && item.parameter.getTEMP_isNewParameter(); } @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 aac8745be41..91a81d85a58 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 @@ -35,7 +35,6 @@ import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils; import org.jetbrains.kotlin.idea.codeInsight.shorten.ShortenPackage; import org.jetbrains.kotlin.idea.core.DescriptorUtilsKt; import org.jetbrains.kotlin.idea.core.PsiModificationUtilsKt; -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; import org.jetbrains.kotlin.idea.refactoring.changeSignature.ChangeSignaturePackage; import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo; import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo; @@ -377,7 +376,7 @@ public class JetCallableDefinitionUsage extends JetUsageIn parameter.addBefore(psiFactory.createWhiteSpace(), firstChild); } - if (parameterInfo.getIsTypeChanged() && parameter.getTypeReference() != null) { + if (parameterInfo.getTEMP_isTypeChanged() && 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 885d03fe841..f78b476850d 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