From 2c414d880cb02db96ef13fcc1719f2dc80a7bf59 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 9 Jan 2015 18:36:50 +0300 Subject: [PATCH] Rename jet -> kotlin in descriptors: renderer org.jetbrains.jet.renderer -> org.jetbrains.kotlin.renderer --- .../src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java | 2 +- .../org/jetbrains/kotlin/codegen/inline/InlineCodegen.java | 2 +- .../resolve/java/diagnostics/DefaultErrorMessagesJvm.java | 4 ++-- .../kotlinSignature/ElementAlternativeSignatureData.java | 2 +- .../resolve/java/kotlinSignature/PropagationHeuristics.java | 2 +- .../java/kotlinSignature/SignaturesPropagationData.java | 2 +- .../java/kotlinSignature/TypeTransformingVisitor.java | 2 +- .../org/jetbrains/jet/lang/cfg/pseudocode/TypePredicate.kt | 2 +- .../lang/diagnostics/rendering/DefaultErrorMessages.java | 6 +++--- .../rendering/DiagnosticFactoryToRendererMap.java | 4 ++-- .../jet/lang/diagnostics/rendering/DiagnosticRenderer.java | 2 +- .../lang/diagnostics/rendering/DiagnosticRendererUtil.kt | 4 ++-- .../rendering/DiagnosticWithMultiParametersRenderer.java | 2 +- .../rendering/DiagnosticWithParameters1Renderer.java | 2 +- .../rendering/DiagnosticWithParameters2Renderer.java | 2 +- .../rendering/DiagnosticWithParameters3Renderer.java | 2 +- .../jetbrains/jet/lang/diagnostics/rendering/Renderers.java | 4 ++-- .../diagnostics/rendering/TabledDescriptorRenderer.java | 4 ++-- .../org/jetbrains/jet/lang/resolve/DeclarationResolver.java | 2 +- .../org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java | 2 +- .../tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt | 2 +- .../jvm/compiler/AbstractSdkAnnotationsValidityTest.java | 2 +- .../jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java | 2 +- .../org/jetbrains/jet/resolve/ExpectedResolveData.java | 2 +- .../annotation/AbstractAnnotationDescriptorResolveTest.java | 4 ++-- .../jet/resolve/calls/AbstractResolvedCallsTest.kt | 2 +- .../jet/test/util/RecursiveDescriptorComparator.java | 4 ++-- .../org/jetbrains/jet/types/AbstractJetTypeBindingTest.kt | 2 +- .../org/jetbrains/jet/types/BoundsSubstitutorTest.java | 2 +- .../tests/org/jetbrains/jet/types/TypeSubstitutorTest.java | 2 +- .../renderer/AbstractDescriptorRendererTest.kt | 4 ++-- .../renderer/DescriptorRendererTestGenerated.java | 2 +- .../kotlin/serialization/builtins/LoadBuiltinsTest.java | 4 ++-- .../java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt | 2 +- .../descriptors/annotations/AnnotationDescriptorImpl.java | 2 +- .../lang/descriptors/impl/DeclarationDescriptorImpl.java | 2 +- .../src/org/jetbrains/jet/lang/resolve/ImportPath.java | 2 +- .../org/jetbrains/jet/lang/resolve/MemberComparator.java | 4 ++-- .../{jet => kotlin}/renderer/DescriptorRenderer.java | 4 ++-- .../{jet => kotlin}/renderer/DescriptorRendererBuilder.java | 4 ++-- .../{jet => kotlin}/renderer/DescriptorRendererImpl.java | 6 +++--- .../{jet => kotlin}/renderer/KeywordStringsGenerated.java | 2 +- .../jetbrains/{jet => kotlin}/renderer/MultiRenderer.java | 6 +++--- .../org/jetbrains/{jet => kotlin}/renderer/Renderer.java | 4 ++-- .../kotlin/generators/frontend/GenerateKeywordStrings.java | 4 ++-- .../org/jetbrains/kotlin/generators/tests/GenerateTests.kt | 2 +- .../generators/tests/generateTestDataForReservedWords.kt | 2 +- .../jetbrains/jet/plugin/util/IdeDescriptorRenderers.java | 4 ++-- .../jetbrains/jet/plugin/codeInsight/ShortenReferences.kt | 2 +- .../jet/plugin/decompiler/navigation/MemberMatching.java | 2 +- .../plugin/decompiler/textBuilder/DecompiledTextFactory.kt | 4 ++-- .../jet/plugin/highlighter/DeprecatedAnnotationVisitor.java | 2 +- .../plugin/highlighter/HtmlTabledDescriptorRenderer.java | 6 +++--- .../jetbrains/jet/plugin/highlighter/IdeErrorMessages.java | 2 +- .../org/jetbrains/jet/plugin/highlighter/IdeRenderers.java | 4 ++-- .../plugin/highlighter/VariablesHighlightingVisitor.java | 2 +- .../org/jetbrains/jet/plugin/highlighter/renderersUtil.kt | 2 +- .../jet/plugin/references/BuiltInsReferenceResolver.java | 2 +- .../structureView/KotlinStructureElementPresentation.java | 2 +- .../jetbrains/jet/plugin/JetQuickDocumentationProvider.java | 2 +- .../jet/plugin/actions/ShowExpressionTypeAction.java | 2 +- .../actions/internal/CheckPartialBodyResolveAction.kt | 2 +- .../jet/plugin/codeInsight/DescriptorClassMember.java | 2 +- .../codeInsight/JetFunctionPsiElementCellRenderer.java | 2 +- .../plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt | 2 +- .../plugin/codeInsight/OverrideImplementMethodsHandler.java | 4 ++-- .../org/jetbrains/jet/plugin/completion/CompletionUtils.kt | 2 +- .../jetbrains/jet/plugin/completion/LookupElementFactory.kt | 2 +- .../jet/plugin/completion/NamedParametersCompletion.kt | 4 ++-- .../jet/plugin/completion/smart/SmartCompletion.kt | 2 +- .../jetbrains/jet/plugin/completion/smart/StaticMembers.kt | 2 +- .../jet/plugin/completion/smart/TypeInstantiationItems.kt | 2 +- .../debugger/PositionManagerLibraryClassFileSearcher.kt | 2 +- .../org/jetbrains/jet/plugin/findUsages/dialogs/Utils.java | 2 +- .../jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java | 2 +- .../hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java | 2 +- .../plugin/highlighter/markers/SuperDeclarationMarker.kt | 4 ++-- .../ktSignature/KotlinSignatureAnnotationIntention.java | 4 ++-- .../parameterInfo/JetFunctionParameterInfoHandler.java | 2 +- .../plugin/quickfix/ChangeMemberFunctionSignatureFix.java | 4 ++-- .../jet/plugin/quickfix/MapPlatformClassToKotlinFix.java | 2 +- .../src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java | 2 +- .../jet/plugin/refactoring/JetRefactoringUtil.java | 2 +- .../refactoring/changeSignature/JetChangeSignature.kt | 4 ++-- .../changeSignature/JetChangeSignatureUsageProcessor.java | 2 +- .../plugin/refactoring/extractFunction/ExtractionData.kt | 4 ++-- .../jet/plugin/refactoring/extractFunction/extractorUtil.kt | 4 ++-- .../jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt | 2 +- .../refactoring/safeDelete/KotlinOverridingDialog.java | 2 +- .../jet/plugin/util/psi/patternMatching/JetPsiUnifier.kt | 2 +- .../introduceVariable/AbstractJetExtractionTest.kt | 2 +- .../AbstractAdditionalResolveDescriptorRendererTest.java | 2 +- .../jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt | 4 ++-- .../src/test/kotlin/NoInternalVisibilityInStdLibTest.kt | 2 +- 94 files changed, 128 insertions(+), 128 deletions(-) rename compiler/tests/org/jetbrains/{jet => kotlin}/renderer/AbstractDescriptorRendererTest.kt (98%) rename compiler/tests/org/jetbrains/{jet => kotlin}/renderer/DescriptorRendererTestGenerated.java (98%) rename core/descriptors/src/org/jetbrains/{jet => kotlin}/renderer/DescriptorRenderer.java (98%) rename core/descriptors/src/org/jetbrains/{jet => kotlin}/renderer/DescriptorRendererBuilder.java (99%) rename core/descriptors/src/org/jetbrains/{jet => kotlin}/renderer/DescriptorRendererImpl.java (99%) rename core/descriptors/src/org/jetbrains/{jet => kotlin}/renderer/KeywordStringsGenerated.java (97%) rename core/descriptors/src/org/jetbrains/{jet => kotlin}/renderer/MultiRenderer.java (89%) rename core/descriptors/src/org/jetbrains/{jet => kotlin}/renderer/Renderer.java (89%) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index 14a82d246bf..3d24511fe15 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -69,7 +69,7 @@ import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lexer.JetTokens; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.backend.common.CodegenUtil; import org.jetbrains.org.objectweb.asm.Label; import org.jetbrains.org.objectweb.asm.MethodVisitor; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java index 1cfa78a65da..fd20dfcc580 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java @@ -39,7 +39,7 @@ import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterSignat import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; import org.jetbrains.jet.lang.types.lang.InlineStrategy; import org.jetbrains.jet.lang.types.lang.InlineUtil; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.org.objectweb.asm.Label; import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Opcodes; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/DefaultErrorMessagesJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/DefaultErrorMessagesJvm.java index 4b5fb7d4a18..0fc1e905092 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/DefaultErrorMessagesJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/DefaultErrorMessagesJvm.java @@ -20,8 +20,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticFactoryToRendererMap; -import org.jetbrains.jet.renderer.DescriptorRenderer; -import org.jetbrains.jet.renderer.Renderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.Renderer; public class DefaultErrorMessagesJvm implements DefaultErrorMessages.Extension { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java index 0fb7f86601a..5683a7931b2 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.psi.JetTypeReference; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.List; import java.util.Map; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java index 09e8b2dbc64..abef12c5a32 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.types.TypeProjectionImpl; import org.jetbrains.jet.lang.types.Variance; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.Arrays; import java.util.List; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java index 4daec6be985..c2a418216df 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java @@ -43,7 +43,7 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.*; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java index 5cef7698e19..7a037b63fad 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java @@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/TypePredicate.kt b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/TypePredicate.kt index f14de6ab2c0..560caf55524 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/TypePredicate.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/TypePredicate.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.cfg.pseudocode import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.types.checker.JetTypeChecker -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.util.SmartFMap import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.lang.types.TypeUtils diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java index ad55045a5ba..7906472660a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java @@ -36,8 +36,8 @@ import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker.VarianceCo import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lexer.JetKeywordToken; import org.jetbrains.jet.lexer.JetModifierKeywordToken; -import org.jetbrains.jet.renderer.MultiRenderer; -import org.jetbrains.jet.renderer.Renderer; +import org.jetbrains.kotlin.renderer.MultiRenderer; +import org.jetbrains.kotlin.renderer.Renderer; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -46,7 +46,7 @@ import java.util.List; import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lang.diagnostics.rendering.Renderers.*; -import static org.jetbrains.jet.renderer.DescriptorRenderer.*; +import static org.jetbrains.kotlin.renderer.DescriptorRenderer.*; public class DefaultErrorMessages { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticFactoryToRendererMap.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticFactoryToRendererMap.java index 8df3601f263..f26c6c8d123 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticFactoryToRendererMap.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticFactoryToRendererMap.java @@ -20,8 +20,8 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.*; -import org.jetbrains.jet.renderer.MultiRenderer; -import org.jetbrains.jet.renderer.Renderer; +import org.jetbrains.kotlin.renderer.MultiRenderer; +import org.jetbrains.kotlin.renderer.Renderer; import java.util.HashMap; import java.util.Map; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRenderer.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRenderer.java index ac49a023170..6d5b3bab3c0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRenderer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRenderer.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.diagnostics.rendering; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.renderer.Renderer; +import org.jetbrains.kotlin.renderer.Renderer; public interface DiagnosticRenderer extends Renderer { @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.kt b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.kt index aac6b26adea..62074839b2e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.kt @@ -16,10 +16,10 @@ package org.jetbrains.jet.lang.diagnostics.rendering -import org.jetbrains.jet.renderer.Renderer +import org.jetbrains.kotlin.renderer.Renderer import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.resolve.DescriptorUtils.isClassObject -import org.jetbrains.jet.renderer.DescriptorRendererImpl +import org.jetbrains.kotlin.renderer.DescriptorRendererImpl public fun

renderParameter(parameter: P, renderer: Renderer

?): Any = renderer?.render(parameter) ?: parameter diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithMultiParametersRenderer.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithMultiParametersRenderer.java index 4731ece3eb4..9a3cdbbb263 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithMultiParametersRenderer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithMultiParametersRenderer.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.diagnostics.rendering; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1; -import org.jetbrains.jet.renderer.MultiRenderer; +import org.jetbrains.kotlin.renderer.MultiRenderer; public class DiagnosticWithMultiParametersRenderer extends AbstractDiagnosticWithParametersRenderer> { @NotNull private final MultiRenderer renderersForA; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters1Renderer.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters1Renderer.java index 49ed8703f8c..f2737f7dcfa 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters1Renderer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters1Renderer.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.diagnostics.rendering; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1; -import org.jetbrains.jet.renderer.Renderer; +import org.jetbrains.kotlin.renderer.Renderer; import static org.jetbrains.jet.lang.diagnostics.rendering.RenderingPackage.renderParameter; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters2Renderer.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters2Renderer.java index 5c735937151..5aea34f9ce8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters2Renderer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters2Renderer.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.diagnostics.rendering; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters2; -import org.jetbrains.jet.renderer.Renderer; +import org.jetbrains.kotlin.renderer.Renderer; import static org.jetbrains.jet.lang.diagnostics.rendering.RenderingPackage.renderParameter; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters3Renderer.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters3Renderer.java index 26b4b247873..004438119b1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters3Renderer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters3Renderer.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.diagnostics.rendering; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters3; -import org.jetbrains.jet.renderer.Renderer; +import org.jetbrains.kotlin.renderer.Renderer; import static org.jetbrains.jet.lang.diagnostics.rendering.RenderingPackage.renderParameter; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java index 39e8ec68997..b37a42473d4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java @@ -37,8 +37,8 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.renderer.DescriptorRenderer; -import org.jetbrains.jet.renderer.Renderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.Renderer; import java.util.Collection; import java.util.Iterator; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/TabledDescriptorRenderer.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/TabledDescriptorRenderer.java index 9164f237fd8..3afbc0cf124 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/TabledDescriptorRenderer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/TabledDescriptorRenderer.java @@ -28,8 +28,8 @@ import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.Tab import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TextRenderer.TextElement; import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.renderer.DescriptorRenderer; -import org.jetbrains.jet.renderer.Renderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.Renderer; import java.util.Iterator; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java index 497da6ae9a4..146140a2cda 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java @@ -41,7 +41,7 @@ import org.jetbrains.jet.lang.resolve.resolveUtil.ResolveUtilPackage; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.utils.UtilsPackage; import javax.inject.Inject; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java index 8b9f51aa67a..4f6d2d46ae5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java @@ -40,7 +40,7 @@ import org.jetbrains.jet.lang.resolve.lazy.descriptors.*; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.storage.*; import javax.inject.Inject; diff --git a/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt b/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt index 613e2fb620a..51f2a969eb1 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt +++ b/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt @@ -35,7 +35,7 @@ import java.util.HashMap import org.jetbrains.jet.lang.types.JetTypeImpl import java.util.regex.Pattern import org.jetbrains.jet.lang.resolve.calls.tasks.ResolutionTaskHolder -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.jet.lang.psi.debugText.getDebugText import org.jetbrains.jet.lang.resolve.calls.tasks.ResolutionCandidate diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java index 1a865fb243d..6a28581e6cf 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java @@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.java.kotlinSignature.TypeTransformingVisit import org.jetbrains.jet.lang.resolve.java.mapping.JavaToKotlinClassMap; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolver; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java index 61da3931a57..a66d84fe350 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.java.JavaBindingContext; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.*; diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java index 72b81c9d358..f056d7a9fc9 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java @@ -41,7 +41,7 @@ import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeConstructor; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.List; import java.util.Map; diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java b/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java index 09ffac7deda..9b633e8cf28 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java @@ -35,8 +35,8 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.TypeProjection; -import org.jetbrains.jet.renderer.DescriptorRenderer; -import org.jetbrains.jet.renderer.DescriptorRendererBuilder; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt b/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt index 0a844abe337..0edfc6a19f4 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt @@ -28,7 +28,7 @@ import java.io.File import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil import org.jetbrains.jet.lang.resolve.calls.model.ArgumentMapping import org.jetbrains.jet.lang.resolve.calls.model.ArgumentMatch -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.openapi.util.io.FileUtil import org.jetbrains.jet.lang.psi.ValueArgument import org.jetbrains.jet.lang.psi.JetPsiFactory diff --git a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java index 4816f20dda6..c08d07b0b37 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java +++ b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java @@ -31,8 +31,8 @@ import org.jetbrains.jet.lang.resolve.MemberComparator; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.renderer.DescriptorRenderer; -import org.jetbrains.jet.renderer.DescriptorRendererBuilder; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; import org.jetbrains.kotlin.utils.Printer; import org.junit.Assert; diff --git a/compiler/tests/org/jetbrains/jet/types/AbstractJetTypeBindingTest.kt b/compiler/tests/org/jetbrains/jet/types/AbstractJetTypeBindingTest.kt index 15909dd746f..e6b4b32e438 100644 --- a/compiler/tests/org/jetbrains/jet/types/AbstractJetTypeBindingTest.kt +++ b/compiler/tests/org/jetbrains/jet/types/AbstractJetTypeBindingTest.kt @@ -24,7 +24,7 @@ import org.junit.Assert.* import org.jetbrains.jet.lang.resolve.BindingTraceContext import org.jetbrains.jet.lang.resolve.typeBinding.* import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil import org.jetbrains.jet.lang.psi.JetCallableDeclaration diff --git a/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java b/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java index 25bbc43d8e1..d5a46007ea2 100644 --- a/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.BoundsSubstitutor; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.util.Collection; diff --git a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java b/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java index b0e4d4c49c0..fb9c2eafa7b 100644 --- a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java @@ -43,7 +43,7 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.*; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForTests; diff --git a/compiler/tests/org/jetbrains/jet/renderer/AbstractDescriptorRendererTest.kt b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt similarity index 98% rename from compiler/tests/org/jetbrains/jet/renderer/AbstractDescriptorRendererTest.kt rename to compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt index 27c454698c7..a856e32a0e9 100644 --- a/compiler/tests/org/jetbrains/jet/renderer/AbstractDescriptorRendererTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.renderer +package org.jetbrains.kotlin.renderer import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.psi.JetVisitorVoid diff --git a/compiler/tests/org/jetbrains/jet/renderer/DescriptorRendererTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/renderer/DescriptorRendererTestGenerated.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/renderer/DescriptorRendererTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/renderer/DescriptorRendererTestGenerated.java index d84516e7c63..709cd15f9cd 100644 --- a/compiler/tests/org/jetbrains/jet/renderer/DescriptorRendererTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/renderer/DescriptorRendererTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.renderer; +package org.jetbrains.kotlin.renderer; import com.intellij.testFramework.TestDataPath; import org.jetbrains.jet.JUnit3RunnerWithInners; diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java index b6c4570069e..c2e2515c694 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java @@ -29,8 +29,8 @@ import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyPackageDescriptor; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.renderer.DescriptorRenderer; -import org.jetbrains.jet.renderer.DescriptorRendererBuilder; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; import org.jetbrains.jet.test.util.RecursiveDescriptorComparator; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt index 6020a1ec897..1c87b4c39a9 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt @@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage import org.jetbrains.kotlin.utils.valuesToMap import org.jetbrains.kotlin.utils.keysToMapExceptNulls import org.jetbrains.jet.lang.resolve.java.lazy.types.toAttributes -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.jet.lang.resolve.java.mapping.JavaToKotlinClassMap import org.jetbrains.jet.lang.resolve.resolveTopLevelClass import org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.kotlinFqNameToJavaFqName diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptorImpl.java index 474791f3a5b..b124350c3d3 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptorImpl.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.Collections; import java.util.Map; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorImpl.java index a38a821918d..03fcb859360 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorImpl.java @@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorVisitor; import org.jetbrains.jet.lang.descriptors.annotations.AnnotatedImpl; import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; public abstract class DeclarationDescriptorImpl extends AnnotatedImpl implements DeclarationDescriptor { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/ImportPath.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/ImportPath.java index 9c2a23a7862..cdf6687937c 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/ImportPath.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/ImportPath.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; public final class ImportPath { private final @NotNull FqName fqName; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/MemberComparator.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/MemberComparator.java index 2ddcc2d63ac..4c0e80472c3 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/MemberComparator.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/MemberComparator.java @@ -18,8 +18,8 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.renderer.DescriptorRenderer; -import org.jetbrains.jet.renderer.DescriptorRendererBuilder; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; import java.util.Comparator; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.java similarity index 98% rename from core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java rename to core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.java index a70dac46d34..fa3ca8697fa 100644 --- a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.renderer; +package org.jetbrains.kotlin.renderer; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; diff --git a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererBuilder.java b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererBuilder.java similarity index 99% rename from core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererBuilder.java rename to core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererBuilder.java index 79dd71c04d2..30679925b23 100644 --- a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererBuilder.java +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.renderer; +package org.jetbrains.kotlin.renderer; import kotlin.Function1; import kotlin.KotlinPackage; diff --git a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java similarity index 99% rename from core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java index 876625c9ba3..e23b58b51be 100644 --- a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.renderer; +package org.jetbrains.kotlin.renderer; import kotlin.Function1; import kotlin.KotlinPackage; @@ -624,7 +624,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer { } } - private boolean overridesSomething(CallableMemberDescriptor callable) { + private static boolean overridesSomething(CallableMemberDescriptor callable) { return !callable.getOverriddenDescriptors().isEmpty(); } diff --git a/core/descriptors/src/org/jetbrains/jet/renderer/KeywordStringsGenerated.java b/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java similarity index 97% rename from core/descriptors/src/org/jetbrains/jet/renderer/KeywordStringsGenerated.java rename to core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java index 14ac8f990ce..db087d3c1e1 100644 --- a/core/descriptors/src/org/jetbrains/jet/renderer/KeywordStringsGenerated.java +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.renderer; +package org.jetbrains.kotlin.renderer; import java.util.Arrays; import java.util.Set; diff --git a/core/descriptors/src/org/jetbrains/jet/renderer/MultiRenderer.java b/core/descriptors/src/org/jetbrains/kotlin/renderer/MultiRenderer.java similarity index 89% rename from core/descriptors/src/org/jetbrains/jet/renderer/MultiRenderer.java rename to core/descriptors/src/org/jetbrains/kotlin/renderer/MultiRenderer.java index f650d09a7fc..abb858312aa 100644 --- a/core/descriptors/src/org/jetbrains/jet/renderer/MultiRenderer.java +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/MultiRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.renderer; +package org.jetbrains.kotlin.renderer; import org.jetbrains.annotations.NotNull; public interface MultiRenderer { @NotNull String[] render(@NotNull O object); -} \ No newline at end of file +} diff --git a/core/descriptors/src/org/jetbrains/jet/renderer/Renderer.java b/core/descriptors/src/org/jetbrains/kotlin/renderer/Renderer.java similarity index 89% rename from core/descriptors/src/org/jetbrains/jet/renderer/Renderer.java rename to core/descriptors/src/org/jetbrains/kotlin/renderer/Renderer.java index 1d8778fae97..e0efa96a459 100644 --- a/core/descriptors/src/org/jetbrains/jet/renderer/Renderer.java +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/Renderer.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.renderer; +package org.jetbrains.kotlin.renderer; import org.jetbrains.annotations.NotNull; diff --git a/generators/src/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java b/generators/src/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java index 8edb779db69..dd5df4d3f33 100644 --- a/generators/src/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java +++ b/generators/src/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java @@ -31,7 +31,7 @@ import java.util.Iterator; import java.util.List; public class GenerateKeywordStrings { - public static final File DEST_FILE = new File("core/descriptors/src/org/jetbrains/jet/renderer/KeywordStringsGenerated.java"); + public static final File DEST_FILE = new File("core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java"); @NotNull public static String generate() throws IOException { @@ -39,7 +39,7 @@ public class GenerateKeywordStrings { Printer p = new Printer(sb); p.println(FileUtil.loadFile(new File("generators/injector-generator/copyright.txt"))); - p.println("package org.jetbrains.jet.renderer;"); + p.println("package org.jetbrains.kotlin.renderer;"); p.println(); p.println("import java.util.Arrays;"); p.println("import java.util.Set;"); diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 282a1fe84fd..f94ef1c84fd 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -130,7 +130,7 @@ import org.jetbrains.jet.completion.AbstractMultiFileSmartCompletionTest import org.jetbrains.jet.completion.handlers.AbstractCompletionCharFilterTest import org.jetbrains.jet.resolve.AbstractPartialBodyResolveTest import org.jetbrains.jet.checkers.AbstractJetDiagnosticsTestWithJsStdLib -import org.jetbrains.jet.renderer.AbstractDescriptorRendererTest +import org.jetbrains.kotlin.renderer.AbstractDescriptorRendererTest import org.jetbrains.jet.types.AbstractJetTypeBindingTest import org.jetbrains.jet.plugin.debugger.evaluate.AbstractCodeFragmentCompletionHandlerTest import org.jetbrains.jet.plugin.coverage.AbstractKotlinCoverageOutputFilesTest diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt index 2ec487aba85..ad529180018 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.generators.tests.reservedWords import java.io.File -import org.jetbrains.jet.renderer.KeywordStringsGenerated +import org.jetbrains.kotlin.renderer.KeywordStringsGenerated import com.google.dart.compiler.backend.js.ast.JsFunctionScope import org.jetbrains.kotlin.generators.di.GeneratorsFileUtil.writeFileIfContentChanged diff --git a/idea/ide-common/src/org/jetbrains/jet/plugin/util/IdeDescriptorRenderers.java b/idea/ide-common/src/org/jetbrains/jet/plugin/util/IdeDescriptorRenderers.java index a0c327b8de0..7ced6b46ce6 100644 --- a/idea/ide-common/src/org/jetbrains/jet/plugin/util/IdeDescriptorRenderers.java +++ b/idea/ide-common/src/org/jetbrains/jet/plugin/util/IdeDescriptorRenderers.java @@ -18,8 +18,8 @@ package org.jetbrains.jet.plugin.util; import kotlin.Function1; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.renderer.DescriptorRenderer; -import org.jetbrains.jet.renderer.DescriptorRendererBuilder; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; public class IdeDescriptorRenderers { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt index 97338a80670..4b230ae29d1 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt @@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.HashSet; import com.intellij.psi.util.PsiTreeUtil import com.intellij.openapi.util.TextRange diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/MemberMatching.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/MemberMatching.java index b9cfffdf1f6..c0cbb8f9735 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/MemberMatching.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/MemberMatching.java @@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lexer.JetTokens; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.Collections; import java.util.List; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt index d5b394c636c..a8d72ef27f3 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt @@ -21,8 +21,8 @@ import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.renderer.DescriptorRenderer -import org.jetbrains.jet.renderer.DescriptorRendererBuilder +import org.jetbrains.kotlin.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder import java.util.* import org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumEntry import org.jetbrains.jet.lang.resolve.DescriptorUtils.isSyntheticClassObject diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java index fbfc1db9ee2..120e35a9a5a 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java @@ -39,7 +39,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lexer.JetTokens; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.DEFAULT_ANNOTATION_MEMBER_NAME; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java index ebccf619c36..a289e323de6 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java @@ -27,9 +27,9 @@ import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.Tab import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.TableRow; import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.renderer.DescriptorRenderer; -import org.jetbrains.jet.renderer.DescriptorRendererBuilder; -import org.jetbrains.jet.renderer.Renderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; +import org.jetbrains.kotlin.renderer.Renderer; import java.util.Iterator; import java.util.List; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java index 1710efd0514..e7337685c8f 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java @@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticFactoryToRendererMap; import org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticRenderer; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lang.diagnostics.rendering.Renderers.RENDER_CLASS_OR_OBJECT; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java index 1642c80579b..f6050bc72c5 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java @@ -24,8 +24,8 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.java.diagnostics.ConflictingJvmDeclarationsData; import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.renderer.DescriptorRenderer; -import org.jetbrains.jet.renderer.Renderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.Renderer; import java.util.Collection; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java index 42cb008a53a..cb17ca2601d 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.expressions.CaptureKind; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import static org.jetbrains.jet.lang.resolve.BindingContext.*; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/renderersUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/renderersUtil.kt index d1b91f5a0df..68de833f864 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/renderersUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/renderersUtil.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.highlighter.renderersUtil import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor import org.jetbrains.jet.lang.resolve.calls.callUtil.* import org.jetbrains.jet.lang.resolve.DescriptorUtils diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java index 67102e56a39..e9decdcb082 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java @@ -47,7 +47,7 @@ import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedDeclarationProv import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.asJava.LightClassUtil; import org.jetbrains.kotlin.di.InjectorForLazyTopDownAnalyzerBasic; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinStructureElementPresentation.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinStructureElementPresentation.java index d8e961177fc..f8613563cb9 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinStructureElementPresentation.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinStructureElementPresentation.java @@ -40,7 +40,7 @@ import java.util.Set; import static org.jetbrains.jet.lang.resolve.OverrideResolver.filterOutOverridden; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getAllOverriddenDeclarations; -import static org.jetbrains.jet.renderer.DescriptorRenderer.ONLY_NAMES_WITH_SHORT_TYPES; +import static org.jetbrains.kotlin.renderer.DescriptorRenderer.ONLY_NAMES_WITH_SHORT_TYPES; class KotlinStructureElementPresentation implements ColoredItemPresentation, LocationPresentation { private final TextAttributesKey attributesKey; diff --git a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java index 3576bf9ef49..d4c7a7065d0 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java @@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.psi.JetPackageDirective; import org.jetbrains.jet.lang.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.asJava.KotlinLightMethod; public class JetQuickDocumentationProvider extends AbstractDocumentationProvider { diff --git a/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java b/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java index ad0ffa76b78..fbd684bd3c7 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.JetLanguage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; public class ShowExpressionTypeAction extends AnAction { @Override diff --git a/idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt b/idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt index 593b4125978..d2adae792d1 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt +++ b/idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt @@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.psi.JetReferenceExpression import org.jetbrains.jet.lang.resolve.BindingContext import com.intellij.openapi.fileEditor.FileDocumentManager import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.openapi.diff.DiffManager import com.intellij.openapi.diff.SimpleDiffRequest import com.intellij.openapi.diff.SimpleContent diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java index b7b4d0afb1f..0d1697cc8ed 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.psi.JetClass; import org.jetbrains.jet.lang.psi.JetDeclaration; import org.jetbrains.jet.lang.psi.JetNamedDeclaration; import org.jetbrains.jet.plugin.JetDescriptorIconProvider; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import javax.swing.*; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java index 6c680e1ed76..e3986853665 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.psi.JetNamedFunction; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; public class JetFunctionPsiElementCellRenderer extends DefaultPsiElementCellRenderer { @Override diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt index 725d07546f4..3abe707d400 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt @@ -61,7 +61,7 @@ import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils import org.jetbrains.jet.plugin.imports.* import org.jetbrains.jet.lang.psi.psiUtil.getReceiverExpression import org.jetbrains.kotlin.utils.* -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.jet.lang.resolve.descriptorUtil.isExtension import com.intellij.openapi.progress.ProcessCanceledException import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java index 6aff8c08b44..efdf6f524cc 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java @@ -38,8 +38,8 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.quickfix.QuickfixPackage; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; -import org.jetbrains.jet.renderer.DescriptorRenderer; -import org.jetbrains.jet.renderer.DescriptorRendererBuilder; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; import java.util.ArrayList; import java.util.Collections; diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionUtils.kt b/idea/src/org/jetbrains/jet/plugin/completion/CompletionUtils.kt index c19091d6561..1602eba6f16 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/CompletionUtils.kt @@ -55,7 +55,7 @@ import org.jetbrains.jet.lang.psi.JetExpression import java.util.ArrayList import org.jetbrains.jet.plugin.util.getImplicitReceiversWithInstance import com.intellij.codeInsight.lookup.LookupElementBuilder -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.jet.plugin.util.FuzzyType import org.jetbrains.jet.lang.psi.JetLabeledExpression import org.jetbrains.jet.lang.psi.JetElement diff --git a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt index 32705691958..39ca7d91cdf 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.plugin.JetDescriptorIconProvider import org.jetbrains.jet.plugin.completion.handlers.* -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.psi.PsiClass import org.jetbrains.kotlin.asJava.KotlinLightClass import com.intellij.codeInsight.lookup.LookupElementDecorator diff --git a/idea/src/org/jetbrains/jet/plugin/completion/NamedParametersCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/NamedParametersCompletion.kt index 7ca03e1232b..a321485dc12 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/NamedParametersCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/NamedParametersCompletion.kt @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import com.intellij.codeInsight.lookup.LookupElementBuilder import org.jetbrains.jet.plugin.JetIcons import org.jetbrains.jet.plugin.quickfix.QuickFixUtil -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.completion.InsertionContext import com.intellij.psi.filters.AndFilter @@ -111,4 +111,4 @@ object NamedParametersCompletion { WithTailInsertHandler.eqTail().postHandleInsert(context, item) } } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt index 83114c45cd9..f015fe4f000 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt @@ -28,7 +28,7 @@ import org.jetbrains.jet.plugin.completion.* import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.plugin.util.makeNotNullable import org.jetbrains.jet.plugin.util.makeNullable -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade import com.intellij.psi.search.GlobalSearchScope diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt index 7c3e80be0c5..adc95b46041 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt @@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.lang.resolve.DescriptorUtils import com.intellij.codeInsight.lookup.LookupElementDecorator import com.intellij.codeInsight.lookup.LookupElementPresentation -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.codeInsight.completion.InsertionContext import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.completion.ExpectedInfo diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt index ad6e7edc63b..dff21a04014 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt @@ -20,7 +20,7 @@ import com.intellij.codeInsight.lookup.LookupElement import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.codeInsight.completion.InsertHandler import org.jetbrains.jet.lang.descriptors.Modality import org.jetbrains.jet.lang.descriptors.ClassKind diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt b/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt index b119d7a85a4..19619be4f81 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt @@ -20,7 +20,7 @@ import com.intellij.psi.search.FilenameIndex import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils import org.jetbrains.jet.lang.psi.JetElement import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.openapi.diagnostic.Logger import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import com.intellij.openapi.roots.libraries.LibraryUtil diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/Utils.java b/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/Utils.java index 0da36f5d702..26277a8667b 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/Utils.java +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/Utils.java @@ -20,7 +20,7 @@ import com.intellij.ui.SimpleColoredComponent; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.psi.JetNamedDeclaration; import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearchPackage; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import javax.swing.*; import java.awt.*; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java index 817bbd66e5d..5be0b09a1b9 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java @@ -39,7 +39,7 @@ import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.decompiler.navigation.JetSourceNavigationHelper; import org.jetbrains.jet.plugin.stubindex.JetClassShortNameIndex; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java index 49d4570ea25..31c0e2b2a66 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java @@ -43,7 +43,7 @@ import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import javax.swing.*; import java.awt.*; diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt index 65f24dadb1b..3f7581e5665 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt @@ -19,8 +19,8 @@ package org.jetbrains.jet.plugin.highlighter.markers import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor import org.jetbrains.jet.lang.resolve.OverrideResolver import org.jetbrains.jet.lang.descriptors.Modality -import org.jetbrains.jet.renderer.DescriptorRenderer -import org.jetbrains.jet.renderer.DescriptorRendererBuilder +import org.jetbrains.kotlin.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder import org.jetbrains.jet.lang.descriptors.PropertyAccessorDescriptor import org.jetbrains.jet.lang.descriptors.PropertyDescriptor import com.intellij.psi.NavigatablePsiElement diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java index a1594cfe665..73fc5a24e73 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java @@ -45,8 +45,8 @@ import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetIcons; import org.jetbrains.jet.plugin.caches.resolve.JavaResolveExtension; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; -import org.jetbrains.jet.renderer.DescriptorRenderer; -import org.jetbrains.jet.renderer.DescriptorRendererBuilder; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; import javax.swing.*; diff --git a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java index 9cfc84b6775..595b41565ae 100644 --- a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java @@ -51,7 +51,7 @@ import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.codeInsight.ReferenceVariantsHelper; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.awt.*; import java.util.*; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java index a5ed8727dff..e489c013bac 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java @@ -51,8 +51,8 @@ import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; -import org.jetbrains.jet.renderer.DescriptorRenderer; -import org.jetbrains.jet.renderer.DescriptorRendererBuilder; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; import javax.swing.*; import java.util.*; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java index dc4671e4640..2930b95d5f6 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java @@ -38,7 +38,7 @@ import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.ArrayList; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java index 9d091c572ba..20b42f0cb27 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java @@ -46,7 +46,7 @@ import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; import org.jetbrains.jet.plugin.util.UtilPackage; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.Collections; import java.util.LinkedHashSet; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java index 51e00a469d6..cb6f599c79c 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java @@ -54,7 +54,7 @@ import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils; import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; import org.jetbrains.jet.plugin.util.string.StringPackage; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.asJava.AsJavaPackage; import org.jetbrains.kotlin.asJava.KotlinLightMethod; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignature.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignature.kt index d3918157347..1527e88c481 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignature.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignature.kt @@ -26,7 +26,7 @@ import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.JetBundle -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import java.util.* import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.* import org.jetbrains.annotations.TestOnly @@ -230,4 +230,4 @@ TestOnly public fun getChangeSignatureDialog(project: Project, defaultValueContext: PsiElement): JetChangeSignatureDialog? { val jetChangeSignature = JetChangeSignature(project, functionDescriptor, configuration, bindingContext, defaultValueContext, null) return jetChangeSignature.createChangeSignatureDialog(OverrideResolver.getDeepestSuperDeclarations(functionDescriptor)) -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java index 3f31e4eb5a2..6b9868d0fc9 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java @@ -47,7 +47,7 @@ import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.refactoring.RefactoringPackage; import org.jetbrains.jet.plugin.refactoring.changeSignature.usages.*; import org.jetbrains.jet.plugin.references.JetSimpleNameReference; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.Collections; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt index c1ab9bd9eb6..f3548900a3d 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import java.util.Collections import org.jetbrains.jet.lang.psi.JetBlockExpression -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.jet.lang.psi.JetQualifiedExpression import org.jetbrains.jet.lang.psi.psiUtil.isInsideOf import java.util.ArrayList @@ -182,4 +182,4 @@ data class ExtractionData( // So we take offset of the left brace instead and increase it by 2 (which is length of "{\n" separating block start and its first element) private fun JetBlockExpression.getBlockContentOffset(): Int { return getLBrace()!!.getTextRange()!!.getStartOffset() + 2 -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractorUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractorUtil.kt index f0d6687d4f6..e2e9662f559 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractorUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractorUtil.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.refactoring.extractFunction -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.jet.lang.psi.JetElement import org.jetbrains.jet.lang.psi.JetSimpleNameExpression import java.util.HashMap @@ -533,4 +533,4 @@ fun ExtractableCodeDescriptor.generateDeclaration(options: ExtractionGeneratorOp val duplicateReplacers = duplicates.map { it.range to { makeCall(this, declaration, it.controlFlow, it.range, it.arguments) } }.toMap() return ExtractionResult(declaration, duplicateReplacers, nameByOffset) -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt index 59bd30fbba3..9eb15afb042 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt @@ -59,7 +59,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.psi.psiUtil.isAncestor import com.intellij.psi.PsiNamedElement import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.openapi.util.text.StringUtil import javax.swing.Icon import org.jetbrains.jet.plugin.util.string.collapseSpaces diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java index 4a86d0bfb81..8a05c1ece49 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java @@ -45,7 +45,7 @@ import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; -import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import javax.swing.*; import javax.swing.event.ListSelectionEvent; diff --git a/idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiUnifier.kt b/idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiUnifier.kt index 64649d91d94..3b1ba17c9a8 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiUnifier.kt +++ b/idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiUnifier.kt @@ -75,7 +75,7 @@ import org.jetbrains.jet.lang.psi.JetCallableDeclaration import org.jetbrains.jet.lang.psi.JetClassObject import org.jetbrains.jet.lang.psi.JetTypeParameter import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.jet.lang.psi.JetClass import org.jetbrains.jet.lang.descriptors.VariableDescriptor diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt index a9e9f5d3c45..20472b4193d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt @@ -29,7 +29,7 @@ import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsExcepti import org.jetbrains.jet.JetTestUtils import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture import org.jetbrains.jet.InTextDirectivesUtils -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import kotlin.test.assertEquals import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractAdditionalResolveDescriptorRendererTest.java b/idea/tests/org/jetbrains/jet/resolve/AbstractAdditionalResolveDescriptorRendererTest.java index 21ead528944..35edda82411 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractAdditionalResolveDescriptorRendererTest.java +++ b/idea/tests/org/jetbrains/jet/resolve/AbstractAdditionalResolveDescriptorRendererTest.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.psi.JetPsiUtil; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.plugin.project.ResolveElementCache; -import org.jetbrains.jet.renderer.AbstractDescriptorRendererTest; +import org.jetbrains.kotlin.renderer.AbstractDescriptorRendererTest; public abstract class AbstractAdditionalResolveDescriptorRendererTest extends AbstractDescriptorRendererTest { @NotNull diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt b/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt index 05e4747caed..47990b6f56d 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt +++ b/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt @@ -30,7 +30,7 @@ import java.io.File import org.jetbrains.jet.lang.psi.JetBlockExpression import org.junit.Assert import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.jet.lang.descriptors.VariableDescriptor import org.jetbrains.jet.lang.psi.JetSimpleNameExpression import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade @@ -199,4 +199,4 @@ public abstract class AbstractPartialBodyResolveTest : JetLightCodeInsightFixtur } return builder.toString() } -} \ No newline at end of file +} diff --git a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt index 1be7f48281d..4955a445030 100644 --- a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt +++ b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor import java.util.ArrayList import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRenderer import kotlin.test.fail import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.jet.lang.resolve.DescriptorUtils