diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CompilationException.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CompilationException.java index 5c36ecd125e..a9200eb6d8b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CompilationException.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CompilationException.java @@ -21,7 +21,7 @@ import com.intellij.openapi.util.Computable; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; +import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; public class CompilationException extends RuntimeException { private final PsiElement element; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index b7688507726..e9e2cdd52fc 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -42,7 +42,7 @@ import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.codegen.when.SwitchCodegen; import org.jetbrains.kotlin.codegen.when.SwitchCodegenUtil; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; +import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; import org.jetbrains.kotlin.resolve.constants.evaluate.EvaluatePackage; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java index 959bb0639a1..91f30035d1a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java @@ -44,7 +44,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; -import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; +import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.MemberComparator; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt index 9ed295d4466..89ddd5b6212 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.kotlin.codegen.ClassBuilderMode import org.jetbrains.jet.lang.resolve.java.descriptor.SamAdapterDescriptor import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils -import org.jetbrains.jet.lang.diagnostics.DiagnosticSink +import org.jetbrains.kotlin.diagnostics.DiagnosticSink class BuilderFactoryForDuplicateSignatureDiagnostics( builderFactory: ClassBuilderFactory, diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java index dbd9db30fba..c61ce23807d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.codegen.optimization.OptimizationClassBuilderFactory import org.jetbrains.kotlin.codegen.when.MappingsClassesForWhenByEnum; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.descriptors.ScriptDescriptor; -import org.jetbrains.jet.lang.diagnostics.DiagnosticSink; +import org.jetbrains.kotlin.diagnostics.DiagnosticSink; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetScript; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java index ccc0c6e33d7..d4cc16fc150 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java @@ -28,8 +28,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.diagnostics.*; -import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; +import org.jetbrains.kotlin.diagnostics.*; +import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingContext; @@ -46,7 +46,7 @@ import java.util.Collection; import java.util.List; import static com.intellij.openapi.util.io.FileUtil.toSystemDependentName; -import static org.jetbrains.jet.lang.diagnostics.DiagnosticUtils.sortedDiagnostics; +import static org.jetbrains.kotlin.diagnostics.DiagnosticUtils.sortedDiagnostics; public final class AnalyzerWithCompilerReport { diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/MessageUtil.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/MessageUtil.java index b118769738a..0d07189382d 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/MessageUtil.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/MessageUtil.java @@ -23,7 +23,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; +import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; import static com.intellij.openapi.util.io.FileUtil.toSystemDependentName; 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 eb906ec6a30..7ec419a5f25 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 @@ -18,8 +18,8 @@ package org.jetbrains.jet.lang.resolve.java.diagnostics; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; -import org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticFactoryToRendererMap; +import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; +import org.jetbrains.kotlin.diagnostics.rendering.DiagnosticFactoryToRendererMap; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.Renderer; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/ErrorsJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/ErrorsJvm.java index dc13613f037..84e6616f0b3 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/ErrorsJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/ErrorsJvm.java @@ -18,13 +18,13 @@ package org.jetbrains.jet.lang.resolve.java.diagnostics; import com.intellij.psi.PsiElement; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory0; -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory1; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory0; +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory1; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.JetDeclaration; -import static org.jetbrains.jet.lang.diagnostics.PositioningStrategies.*; -import static org.jetbrains.jet.lang.diagnostics.Severity.ERROR; +import static org.jetbrains.kotlin.diagnostics.PositioningStrategies.*; +import static org.jetbrains.kotlin.diagnostics.Severity.ERROR; public interface ErrorsJvm { DiagnosticFactory1 CONFLICTING_JVM_DECLARATIONS = diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaDeclarationCheckerProvider.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaDeclarationCheckerProvider.kt index d8965184ea4..3c66216f571 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaDeclarationCheckerProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaDeclarationCheckerProvider.kt @@ -26,11 +26,11 @@ import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.jet.lang.resolve.java.diagnostics.ErrorsJvm import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.JetProperty -import org.jetbrains.jet.lang.diagnostics.DiagnosticSink +import org.jetbrains.kotlin.diagnostics.DiagnosticSink import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.jet.lang.resolve.annotations.hasInlineAnnotation import org.jetbrains.kotlin.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.diagnostics.Errors +import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/native.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/native.kt index f5547b49d9e..044f1f1d721 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/native.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/native.kt @@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.AnnotationChecker import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.diagnostics.DiagnosticSink +import org.jetbrains.kotlin.diagnostics.DiagnosticSink import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.Modality diff --git a/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java b/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java index c9f177b3a23..21fbf0b3fde 100644 --- a/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java @@ -33,12 +33,12 @@ import com.intellij.util.containers.Stack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; -import org.jetbrains.jet.lang.diagnostics.Severity; -import org.jetbrains.jet.lang.diagnostics.rendering.AbstractDiagnosticWithParametersRenderer; -import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; -import org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticRenderer; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; +import org.jetbrains.kotlin.diagnostics.Severity; +import org.jetbrains.kotlin.diagnostics.rendering.AbstractDiagnosticWithParametersRenderer; +import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; +import org.jetbrains.kotlin.diagnostics.rendering.DiagnosticRenderer; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetReferenceExpression; diff --git a/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java b/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java index ecf232ef556..8b79104b2b8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java @@ -27,9 +27,9 @@ import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.descriptors.VariableDescriptor; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticParameter.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticParameter.java deleted file mode 100644 index e52efdda5cb..00000000000 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticParameter.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2010-2013 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.lang.diagnostics; - -public interface DiagnosticParameter

{ -} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticParameterImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticParameterImpl.java deleted file mode 100644 index 11347ab3a27..00000000000 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticParameterImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2010-2013 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.lang.diagnostics; - -public class DiagnosticParameterImpl

implements DiagnosticParameter

{ - private final String value; - - public DiagnosticParameterImpl(String value) { - this.value = value; - } - - @Override - public String toString() { - return this.value; - } -} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticParameters.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticParameters.java deleted file mode 100644 index 8e2d6db322e..00000000000 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticParameters.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2010-2013 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.lang.diagnostics; - -import org.jetbrains.kotlin.lexer.JetKeywordToken; -import org.jetbrains.kotlin.psi.JetClass; -import org.jetbrains.kotlin.psi.JetProperty; -import org.jetbrains.kotlin.types.JetType; - -public interface DiagnosticParameters { - DiagnosticParameter MODIFIER = new DiagnosticParameterImpl("MODIFIER"); - DiagnosticParameter CLASS = new DiagnosticParameterImpl("CLASS"); - DiagnosticParameter TYPE = new DiagnosticParameterImpl("TYPE"); - DiagnosticParameter PROPERTY = new DiagnosticParameterImpl("TYPE"); -} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java index a56387f75f4..d4ce651bf8b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java @@ -20,9 +20,9 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiErrorElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.DiagnosticSink; -import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.DiagnosticSink; +import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetTreeVisitorVoid; import org.jetbrains.kotlin.psi.debugText.DebugTextPackage; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationChecker.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationChecker.kt index b6549942a07..5cfa40bb0e4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationChecker.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationChecker.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.descriptors.MemberDescriptor -import org.jetbrains.jet.lang.diagnostics.DiagnosticSink +import org.jetbrains.kotlin.diagnostics.DiagnosticSink import org.jetbrains.kotlin.descriptors.DeclarationDescriptor public trait AnnotationChecker { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java index b7633ca6cda..624352b8e6f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.annotations.AnnotationsImpl; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; @@ -54,7 +54,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.jetbrains.jet.lang.diagnostics.Errors.NOT_AN_ANNOTATION_CLASS; +import static org.jetbrains.kotlin.diagnostics.Errors.NOT_AN_ANNOTATION_CLASS; import static org.jetbrains.jet.lang.resolve.BindingContext.ANNOTATION_DESCRIPTOR_TO_PSI_ELEMENT; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java index b2e2ce93d14..fc97c869d4e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java @@ -37,7 +37,7 @@ import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; import java.util.Collection; import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DECLARATION; -import static org.jetbrains.jet.lang.diagnostics.Errors.AMBIGUOUS_LABEL; +import static org.jetbrains.kotlin.diagnostics.Errors.AMBIGUOUS_LABEL; import static org.jetbrains.jet.lang.resolve.BindingContext.*; public class BindingContextUtils { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTrace.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTrace.java index 3d2afd8c575..a0ff88374c6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTrace.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTrace.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.diagnostics.DiagnosticSink; +import org.jetbrains.kotlin.diagnostics.DiagnosticSink; import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; import org.jetbrains.jet.util.slicedmap.WritableSlice; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java index aa48dd3b3f4..ee68888b93c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve; import com.google.common.collect.ImmutableMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; import org.jetbrains.jet.lang.resolve.diagnostics.MutableDiagnosticsWithSuppression; import org.jetbrains.jet.util.slicedmap.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java index eba0e5c04c7..58204322735 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java @@ -41,7 +41,7 @@ import javax.inject.Inject; import java.util.*; import static org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.DEFERRED_TYPE; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java index 2190f6de887..9e5d1002aed 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java @@ -38,8 +38,8 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collection; import java.util.List; -import static org.jetbrains.jet.lang.diagnostics.Errors.INVALID_TYPE_OF_ANNOTATION_MEMBER; -import static org.jetbrains.jet.lang.diagnostics.Errors.NULLABLE_TYPE_OF_ANNOTATION_MEMBER; +import static org.jetbrains.kotlin.diagnostics.Errors.INVALID_TYPE_OF_ANNOTATION_MEMBER; +import static org.jetbrains.kotlin.diagnostics.Errors.NULLABLE_TYPE_OF_ANNOTATION_MEMBER; import static org.jetbrains.jet.lang.resolve.BindingContext.VALUE_PARAMETER; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompositeBindingContext.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompositeBindingContext.kt index 0c9a330b12f..73b4b5c8865 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompositeBindingContext.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompositeBindingContext.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve import org.jetbrains.jet.util.slicedmap.ReadOnlySlice import org.jetbrains.jet.util.slicedmap.WritableSlice import com.google.common.collect.ImmutableMap -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.psi.PsiElement import com.intellij.openapi.util.ModificationTracker import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics 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 09588d17ac7..2d3ff660105 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor; import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor; import org.jetbrains.kotlin.descriptors.impl.PackageLikeBuilder; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; @@ -47,7 +47,7 @@ import org.jetbrains.kotlin.utils.UtilsPackage; import javax.inject.Inject; import java.util.*; -import static org.jetbrains.jet.lang.diagnostics.Errors.REDECLARATION; +import static org.jetbrains.kotlin.diagnostics.Errors.REDECLARATION; import static org.jetbrains.jet.lang.resolve.ScriptHeaderResolver.resolveScriptDeclarations; public class DeclarationResolver { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java index cad1b9e204a..31deaa31611 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java @@ -22,7 +22,7 @@ import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.SubstitutionUtils; @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.lexer.JetTokens; import javax.inject.Inject; import java.util.*; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.TYPE; import static org.jetbrains.jet.lang.resolve.BindingContext.TYPE_PARAMETER; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.classCanHaveAbstractMembers; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java index 361fd538a5f..0276899e663 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java @@ -20,7 +20,7 @@ import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.diagnostics.rendering.Renderers; +import org.jetbrains.kotlin.diagnostics.rendering.Renderers; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystem; @@ -44,7 +44,7 @@ import org.jetbrains.jet.util.slicedmap.WritableSlice; import javax.inject.Inject; import java.util.List; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.resolve.BindingContext.*; import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getCalleeExpressionIfAny; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatingBindingTrace.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatingBindingTrace.java index aa5b7197be6..2bf1c42c790 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatingBindingTrace.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatingBindingTrace.java @@ -22,7 +22,7 @@ import com.google.common.collect.Maps; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; import org.jetbrains.jet.lang.resolve.diagnostics.MutableDiagnosticsWithSuppression; import org.jetbrains.jet.util.slicedmap.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegationResolver.java index 63e4d6a5bff..4b074d7df94 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegationResolver.java @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.types.TypeUtils; import java.util.*; import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DELEGATION; -import static org.jetbrains.jet.lang.diagnostics.Errors.MANY_IMPL_MEMBER_NOT_IMPLEMENTED; +import static org.jetbrains.kotlin.diagnostics.Errors.MANY_IMPL_MEMBER_NOT_IMPLEMENTED; import static org.jetbrains.jet.lang.resolve.OverridingUtil.OverrideCompatibilityInfo.Result.OVERRIDABLE; public final class DelegationResolver { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java index faca7a6c37a..72ca3090c18 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.impl.*; -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory1; +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory1; import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; import org.jetbrains.kotlin.resolve.constants.evaluate.EvaluatePackage; import org.jetbrains.kotlin.psi.*; @@ -54,7 +54,7 @@ import javax.inject.Inject; import java.util.*; import static org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.*; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*; import static org.jetbrains.jet.lang.resolve.ModifiersChecker.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java index 554f4988282..2f05314d15d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java @@ -33,7 +33,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver.LookupMode; public class ImportsResolver { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java index 34d61c34521..cd144ebf255 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java @@ -40,8 +40,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import static org.jetbrains.jet.lang.diagnostics.Errors.MANY_CLASS_OBJECTS; -import static org.jetbrains.jet.lang.diagnostics.Errors.UNSUPPORTED; +import static org.jetbrains.kotlin.diagnostics.Errors.MANY_CLASS_OBJECTS; +import static org.jetbrains.kotlin.diagnostics.Errors.UNSUPPORTED; public class LazyTopDownAnalyzer { private BindingTrace trace; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ModifiersChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ModifiersChecker.java index 99e124969da..dfa83275343 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ModifiersChecker.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ModifiersChecker.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.StringValue; @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.lexer.JetTokens; import java.util.*; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.lexer.JetTokens.*; public class ModifiersChecker { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ObservableBindingTrace.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ObservableBindingTrace.java index 87b9c060a40..aac99562c10 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ObservableBindingTrace.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ObservableBindingTrace.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve; import com.google.common.collect.Maps; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; import org.jetbrains.jet.util.slicedmap.WritableSlice; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java index f4015b2c87f..7fa5ddca5a2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java @@ -21,7 +21,7 @@ import com.intellij.openapi.util.Pair; import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetObjectDeclaration; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java index 0b627b36f1b..4d29a9473db 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java @@ -48,7 +48,7 @@ import javax.inject.Inject; import java.util.*; import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.*; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.classCanHaveAbstractMembers; import static org.jetbrains.jet.lang.resolve.OverridingUtil.OverrideCompatibilityInfo.Result.OVERRIDABLE; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java index 88e558f0dba..e1d92a68351 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.Mutable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.AbstractScopeAdapter; @@ -35,7 +35,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Set; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; public class QualifiedExpressionResolver { private static final Predicate CLASSIFIERS_AND_PACKAGE_VIEWS = new Predicate() { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceBasedRedeclarationHandler.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceBasedRedeclarationHandler.java index cda2765e7f3..7136aca31d6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceBasedRedeclarationHandler.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceBasedRedeclarationHandler.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler; -import static org.jetbrains.jet.lang.diagnostics.Errors.REDECLARATION; +import static org.jetbrains.kotlin.diagnostics.Errors.REDECLARATION; public class TraceBasedRedeclarationHandler implements RedeclarationHandler { private final BindingTrace trace; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java index da8d69a5be9..11fdadc2e39 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.utils.DFS; import javax.inject.Inject; import java.util.*; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.FQNAME_TO_CLASS_DESCRIPTOR; import static org.jetbrains.jet.lang.resolve.BindingContext.TYPE; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumEntry; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt index 2dbf3f3bd90..f6c7d5b9004 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.storage.LockBasedStorageManager -import org.jetbrains.jet.lang.diagnostics.Errors.* +import org.jetbrains.kotlin.diagnostics.Errors.* import org.jetbrains.jet.lang.resolve.PossiblyBareType.type import org.jetbrains.kotlin.types.Variance.* import org.jetbrains.jet.lang.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/VarianceChecker.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/VarianceChecker.kt index 84280d5c926..aad41423c15 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/VarianceChecker.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/VarianceChecker.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.varianceChecker import org.jetbrains.kotlin.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.diagnostics.Errors +import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.types.checker.TypeCheckingProcedure.EnrichedProjectionKind.* @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.psi.JetClass import org.jetbrains.kotlin.psi.JetTypeReference import org.jetbrains.kotlin.types.Variance.* -import org.jetbrains.jet.lang.diagnostics.DiagnosticSink +import org.jetbrains.kotlin.diagnostics.DiagnosticSink import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.impl.FunctionDescriptorImpl import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java index 73d6f2c12e2..63688faee45 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java index dde0dfb61f8..9f0bea5d2cf 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java @@ -54,7 +54,7 @@ import org.jetbrains.kotlin.lexer.JetTokens; import javax.inject.Inject; import java.util.Collections; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; import static org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiversPackage.createQualifier; import static org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiversPackage.resolveAsStandaloneExpression; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java index 386730699ae..49d731b9cb0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java @@ -50,8 +50,8 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.lang.diagnostics.Errors.NOT_A_CLASS; -import static org.jetbrains.jet.lang.diagnostics.Errors.NO_CONSTRUCTOR; +import static org.jetbrains.kotlin.diagnostics.Errors.NOT_A_CLASS; +import static org.jetbrains.kotlin.diagnostics.Errors.NO_CONSTRUCTOR; import static org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage.recordScopeAndDataFlowInfo; import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS; import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.SHAPE_FUNCTION_ARGUMENTS; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java index 84888860364..a4a105c65e5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java @@ -49,8 +49,8 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import javax.inject.Inject; import java.util.*; -import static org.jetbrains.jet.lang.diagnostics.Errors.PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT; -import static org.jetbrains.jet.lang.diagnostics.Errors.SUPER_CANT_BE_EXTENSION_RECEIVER; +import static org.jetbrains.kotlin.diagnostics.Errors.PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT; +import static org.jetbrains.kotlin.diagnostics.Errors.SUPER_CANT_BE_EXTENSION_RECEIVER; import static org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver.deparenthesizeArgument; import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS; import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.SHAPE_FUNCTION_ARGUMENTS; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java index fa135e8b36f..f8a13a8b6ad 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.*; @@ -36,7 +36,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.REFERENCE_TARGET; import static org.jetbrains.jet.lang.resolve.calls.ValueArgumentsToParametersMapper.Status.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/InlineCallResolverExtension.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/InlineCallResolverExtension.java index 54aad1684e8..77912815874 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/InlineCallResolverExtension.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/InlineCallResolverExtension.java @@ -22,7 +22,7 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/ReifiedTypeParameterSubstitutionCheck.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/ReifiedTypeParameterSubstitutionCheck.java index 6f869504b0c..acfa6f47cdb 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/ReifiedTypeParameterSubstitutionCheck.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/ReifiedTypeParameterSubstitutionCheck.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext; import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtension; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/SmartCastUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/SmartCastUtils.java index 23f1ad62023..d599aa524ce 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/SmartCastUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/SmartCastUtils.java @@ -40,7 +40,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import static org.jetbrains.jet.lang.diagnostics.Errors.SMARTCAST_IMPOSSIBLE; +import static org.jetbrains.kotlin.diagnostics.Errors.SMARTCAST_IMPOSSIBLE; import static org.jetbrains.jet.lang.resolve.BindingContext.EXPRESSION_TYPE; import static org.jetbrains.jet.lang.resolve.BindingContext.SMARTCAST; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java index 98d8a642277..43e136b9698 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java @@ -41,7 +41,7 @@ import org.jetbrains.kotlin.lexer.JetTokens; import java.util.Collection; import java.util.List; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.AMBIGUOUS_REFERENCE_TARGET; import static org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.EXPECTED_TYPE_POSITION; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqNameFromTopLevelClass; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyForInvoke.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyForInvoke.java index cffbc8659a4..3a4433be3bf 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyForInvoke.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyForInvoke.java @@ -33,8 +33,8 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collection; -import static org.jetbrains.jet.lang.diagnostics.Errors.FUNCTION_EXPECTED; -import static org.jetbrains.jet.lang.diagnostics.Errors.NO_RECEIVER_ALLOWED; +import static org.jetbrains.kotlin.diagnostics.Errors.FUNCTION_EXPECTED; +import static org.jetbrains.kotlin.diagnostics.Errors.NO_RECEIVER_ALLOWED; import static org.jetbrains.jet.lang.resolve.BindingContext.CALL; import static org.jetbrains.jet.lang.resolve.BindingContext.RESOLVED_CALL; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java index 0e9f6a1fd17..c84dff4329d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java @@ -29,8 +29,8 @@ import org.jetbrains.kotlin.types.ErrorUtils; import java.util.Collection; -import static org.jetbrains.jet.lang.diagnostics.Errors.UNRESOLVED_REFERENCE; -import static org.jetbrains.jet.lang.diagnostics.Errors.UNRESOLVED_REFERENCE_WRONG_RECEIVER; +import static org.jetbrains.kotlin.diagnostics.Errors.UNRESOLVED_REFERENCE; +import static org.jetbrains.kotlin.diagnostics.Errors.UNRESOLVED_REFERENCE_WRONG_RECEIVER; import static org.jetbrains.jet.lang.resolve.BindingContext.*; public class TracingStrategyImpl extends AbstractTracingStrategy { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/checkTraitRequirements.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/checkTraitRequirements.kt index f20420bdf44..0e496fef9e3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/checkTraitRequirements.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/checkTraitRequirements.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.diagnostics.Errors +import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.kotlin.descriptors.ClassDescriptorWithResolutionScopes import org.jetbrains.jet.lang.resolve.BindingTrace diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantChecker.java index 3272c597536..5d510ccbe5b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantChecker.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantChecker.java @@ -21,8 +21,8 @@ import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.psi.JetConstantExpression; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.jet.lang.resolve.BindingTrace; @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Set; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; public class CompileTimeConstantChecker { private static final Set> errorsThatDependOnExpectedType = diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/Diagnostics.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/Diagnostics.kt index 4f67c4003fe..93df16297c0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/Diagnostics.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/Diagnostics.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.diagnostics import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.openapi.util.ModificationTracker public trait Diagnostics : Iterable { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsElementsCache.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsElementsCache.java index 6a1d20812f4..6c48484a286 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsElementsCache.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsElementsCache.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import com.intellij.util.containers.ConcurrentMultiMap; import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsWithSuppression.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsWithSuppression.java index 52d095e7d01..6cc9478162e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsWithSuppression.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsWithSuppression.java @@ -31,8 +31,8 @@ import com.intellij.util.containers.FilteringIterator; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.Severity; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Severity; import org.jetbrains.kotlin.psi.JetAnnotated; import org.jetbrains.kotlin.psi.JetAnnotationEntry; import org.jetbrains.kotlin.psi.JetStubbedPsiUtil; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt index 813a55c7242..0dde16d77ea 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.diagnostics -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import java.util.ArrayList import com.intellij.openapi.util.CompositeModificationTracker import com.intellij.util.CachedValueImpl diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SimpleDiagnostics.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SimpleDiagnostics.kt index 61e5ee8e015..996b86178d4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SimpleDiagnostics.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SimpleDiagnostics.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.diagnostics import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import java.util.ArrayList public class SimpleDiagnostics(diagnostics: Collection) : Diagnostics { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt index 9f96f699859..9e7528f3810 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt @@ -17,16 +17,16 @@ package org.jetbrains.jet.lang.resolve.diagnostics import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor -import org.jetbrains.jet.lang.diagnostics.Errors +import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.diagnostics.Diagnostic -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory +import org.jetbrains.kotlin.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.JetFunction import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory1 +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory1 import org.jetbrains.kotlin.psi.JetProperty -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory0 +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory0 public val FUNCTION_NO_BODY_ERRORS: List> = listOf(Errors.NON_ABSTRACT_FUNCTION_WITH_NO_BODY, Errors.NON_MEMBER_FUNCTION_NO_BODY, Errors.FINAL_FUNCTION_WITH_NO_BODY) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java index bd3fd298638..1171f84d0e3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.extension; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DescriptorUtils; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java index 058a3c2a792..0cf6c218a67 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java @@ -58,8 +58,8 @@ import org.jetbrains.kotlin.storage.StorageManager; import java.util.*; -import static org.jetbrains.jet.lang.diagnostics.Errors.CLASS_OBJECT_NOT_ALLOWED; -import static org.jetbrains.jet.lang.diagnostics.Errors.TYPE_PARAMETERS_IN_ENUM; +import static org.jetbrains.kotlin.diagnostics.Errors.CLASS_OBJECT_NOT_ALLOWED; +import static org.jetbrains.kotlin.diagnostics.Errors.TYPE_PARAMETERS_IN_ENUM; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isSyntheticClassObject; import static org.jetbrains.jet.lang.resolve.ModifiersChecker.*; import static org.jetbrains.kotlin.name.SpecialNames.getClassObjectName; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt index 77470749483..bd8626cb592 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.lazy.descriptors import com.google.common.collect.Lists import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.impl.ConstructorDescriptorImpl -import org.jetbrains.jet.lang.diagnostics.Errors +import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.* import org.jetbrains.jet.lang.resolve.dataClassUtils.* diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/Qualifier.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/Qualifier.kt index b2a29994e6f..293d8167af2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/Qualifier.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/Qualifier.kt @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.scopes.ChainedScope import java.util.ArrayList import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.jet.lang.resolve.BindingContext.* -import org.jetbrains.jet.lang.diagnostics.Errors.* +import org.jetbrains.kotlin.diagnostics.Errors.* import org.jetbrains.kotlin.types.expressions.ExpressionTypingContext import org.jetbrains.kotlin.psi.psiUtil.getTopmostParentQualifiedExpressionForSelector import org.jetbrains.jet.lang.resolve.descriptorUtil.getClassObjectReferenceTarget diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java index 1fd52cfdcaa..25771c50d60 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java @@ -55,7 +55,7 @@ import org.jetbrains.kotlin.lexer.JetTokens; import java.util.*; import static org.jetbrains.kotlin.cfg.JetControlFlowBuilder.PredefinedOperation.*; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; import static org.jetbrains.kotlin.lexer.JetTokens.*; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java index 11f8adc3b21..32f5000a586 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java @@ -46,9 +46,9 @@ import org.jetbrains.kotlin.cfg.pseudocodeTraverser.Edges; import org.jetbrains.kotlin.cfg.pseudocodeTraverser.PseudocodeTraverserPackage; import org.jetbrains.kotlin.cfg.pseudocodeTraverser.TraversalOrder; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage; @@ -67,7 +67,7 @@ import java.util.*; import static org.jetbrains.kotlin.cfg.PseudocodeVariablesData.VariableUseState.*; import static org.jetbrains.kotlin.cfg.pseudocodeTraverser.TraversalOrder.FORWARD; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.CAPTURED_IN_CLOSURE; import static org.jetbrains.jet.lang.resolve.BindingContext.TAIL_RECURSION_CALL; import static org.jetbrains.kotlin.cfg.TailRecursionKind.*; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java index 57f95b74b5f..8d12f58fdc9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.ReadValueInstructio import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.WriteValueInstruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.VariableDeclarationInstruction; import org.jetbrains.kotlin.descriptors.VariableDescriptor; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.jet.lang.resolve.BindingContext; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/AbstractDiagnostic.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/AbstractDiagnostic.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/AbstractDiagnostic.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/AbstractDiagnostic.java index 598049b6c5a..7c47a636f69 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/AbstractDiagnostic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/AbstractDiagnostic.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.lang.diagnostics; +package org.jetbrains.kotlin.diagnostics; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Diagnostic.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Diagnostic.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Diagnostic.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Diagnostic.java index 36e67fc6db4..248c60d2e57 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Diagnostic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Diagnostic.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.lang.diagnostics; +package org.jetbrains.kotlin.diagnostics; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactory.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactory.java index df69c1ac27c..ac57634fb70 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactory.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.lang.diagnostics; +package org.jetbrains.kotlin.diagnostics; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory0.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactory0.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory0.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactory0.java index d1c6e8dffbc..605ca6d4b2c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory0.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactory0.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.lang.diagnostics; +package org.jetbrains.kotlin.diagnostics; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; @@ -37,4 +37,4 @@ public class DiagnosticFactory0 extends DiagnosticFactoryW public SimpleDiagnostic on(@NotNull E element) { return new SimpleDiagnostic(element, this, getSeverity()); } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory1.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactory1.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory1.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactory1.java index 7ba9e19a818..9343ad7de2c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory1.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactory1.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.lang.diagnostics; +package org.jetbrains.kotlin.diagnostics; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; @@ -36,4 +36,4 @@ public class DiagnosticFactory1 extends DiagnosticFacto public static DiagnosticFactory1 create(Severity severity) { return create(severity, PositioningStrategies.DEFAULT); } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory2.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactory2.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory2.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactory2.java index 064d9d8fca8..5a4f6f63916 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory2.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactory2.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.lang.diagnostics; +package org.jetbrains.kotlin.diagnostics; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory3.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactory3.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory3.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactory3.java index d6ec01d7507..19dfe33a089 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory3.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactory3.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.lang.diagnostics; +package org.jetbrains.kotlin.diagnostics; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactoryWithPsiElement.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactoryWithPsiElement.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactoryWithPsiElement.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactoryWithPsiElement.java index a015899f523..16a8223e4e5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactoryWithPsiElement.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactoryWithPsiElement.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.lang.diagnostics; +package org.jetbrains.kotlin.diagnostics; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticSink.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticSink.java similarity index 90% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticSink.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticSink.java index 3408bce41df..494a63f5ac1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticSink.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticSink.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,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.diagnostics; +package org.jetbrains.kotlin.diagnostics; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; +import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticUtils.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticUtils.java index cdc67425d83..499036769ef 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticUtils.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.lang.diagnostics; +package org.jetbrains.kotlin.diagnostics; import com.google.common.collect.Lists; import com.intellij.lang.ASTNode; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticWithParameters1.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticWithParameters1.java similarity index 79% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticWithParameters1.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticWithParameters1.java index 9a83e7f5063..63792c43e03 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticWithParameters1.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticWithParameters1.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.lang.diagnostics; +package org.jetbrains.kotlin.diagnostics; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; @@ -22,18 +22,21 @@ import org.jetbrains.annotations.NotNull; public class DiagnosticWithParameters1 extends AbstractDiagnostic { private final A a; - public DiagnosticWithParameters1(@NotNull E psiElement, + public DiagnosticWithParameters1( + @NotNull E psiElement, @NotNull A a, @NotNull DiagnosticFactory1 factory, - @NotNull Severity severity) { + @NotNull Severity severity + ) { super(psiElement, factory, severity); this.a = a; } + @SuppressWarnings("unchecked") @NotNull @Override public DiagnosticFactory1 getFactory() { - return (DiagnosticFactory1)super.getFactory(); + return (DiagnosticFactory1) super.getFactory(); } @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticWithParameters2.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticWithParameters2.java similarity index 81% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticWithParameters2.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticWithParameters2.java index 4ee1f6c4c2c..1e56652a18b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticWithParameters2.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticWithParameters2.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.lang.diagnostics; +package org.jetbrains.kotlin.diagnostics; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; @@ -23,11 +23,13 @@ public class DiagnosticWithParameters2 extends Abstr private final A a; private final B b; - public DiagnosticWithParameters2(@NotNull E psiElement, + public DiagnosticWithParameters2( + @NotNull E psiElement, @NotNull A a, @NotNull B b, @NotNull DiagnosticFactory2 factory, - @NotNull Severity severity) { + @NotNull Severity severity + ) { super(psiElement, factory, severity); this.a = a; this.b = b; @@ -35,8 +37,9 @@ public class DiagnosticWithParameters2 extends Abstr @NotNull @Override + @SuppressWarnings("unchecked") public DiagnosticFactory2 getFactory() { - return (DiagnosticFactory2)super.getFactory(); + return (DiagnosticFactory2) super.getFactory(); } @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticWithParameters3.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticWithParameters3.java similarity index 82% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticWithParameters3.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticWithParameters3.java index 454f85ec39c..040e844a2ad 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticWithParameters3.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticWithParameters3.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.lang.diagnostics; +package org.jetbrains.kotlin.diagnostics; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; @@ -24,12 +24,14 @@ public class DiagnosticWithParameters3 extends Ab private final B b; private final C c; - public DiagnosticWithParameters3(@NotNull E psiElement, + public DiagnosticWithParameters3( + @NotNull E psiElement, @NotNull A a, @NotNull B b, @NotNull C c, @NotNull DiagnosticFactory3 factory, - @NotNull Severity severity) { + @NotNull Severity severity + ) { super(psiElement, factory, severity); this.a = a; this.b = b; @@ -38,8 +40,9 @@ public class DiagnosticWithParameters3 extends Ab @NotNull @Override + @SuppressWarnings("unchecked") public DiagnosticFactory3 getFactory() { - return (DiagnosticFactory3)super.getFactory(); + return (DiagnosticFactory3) super.getFactory(); } @NotNull @@ -57,7 +60,6 @@ public class DiagnosticWithParameters3 extends Ab return c; } - @Override public String toString() { return "(a = " + a + ", b = " + b + ", c = " + c + ")"; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java similarity index 99% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java index d5b2b9d3d42..7dd6b57ac2d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.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.lang.diagnostics; +package org.jetbrains.kotlin.diagnostics; import com.google.common.collect.ImmutableSet; import com.intellij.openapi.util.TextRange; @@ -38,9 +38,9 @@ import java.lang.reflect.Modifier; import java.util.Collection; import java.util.List; -import static org.jetbrains.jet.lang.diagnostics.PositioningStrategies.*; -import static org.jetbrains.jet.lang.diagnostics.Severity.ERROR; -import static org.jetbrains.jet.lang.diagnostics.Severity.WARNING; +import static org.jetbrains.kotlin.diagnostics.PositioningStrategies.*; +import static org.jetbrains.kotlin.diagnostics.Severity.ERROR; +import static org.jetbrains.kotlin.diagnostics.Severity.WARNING; /** * For error messages, see DefaultErrorMessages and IdeErrorMessages. diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/ParametrizedDiagnostic.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/ParametrizedDiagnostic.java similarity index 90% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/ParametrizedDiagnostic.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/ParametrizedDiagnostic.java index c40c6b3eb4c..f07148e955c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/ParametrizedDiagnostic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/ParametrizedDiagnostic.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.lang.diagnostics; +package org.jetbrains.kotlin.diagnostics; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt similarity index 99% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.kt rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt index 35cd3bf4b71..97eefce9e40 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.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.lang.diagnostics +package org.jetbrains.kotlin.diagnostics import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategy.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategy.kt similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategy.kt rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategy.kt index acce129f19a..ff31bbf571f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategy.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategy.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.lang.diagnostics +package org.jetbrains.kotlin.diagnostics import com.intellij.lang.ASTNode import com.intellij.openapi.util.TextRange diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Severity.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Severity.java similarity index 88% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Severity.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Severity.java index 590ef2036cf..d4ec5534c1a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Severity.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Severity.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.lang.diagnostics; +package org.jetbrains.kotlin.diagnostics; public enum Severity { INFO, diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/SimpleDiagnostic.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/SimpleDiagnostic.java similarity index 76% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/SimpleDiagnostic.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/SimpleDiagnostic.java index 6d47296e55d..aa67d919c81 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/SimpleDiagnostic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/SimpleDiagnostic.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,21 +14,24 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.diagnostics; +package org.jetbrains.kotlin.diagnostics; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; public class SimpleDiagnostic extends AbstractDiagnostic { - public SimpleDiagnostic(@NotNull E psiElement, + public SimpleDiagnostic( + @NotNull E psiElement, @NotNull DiagnosticFactory0 factory, - @NotNull Severity severity) { + @NotNull Severity severity + ) { super(psiElement, factory, severity); } @NotNull @Override + @SuppressWarnings("unchecked") public DiagnosticFactory0 getFactory() { - return (DiagnosticFactory0)super.getFactory(); + return (DiagnosticFactory0) super.getFactory(); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/AbstractDiagnosticWithParametersRenderer.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/AbstractDiagnosticWithParametersRenderer.java similarity index 88% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/AbstractDiagnosticWithParametersRenderer.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/AbstractDiagnosticWithParametersRenderer.java index 4ff075cf0d7..dda0858a925 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/AbstractDiagnosticWithParametersRenderer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/AbstractDiagnosticWithParametersRenderer.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,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.diagnostics.rendering; +package org.jetbrains.kotlin.diagnostics.rendering; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import java.text.MessageFormat; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java similarity index 99% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java index a988565aab8..889755c8e99 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.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.lang.diagnostics.rendering; +package org.jetbrains.kotlin.diagnostics.rendering; import com.google.common.collect.ImmutableList; import com.intellij.openapi.application.Application; @@ -26,9 +26,9 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.kotlin.psi.JetTypeConstraint; @@ -44,8 +44,8 @@ import java.lang.reflect.Modifier; import java.util.Collection; 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.kotlin.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.rendering.Renderers.*; 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/kotlin/diagnostics/rendering/DiagnosticFactoryToRendererMap.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticFactoryToRendererMap.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticFactoryToRendererMap.java index f26c6c8d123..06ad4ba3224 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticFactoryToRendererMap.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticFactoryToRendererMap.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,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.diagnostics.rendering; +package org.jetbrains.kotlin.diagnostics.rendering; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.diagnostics.*; +import org.jetbrains.kotlin.diagnostics.*; import org.jetbrains.kotlin.renderer.MultiRenderer; import org.jetbrains.kotlin.renderer.Renderer; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRenderer.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticRenderer.java similarity index 84% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRenderer.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticRenderer.java index 6d5b3bab3c0..ce38a60cb49 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRenderer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticRenderer.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,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.diagnostics.rendering; +package org.jetbrains.kotlin.diagnostics.rendering; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.renderer.Renderer; public interface DiagnosticRenderer extends Renderer { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticRendererUtil.kt similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.kt rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticRendererUtil.kt index 87b0e9e53ed..9d1d7c01935 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticRendererUtil.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.lang.diagnostics.rendering +package org.jetbrains.kotlin.diagnostics.rendering import org.jetbrains.kotlin.renderer.Renderer import org.jetbrains.kotlin.descriptors.ClassDescriptor diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithMultiParametersRenderer.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithMultiParametersRenderer.java similarity index 88% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithMultiParametersRenderer.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithMultiParametersRenderer.java index 9a3cdbbb263..7b4ee8e1f46 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithMultiParametersRenderer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithMultiParametersRenderer.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,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.diagnostics.rendering; +package org.jetbrains.kotlin.diagnostics.rendering; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1; +import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1; import org.jetbrains.kotlin.renderer.MultiRenderer; public class DiagnosticWithMultiParametersRenderer extends AbstractDiagnosticWithParametersRenderer> { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters1Renderer.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters1Renderer.java similarity index 83% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters1Renderer.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters1Renderer.java index f2737f7dcfa..1142bd5e160 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters1Renderer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters1Renderer.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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.diagnostics.rendering; +package org.jetbrains.kotlin.diagnostics.rendering; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1; +import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1; import org.jetbrains.kotlin.renderer.Renderer; -import static org.jetbrains.jet.lang.diagnostics.rendering.RenderingPackage.renderParameter; +import static org.jetbrains.kotlin.diagnostics.rendering.RenderingPackage.renderParameter; public class DiagnosticWithParameters1Renderer extends AbstractDiagnosticWithParametersRenderer> { private final Renderer rendererForA; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters2Renderer.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters2Renderer.java similarity index 85% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters2Renderer.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters2Renderer.java index 5aea34f9ce8..f8680dcf044 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters2Renderer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters2Renderer.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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.diagnostics.rendering; +package org.jetbrains.kotlin.diagnostics.rendering; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters2; +import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters2; import org.jetbrains.kotlin.renderer.Renderer; -import static org.jetbrains.jet.lang.diagnostics.rendering.RenderingPackage.renderParameter; +import static org.jetbrains.kotlin.diagnostics.rendering.RenderingPackage.renderParameter; public class DiagnosticWithParameters2Renderer extends AbstractDiagnosticWithParametersRenderer> { private final Renderer rendererForA; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters3Renderer.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters3Renderer.java similarity index 87% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters3Renderer.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters3Renderer.java index 004438119b1..a1b02804c0a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters3Renderer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters3Renderer.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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.diagnostics.rendering; +package org.jetbrains.kotlin.diagnostics.rendering; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters3; +import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters3; import org.jetbrains.kotlin.renderer.Renderer; -import static org.jetbrains.jet.lang.diagnostics.rendering.RenderingPackage.renderParameter; +import static org.jetbrains.kotlin.diagnostics.rendering.RenderingPackage.renderParameter; public class DiagnosticWithParameters3Renderer extends AbstractDiagnosticWithParametersRenderer> { private final Renderer rendererForA; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DispatchingDiagnosticRenderer.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DispatchingDiagnosticRenderer.java similarity index 90% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DispatchingDiagnosticRenderer.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DispatchingDiagnosticRenderer.java index b3118bc3e65..f01b56e7fe1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DispatchingDiagnosticRenderer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DispatchingDiagnosticRenderer.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,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.diagnostics.rendering; +package org.jetbrains.kotlin.diagnostics.rendering; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.java similarity index 99% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.java index a072e48e656..f53217892a5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.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.lang.diagnostics.rendering; +package org.jetbrains.kotlin.diagnostics.rendering; import com.google.common.base.Predicate; import com.google.common.collect.Lists; @@ -45,7 +45,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import static org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.*; +import static org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.*; import static org.jetbrains.jet.lang.resolve.calls.inference.TypeBounds.BoundKind.LOWER_BOUND; import static org.jetbrains.jet.lang.resolve.calls.inference.TypeBounds.BoundKind.UPPER_BOUND; import static org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.RECEIVER_POSITION; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/SimpleDiagnosticRenderer.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/SimpleDiagnosticRenderer.java similarity index 86% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/SimpleDiagnosticRenderer.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/SimpleDiagnosticRenderer.java index d9f725fe26a..8e4cc8bca74 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/SimpleDiagnosticRenderer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/SimpleDiagnosticRenderer.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,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.diagnostics.rendering; +package org.jetbrains.kotlin.diagnostics.rendering; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; public class SimpleDiagnosticRenderer implements DiagnosticRenderer { private final String message; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/TabledDescriptorRenderer.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/TabledDescriptorRenderer.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/TabledDescriptorRenderer.java rename to compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/TabledDescriptorRenderer.java index 484ded0fecd..2263033e1b6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/TabledDescriptorRenderer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/TabledDescriptorRenderer.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.lang.diagnostics.rendering; +package org.jetbrains.kotlin.diagnostics.rendering; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -22,10 +22,10 @@ import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.DescriptorRow; -import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.FunctionArgumentsRow; -import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.TableRow; -import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TextRenderer.TextElement; +import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.DescriptorRow; +import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.FunctionArgumentsRow; +import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.TableRow; +import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TextRenderer.TextElement; import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt index 61005e5dd40..d8a1e6093e5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt @@ -34,7 +34,7 @@ import com.intellij.psi.JavaDirectoryService import com.intellij.psi.PsiDirectory import org.jetbrains.kotlin.psi.stubs.KotlinClassOrObjectStub import org.jetbrains.kotlin.types.expressions.OperatorConventions -import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils +import org.jetbrains.kotlin.diagnostics.DiagnosticUtils import com.intellij.lang.ASTNode import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.PsiComment @@ -47,7 +47,7 @@ public fun JetCallElement.getCallNameExpression(): JetSimpleNameExpression? { return when (calleeExpression) { is JetSimpleNameExpression -> calleeExpression - is JetConstructorCalleeExpression -> calleeExpression.getConstructorReferenceExpression() as? JetSimpleNameExpression + is JetConstructorCalleeExpression -> calleeExpression.getConstructorReferenceExpression() else -> null } } @@ -129,7 +129,7 @@ public fun JetBlockExpression.prependElement(element: JetElement): JetElement = addBefore(element, getLBrace()!!.getNextSibling()!!)!! as JetElement public fun JetElement.wrapInBlock(): JetBlockExpression { - val block = JetPsiFactory(this).createEmptyBody() as JetBlockExpression + val block = JetPsiFactory(this).createEmptyBody() block.appendElement(this) return block } @@ -219,7 +219,7 @@ public fun PsiElement.deleteElementAndCleanParent() { JetPsiUtil.deleteElementWithDelimiters(this) [suppress("UNCHECKED_CAST")] - JetPsiUtil.deleteChildlessElement(parent, this.javaClass as Class) + JetPsiUtil.deleteChildlessElement(parent, this.javaClass) } public fun PsiElement.parameterIndex(): Int { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt index 84eeb8f88c0..e0de951ddf1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument import org.jetbrains.jet.JetNodeTypes import java.math.BigInteger -import org.jetbrains.jet.lang.diagnostics.Errors +import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType diff --git a/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt b/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt index 3d781488595..168bd790239 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.storage import com.intellij.util.containers.ConcurrentWeakValueHashMap import org.jetbrains.annotations.TestOnly -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.BindingTrace import org.jetbrains.jet.util.slicedmap.ReadOnlySlice diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java index 98fb2bf4444..8f4b80174e9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor; import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; @@ -70,7 +70,7 @@ import java.util.Collections; import java.util.List; import static org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.*; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getStaticNestedClassesScope; import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ClosureExpressionsTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ClosureExpressionsTypingVisitor.java index 7b74864267b..4fade54c8c9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ClosureExpressionsTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ClosureExpressionsTypingVisitor.java @@ -40,7 +40,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.*; import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; import static org.jetbrains.jet.lang.resolve.source.SourcePackage.toSourceElement; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java index 242d5247db5..af59a1e20f9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java @@ -23,7 +23,7 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.calls.model.MutableDataFlowInfoForArguments; @@ -42,7 +42,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.resolve.BindingContext.*; import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowUtils.java index 49313165d07..3cd598f02bf 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowUtils.java @@ -43,7 +43,7 @@ import org.jetbrains.kotlin.lexer.JetTokens; import java.util.Collection; import java.util.Set; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; import static org.jetbrains.kotlin.types.TypeUtils.*; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java index 39e2007ed61..95179ce814a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java @@ -26,9 +26,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.calls.CallResolver; @@ -54,7 +54,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.resolve.BindingContext.*; import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java index 2c44dd78027..e7b8177b333 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.types.expressions; import com.intellij.openapi.progress.ProcessCanceledException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; +import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.types.JetTypeInfo; import org.jetbrains.jet.util.ReenteringLazyValueComputationException; import org.jetbrains.kotlin.utils.KotlinFrontEndException; -import static org.jetbrains.jet.lang.diagnostics.Errors.TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM; +import static org.jetbrains.kotlin.diagnostics.Errors.TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM; import static org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage.recordScopeAndDataFlowInfo; public class ExpressionTypingVisitorDispatcher extends JetVisitor implements ExpressionTypingInternals { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java index 8a8cb64e8f0..751b59311e0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java @@ -21,7 +21,7 @@ import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.calls.context.TemporaryTraceAndCache; @@ -42,7 +42,7 @@ import org.jetbrains.kotlin.lexer.JetTokens; import java.util.Collection; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.AMBIGUOUS_REFERENCE_TARGET; import static org.jetbrains.jet.lang.resolve.BindingContext.VARIABLE_REASSIGNMENT; import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java index a6e57803793..df814735bef 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.VariableDescriptor; -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory1; +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory1; import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.BindingTraceContext; @@ -41,7 +41,7 @@ import org.jetbrains.jet.util.slicedmap.WritableSlice; import javax.inject.Inject; import java.util.Collections; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.resolve.BindingContext.*; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.java index 231bdf2e6cd..65710f59c6b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.java @@ -29,8 +29,8 @@ import org.jetbrains.kotlin.name.Name; import java.util.Collection; import java.util.List; -import static org.jetbrains.jet.lang.diagnostics.Errors.LABEL_NAME_CLASH; -import static org.jetbrains.jet.lang.diagnostics.Errors.UNRESOLVED_REFERENCE; +import static org.jetbrains.kotlin.diagnostics.Errors.LABEL_NAME_CLASH; +import static org.jetbrains.kotlin.diagnostics.Errors.UNRESOLVED_REFERENCE; import static org.jetbrains.jet.lang.resolve.BindingContext.LABEL_TARGET; import static org.jetbrains.jet.lang.resolve.BindingContext.REFERENCE_TARGET; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.java index 9eec72ab96c..575871f08fb 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.java @@ -20,7 +20,7 @@ import com.google.common.collect.Sets; import com.intellij.openapi.util.Ref; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.PossiblyBareType; @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collections; import java.util.Set; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; import static org.jetbrains.kotlin.types.TypeUtils.isIntersectionEmpty; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/TypeReconstructionUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/TypeReconstructionUtil.java index 7ae5339e68c..559cfd2c8ba 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/TypeReconstructionUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/TypeReconstructionUtil.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.resolve.PossiblyBareType; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import static org.jetbrains.jet.lang.diagnostics.Errors.NO_TYPE_ARGUMENTS_ON_RHS; +import static org.jetbrains.kotlin.diagnostics.Errors.NO_TYPE_ARGUMENTS_ON_RHS; public class TypeReconstructionUtil { @NotNull diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt index 22686696112..59972b59f5b 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt @@ -23,15 +23,15 @@ import org.jetbrains.kotlin.psi.JetClassBody import org.jetbrains.kotlin.psi.JetClassOrObject import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.psi.JetPropertyAccessor -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.jet.lang.resolve.java.diagnostics.ErrorsJvm.* import org.jetbrains.jet.lang.resolve.java.diagnostics.ConflictingJvmDeclarationsData import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOriginKind.* -import org.jetbrains.jet.lang.diagnostics.Errors.* -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory.* +import org.jetbrains.kotlin.diagnostics.Errors.* +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory.* import org.jetbrains.kotlin.psi.JetParameter import org.jetbrains.kotlin.psi.JetClass -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory public fun getJvmSignatureDiagnostics(element: PsiElement, otherDiagnostics: Diagnostics, moduleScope: GlobalSearchScope): Diagnostics? { fun getDiagnosticsForPackage(file: JetFile): Diagnostics? { diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index b46a276915a..efb8b554e88 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -53,10 +53,10 @@ import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.diagnostics.Severity; -import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Severity; +import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java index cf79d1932de..2d57c3f6652 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java @@ -33,7 +33,7 @@ import org.jetbrains.jet.context.SimpleGlobalContext; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.diagnostics.*; +import org.jetbrains.kotlin.diagnostics.*; import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetExpression; @@ -59,7 +59,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import java.io.File; import java.util.*; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.test.util.RecursiveDescriptorComparator.RECURSIVE; import static org.jetbrains.jet.test.util.RecursiveDescriptorComparator.RECURSIVE_ALL; diff --git a/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java index 69567ca1c19..f6b9a5f5aa3 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java @@ -33,7 +33,7 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.diagnostics.*; +import org.jetbrains.kotlin.diagnostics.*; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; diff --git a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java b/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java index 11b9becb78e..fa76cfc8441 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.checkers.CheckerTestUtil.DiagnosedRange; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil; diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java index d39fa037a5a..27a0f2f4b98 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java @@ -28,9 +28,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; diff --git a/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt b/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt index 7263b1ab172..5b97ad20f01 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.resolve import org.jetbrains.jet.lang.resolve.BindingTraceContext import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace import org.junit.Assert -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment diff --git a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt index bf2a25c5a67..ab7290caf2a 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt @@ -22,7 +22,7 @@ import org.jetbrains.jet.JetTestUtils import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.kotlin.di.InjectorForTests import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.lang.diagnostics.rendering.Renderers +import org.jetbrains.kotlin.diagnostics.rendering.Renderers import org.jetbrains.jet.lang.resolve.* import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemImpl import org.jetbrains.kotlin.types.Variance diff --git a/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt b/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt index a766cd823f5..2304f31ec44 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.types.typesApproximation.approximateCapturedTypes import org.jetbrains.jet.JetTestUtils import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.jet.lang.resolve.calls.inference.createCapturedType -import org.jetbrains.jet.lang.diagnostics.Severity +import org.jetbrains.kotlin.diagnostics.Severity import org.jetbrains.kotlin.types.typesApproximation.approximateCapturedTypesIfNecessary import java.util.ArrayList import org.jetbrains.kotlin.types.TypeProjection diff --git a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java b/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java index d20f464a926..399e7b1bda2 100644 --- a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java @@ -29,8 +29,8 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt index 5307e9250ea..3bb9765fc89 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt @@ -22,7 +22,7 @@ import com.intellij.psi.util.PsiTreeUtil import com.intellij.openapi.project.Project import org.jetbrains.jet.analyzer.AnalysisResult import com.intellij.psi.util.CachedValuesManager -import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils +import org.jetbrains.kotlin.diagnostics.DiagnosticUtils import com.intellij.util.containers.SLRUCache import com.intellij.psi.util.PsiModificationTracker import com.intellij.openapi.project.DumbService 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 7ddaa45ca82..af339f79f73 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 @@ -21,10 +21,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer; -import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.DescriptorRow; -import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.FunctionArgumentsRow; -import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.TableRow; +import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer; +import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.DescriptorRow; +import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.FunctionArgumentsRow; +import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.TableRow; import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.renderer.DescriptorRenderer; 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 e7337685c8f..5c42c3896d6 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 @@ -18,16 +18,16 @@ package org.jetbrains.jet.plugin.highlighter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; -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.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; +import org.jetbrains.kotlin.diagnostics.rendering.DiagnosticFactoryToRendererMap; +import org.jetbrains.kotlin.diagnostics.rendering.DiagnosticRenderer; 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; -import static org.jetbrains.jet.lang.diagnostics.rendering.Renderers.STRING; -import static org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TextElementType; +import static org.jetbrains.kotlin.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.rendering.Renderers.RENDER_CLASS_OR_OBJECT; +import static org.jetbrains.kotlin.diagnostics.rendering.Renderers.STRING; +import static org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TextElementType; import static org.jetbrains.jet.lang.resolve.java.diagnostics.ErrorsJvm.ACCIDENTAL_OVERRIDE; import static org.jetbrains.jet.lang.resolve.java.diagnostics.ErrorsJvm.CONFLICTING_JVM_DECLARATIONS; import static org.jetbrains.jet.plugin.highlighter.HtmlTabledDescriptorRenderer.tableForTypes; 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 c60ecadd4b2..1e4e4e88615 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 @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.renderer.Renderer; import java.util.Collection; -import static org.jetbrains.jet.lang.diagnostics.rendering.Renderers.*; +import static org.jetbrains.kotlin.diagnostics.rendering.Renderers.*; import static org.jetbrains.jet.plugin.highlighter.renderersUtil.RenderersUtilPackage.renderResolvedCall; public class IdeRenderers { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt index ccb04778491..06ab347f549 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt @@ -34,10 +34,10 @@ import com.intellij.psi.PsiReference import com.intellij.xml.util.XmlStringUtil import org.jetbrains.annotations.TestOnly import org.jetbrains.jet.analyzer.AnalysisResult -import org.jetbrains.jet.lang.diagnostics.Diagnostic -import org.jetbrains.jet.lang.diagnostics.Errors -import org.jetbrains.jet.lang.diagnostics.Severity -import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages +import org.jetbrains.kotlin.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Errors +import org.jetbrains.kotlin.diagnostics.Severity +import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages import org.jetbrains.kotlin.psi.JetCodeFragment import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetReferenceExpression diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinSuppressableWarningProblemGroup.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinSuppressableWarningProblemGroup.kt index 11b9f29413b..b6b91cc152d 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinSuppressableWarningProblemGroup.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinSuppressableWarningProblemGroup.kt @@ -19,12 +19,12 @@ package org.jetbrains.jet.plugin.highlighter import com.intellij.codeInspection.SuppressableProblemGroup import com.intellij.psi.PsiElement import com.intellij.codeInspection.SuppressIntentionAction -import org.jetbrains.jet.lang.diagnostics.Severity +import org.jetbrains.kotlin.diagnostics.Severity import java.util.Collections import org.jetbrains.jet.plugin.quickfix.KotlinSuppressIntentionAction import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.plugin.quickfix.AnnotationHostKind -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType class KotlinSuppressableWarningProblemGroup( diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/JetIntentionActionsFactory.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/JetIntentionActionsFactory.kt index 25ce9bed55c..04236f4b8a4 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/JetIntentionActionsFactory.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/JetIntentionActionsFactory.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.quickfix import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.psi.JetCodeFragment import java.util.Collections diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt index f9d5507ca75..1427aa915bb 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.quickfix import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.jet.lang.resolve.BindingContext diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java index 1fc4c69f621..d163ef23fc8 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.quickfix; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.intellij.codeInsight.intention.IntentionAction; -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import java.util.Collection; diff --git a/idea/src/META-INF/extensions/common.xml b/idea/src/META-INF/extensions/common.xml index 85aa0fe43ab..454c24df7ab 100644 --- a/idea/src/META-INF/extensions/common.xml +++ b/idea/src/META-INF/extensions/common.xml @@ -3,7 +3,7 @@ + interface="org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages$Extension"/> { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java index 439cf061a57..8733e5c9745 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java @@ -27,10 +27,10 @@ import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; -import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters2; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; +import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters2; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; @@ -47,8 +47,8 @@ import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; import java.util.List; import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.SYNTHESIZED; -import static org.jetbrains.jet.lang.diagnostics.Errors.EXPECTED_PARAMETERS_NUMBER_MISMATCH; -import static org.jetbrains.jet.lang.diagnostics.Errors.UNUSED_PARAMETER; +import static org.jetbrains.kotlin.diagnostics.Errors.EXPECTED_PARAMETERS_NUMBER_MISMATCH; +import static org.jetbrains.kotlin.diagnostics.Errors.UNUSED_PARAMETER; public abstract class ChangeFunctionSignatureFix extends JetIntentionAction { protected final PsiElement context; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java index efc4d5051c9..0016812f8e6 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java @@ -37,7 +37,7 @@ import com.intellij.util.PlatformIcons; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.FunctionDescriptorUtil; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToBackingFieldFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToBackingFieldFix.java index 87d59427974..c43e765c996 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToBackingFieldFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToBackingFieldFix.java @@ -21,7 +21,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java index 6ac0c60ed36..271e282b7cd 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.kotlin.types.JetType; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToFunctionInvocationFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToFunctionInvocationFix.java index bae6228adde..0e1e0c54ee9 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToFunctionInvocationFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToFunctionInvocationFix.java @@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToPropertyNameFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToPropertyNameFix.java index 4583359bb17..1c3e5a77670 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToPropertyNameFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToPropertyNameFix.java @@ -21,7 +21,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToStarProjectionFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToStarProjectionFix.java index 9db58eaf057..5bff77f95b9 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToStarProjectionFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToStarProjectionFix.java @@ -21,7 +21,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetTypeElement; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java index 947502b895d..edf659ce3d4 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java @@ -22,9 +22,9 @@ import com.intellij.openapi.project.Project; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.kotlin.psi.JetTypeReference; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java index e03e7c70d4f..a6c9fdc4ed9 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java index abdbc042e36..62784edcc2d 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.Visibilities; import org.jetbrains.kotlin.descriptors.Visibility; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetModifierListOwner; import org.jetbrains.kotlin.psi.JetParameter; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/JetSingleIntentionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/JetSingleIntentionActionFactory.kt index e55a9e42250..a8042f09464 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/JetSingleIntentionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/JetSingleIntentionActionFactory.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.quickfix import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java index 80d5a89d2ce..2ee3ca3a613 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java @@ -26,7 +26,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java index 14fd42251a8..7333698f30e 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetCallableDeclaration; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java index 0fe893ab812..686f8ef6f74 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java @@ -31,9 +31,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MoveWhenElseBranchFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MoveWhenElseBranchFix.java index f43ee88bd07..18101e1741b 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MoveWhenElseBranchFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MoveWhenElseBranchFix.java @@ -25,7 +25,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetPsiUtil; import org.jetbrains.kotlin.psi.JetWhenEntry; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java index 4657f08ef47..e1c4cda7957 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java @@ -23,11 +23,11 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1; -import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters2; -import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1; +import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters2; +import org.jetbrains.kotlin.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixRegistrar.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixRegistrar.java index eed685c3979..b0d8c798ba6 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixRegistrar.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixRegistrar.java @@ -22,7 +22,7 @@ import org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass.*; import org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction.*; import org.jetbrains.jet.plugin.quickfix.createFromUsage.createVariable.*; -import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.lexer.JetTokens.*; public class QuickFixRegistrar { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java index afc200f5831..28773c91b7a 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java @@ -30,7 +30,7 @@ import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionBodyFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionBodyFix.java index 1c779fa73da..cfc8f7e7e52 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionBodyFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionBodyFix.java @@ -25,7 +25,7 @@ import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetFunction; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java index f57f825bed6..79396d4874f 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java @@ -25,7 +25,7 @@ import com.intellij.psi.tree.IElementType; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.types.Variance; import org.jetbrains.kotlin.lexer.JetKeywordToken; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveNullableFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveNullableFix.java index 40d87f5e041..d664328459e 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveNullableFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveNullableFix.java @@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetNullableType; import org.jetbrains.kotlin.psi.JetTypeElement; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java index 562f2bc8c93..75cf16a1e08 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java @@ -23,7 +23,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePsiElementSimpleFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePsiElementSimpleFix.java index f563126c73e..a4bfa84b502 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePsiElementSimpleFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePsiElementSimpleFix.java @@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveRightPartOfBinaryExpressionFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveRightPartOfBinaryExpressionFix.java index b7a22894527..6f3abcb6898 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveRightPartOfBinaryExpressionFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveRightPartOfBinaryExpressionFix.java @@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetBinaryExpression; import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS; import org.jetbrains.kotlin.psi.JetExpression; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveSupertypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveSupertypeFix.java index 46e02ec7a7b..da31778bc7c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveSupertypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveSupertypeFix.java @@ -23,7 +23,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.impl.PsiImplUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetDelegationSpecifier; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveValVarFromParameterFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveValVarFromParameterFix.java index 0942e3f5cf8..23fe8ddbe51 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveValVarFromParameterFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveValVarFromParameterFix.java @@ -24,7 +24,7 @@ import com.intellij.psi.TokenType; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.kotlin.psi.JetPsiUtil; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java index c2ed1ed794c..e1974b9d07a 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.VariableDescriptor; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.jet.lang.resolve.BindingContext; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceInfixCallFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceInfixCallFix.java index d39103a8419..587bee3fc76 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceInfixCallFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceInfixCallFix.java @@ -21,7 +21,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetBinaryExpression; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceOperationInBinaryExpressionFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceOperationInBinaryExpressionFix.java index fc5731b3888..16bb2c60556 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceOperationInBinaryExpressionFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceOperationInBinaryExpressionFix.java @@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt index 93daff9668f..c68560b1aed 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt @@ -1,6 +1,6 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo import org.jetbrains.jet.lang.resolve.BindingContext diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt index 0b3f53b7afe..779f05dcb12 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt @@ -1,6 +1,6 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.JetTypeReference diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt index a33ca67ba1b..1d2bd3f37c6 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt @@ -1,6 +1,6 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.psi.JetExpression diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt index 5e4c25b5325..0544168d4a3 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt @@ -1,7 +1,7 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass import org.jetbrains.jet.plugin.quickfix.JetIntentionActionsFactory -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import java.util.Collections diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt index 9a289d295b6..fa183899208 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt @@ -1,7 +1,7 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.types.expressions.OperatorConventions diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt index 13b43a30227..2ce3123a2fc 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt @@ -1,10 +1,10 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.lang.resolve.dataClassUtils.* -import org.jetbrains.jet.lang.diagnostics.Errors +import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetMultiDeclaration import org.jetbrains.kotlin.psi.JetForExpression diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt index 3c7c2f8c653..8bfff3999c8 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt @@ -1,7 +1,7 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.types.Variance @@ -13,7 +13,7 @@ import org.jetbrains.jet.lang.resolve.calls.callUtil.getCall import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.jet.lang.resolve.scopes.receivers.Qualifier import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* -import org.jetbrains.jet.lang.diagnostics.Errors +import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.JetExpression import java.util.Collections diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt index b68a9b2bde5..869821c12a3 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt @@ -1,7 +1,7 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetArrayAccessExpression diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt index d80b36013bc..d7521ce4792 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt @@ -1,10 +1,10 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory -import org.jetbrains.jet.lang.diagnostics.Errors +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory +import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.types.Variance import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetForExpression diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt index 0a242e91008..c59fbaf6275 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt @@ -1,14 +1,14 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetArrayAccessExpression import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.diagnostics.Errors +import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* import java.util.Collections diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt index 923f9393a9a..7377d74fdc6 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt @@ -1,7 +1,7 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.quickfix.QuickFixUtil diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt index 90a47e55e35..90b5b947249 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt @@ -1,11 +1,11 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory -import org.jetbrains.jet.lang.diagnostics.Errors +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory +import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.types.Variance import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetForExpression diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt index 1d345b51047..fc09727a747 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt @@ -1,7 +1,7 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo import org.jetbrains.kotlin.types.Variance diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt index f9eeec5f72b..cb786dab27c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt @@ -1,7 +1,7 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetArrayAccessExpression diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt index 6cdbcf907bc..eed7c84b8c5 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt @@ -1,7 +1,7 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.types.expressions.OperatorConventions diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt index 3d46042a482..baa9214c42e 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt @@ -6,7 +6,7 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetSimpleNameExpression diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt index e0f599933d4..c3c95777f19 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt @@ -2,7 +2,7 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createVariable import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetSimpleNameExpression diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt index 1e21417a675..5a663ffd771 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createVariable import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory -import org.jetbrains.jet.lang.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt index 08c99e8beae..639cad9e39b 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt @@ -42,7 +42,7 @@ import org.jetbrains.kotlin.utils.DFS import org.jetbrains.kotlin.utils.DFS.* import com.intellij.refactoring.util.RefactoringUIUtil import com.intellij.util.containers.MultiMap -import org.jetbrains.jet.lang.diagnostics.Errors +import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.jet.plugin.refactoring.extractFunction.AnalysisResult.Status import org.jetbrains.jet.plugin.refactoring.extractFunction.AnalysisResult.ErrorMessage import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.LocalFunctionDeclarationInstruction diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java index 3554fc24c40..8f6ffc4ee2e 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java @@ -48,9 +48,9 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; diff --git a/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java b/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java index 966710b06ca..0c30d62d3ba 100644 --- a/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java +++ b/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java @@ -26,8 +26,8 @@ import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.InTextDirectivesUtils; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.Severity; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Severity; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.highlighter.IdeErrorMessages; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java index e523a3e5e34..98bb8f15446 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java @@ -23,10 +23,10 @@ import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.InTextDirectivesUtils; import org.jetbrains.jet.checkers.DebugInfoUtil; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; -import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; +import org.jetbrains.kotlin.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.BindingContext; diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java index 4e4b28f018a..c7d5f27ce85 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java @@ -27,10 +27,10 @@ import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.Errors; -import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil; diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt b/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt index 31de702fe39..fee5456252d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt @@ -26,7 +26,7 @@ import com.intellij.openapi.projectRoots.Sdk import org.jetbrains.jet.plugin.PluginTestCaseBase import kotlin.test.assertEquals import org.jetbrains.jet.plugin.caches.resolve.analyzeFully -import org.jetbrains.jet.lang.diagnostics.Severity +import org.jetbrains.kotlin.diagnostics.Severity import kotlin.test.assertTrue import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import java.io.File diff --git a/j2k/src/org/jetbrains/kotlin/j2k/AfterConversionPass.kt b/j2k/src/org/jetbrains/kotlin/j2k/AfterConversionPass.kt index a190f755474..10c9b24387e 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/AfterConversionPass.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/AfterConversionPass.kt @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.j2k import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.openapi.project.Project -import org.jetbrains.jet.lang.diagnostics.Diagnostic -import org.jetbrains.jet.lang.diagnostics.Errors +import org.jetbrains.kotlin.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.psi.JetUnaryExpression import org.jetbrains.kotlin.psi.JetProperty diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt index 213f5bd6b97..98db75ff6d7 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt @@ -23,8 +23,8 @@ import com.intellij.openapi.application.ApplicationManager import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.util.Computable -import org.jetbrains.jet.lang.diagnostics.Severity -import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages +import org.jetbrains.kotlin.diagnostics.Severity +import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.jet.JetTestCaseBuilder diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt index f2b094955da..1939c3176fd 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt @@ -16,15 +16,15 @@ package org.jetbrains.kotlin.js.analyze -import org.jetbrains.jet.lang.diagnostics.Errors +import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.js.PredefinedAnnotation.* -import org.jetbrains.jet.lang.diagnostics.Diagnostic -import org.jetbrains.jet.lang.diagnostics.Severity +import org.jetbrains.kotlin.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Severity import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.js.config.LibrarySourcesConfig import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.descriptors.VariableDescriptor -import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1 +import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1 import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils import org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression import org.jetbrains.jet.lang.resolve.diagnostics.SuppressDiagnosticsByAnnotations diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsDeclarationCheckerProvider.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsDeclarationCheckerProvider.kt index aa863eb0425..824ed0f635c 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsDeclarationCheckerProvider.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsDeclarationCheckerProvider.kt @@ -20,7 +20,7 @@ import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider import org.jetbrains.jet.lang.resolve.AnnotationChecker import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.diagnostics.DiagnosticSink +import org.jetbrains.kotlin.diagnostics.DiagnosticSink import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.psi.JetNamedFunction import org.jetbrains.kotlin.js.resolve.diagnostics.ErrorsJs diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/DefaultErrorMessagesJs.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/DefaultErrorMessagesJs.kt index af7b07854fa..3ed9b748307 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/DefaultErrorMessagesJs.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/DefaultErrorMessagesJs.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.js.resolve.diagnostics -import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages -import org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticFactoryToRendererMap -import org.jetbrains.jet.lang.diagnostics.rendering.Renderers +import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages +import org.jetbrains.kotlin.diagnostics.rendering.DiagnosticFactoryToRendererMap +import org.jetbrains.kotlin.diagnostics.rendering.Renderers import kotlin.properties.Delegates private val DIAGNOSTIC_FACTORY_TO_RENDERER by Delegates.lazy { diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java index f8aa407c746..f587eade68e 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.js.resolve.diagnostics; import com.intellij.openapi.util.TextRange; -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory0; -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory1; -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory2; -import org.jetbrains.jet.lang.diagnostics.Errors; +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory0; +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory1; +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory2; +import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetExpression; @@ -28,9 +28,9 @@ import org.jetbrains.kotlin.types.JetType; import java.util.List; -import static org.jetbrains.jet.lang.diagnostics.PositioningStrategies.*; -import static org.jetbrains.jet.lang.diagnostics.Severity.ERROR; -import static org.jetbrains.jet.lang.diagnostics.Severity.WARNING; +import static org.jetbrains.kotlin.diagnostics.PositioningStrategies.*; +import static org.jetbrains.kotlin.diagnostics.Severity.ERROR; +import static org.jetbrains.kotlin.diagnostics.Severity.WARNING; public interface ErrorsJs { DiagnosticFactory1 NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN = DiagnosticFactory1.create(ERROR, DECLARATION_SIGNATURE_OR_DEFAULT); diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsPositioningStrategies.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsPositioningStrategies.kt index c6e726fc58b..190de00b1cc 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsPositioningStrategies.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsPositioningStrategies.kt @@ -18,10 +18,10 @@ package org.jetbrains.kotlin.js.resolve.diagnostics import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.diagnostics.PositioningStrategy +import org.jetbrains.kotlin.diagnostics.PositioningStrategy import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters2 -import org.jetbrains.jet.lang.diagnostics.ParametrizedDiagnostic +import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters2 +import org.jetbrains.kotlin.diagnostics.ParametrizedDiagnostic public object JsCodePositioningStrategy : PositioningStrategy() { override fun markDiagnostic(diagnostic: ParametrizedDiagnostic): List { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java index cf9e0dd8e5b..9813583fbcd 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java @@ -54,7 +54,7 @@ import java.io.IOException; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.lang.diagnostics.DiagnosticUtils.hasError; +import static org.jetbrains.kotlin.diagnostics.DiagnosticUtils.hasError; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.js.facade.FacadeUtils.parseString; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt index e2cfd424d94..ceadfc23495 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getReceiverParameterForReceiver import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind.* -import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils +import org.jetbrains.kotlin.diagnostics.DiagnosticUtils import org.jetbrains.kotlin.js.translate.utils.JsAstUtils import org.jetbrains.kotlin.js.translate.reference.CallArgumentTranslator import org.jetbrains.kotlin.js.translate.utils.TranslationUtils diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java index cedc2a51823..6d0585b68c0 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.MemberDescriptor; import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor; -import org.jetbrains.jet.lang.diagnostics.DiagnosticSink; +import org.jetbrains.kotlin.diagnostics.DiagnosticSink; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.jet.lang.resolve.BindingContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java index dd25158e430..2d42297f153 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java @@ -28,8 +28,8 @@ import com.intellij.openapi.util.TextRange; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory2; -import org.jetbrains.jet.lang.diagnostics.ParametrizedDiagnostic; +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory2; +import org.jetbrains.kotlin.diagnostics.ParametrizedDiagnostic; import org.jetbrains.kotlin.psi.JetCallExpression; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetStringTemplateExpression; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ErrorReportingUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ErrorReportingUtils.java index d8f2e1710bc..d4a0a3075ec 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ErrorReportingUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ErrorReportingUtils.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.translate.utils; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; +import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; import org.jetbrains.kotlin.psi.JetExpression; public final class ErrorReportingUtils { diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt index f3e05dc8fcc..6501b2974da 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt @@ -16,8 +16,8 @@ import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils -import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils.LineAndColumn +import org.jetbrains.kotlin.diagnostics.DiagnosticUtils +import org.jetbrains.kotlin.diagnostics.DiagnosticUtils.LineAndColumn import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils