Rename package jet -> kotlin in generators

org.jetbrains.jet.generators -> org.jetbrains.kotlin.generators
This commit is contained in:
Alexander Udalov
2015-01-02 20:12:56 +03:00
parent 80997acba3
commit 4f8e6c1dcc
35 changed files with 121 additions and 121 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
<configuration default="false" name="Generate Injectors" type="JetRunConfigurationType" factoryName="Kotlin"> <configuration default="false" name="Generate Injectors" type="JetRunConfigurationType" factoryName="Kotlin">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="org.jetbrains.jet.generators.injectors.InjectorsPackage" /> <option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.generators.injectors.InjectorsPackage" />
<option name="VM_PARAMETERS" value="" /> <option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" /> <option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="" /> <option name="WORKING_DIRECTORY" value="" />
+2 -2
View File
@@ -2,11 +2,11 @@
<configuration default="false" name="Generate Tests" type="Application" factoryName="Application"> <configuration default="false" name="Generate Tests" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern> <pattern>
<option name="PATTERN" value="org.jetbrains.jet.generators.tests.*" /> <option name="PATTERN" value="org.jetbrains.kotlin.generators.tests.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>
<option name="MAIN_CLASS_NAME" value="org.jetbrains.jet.generators.tests.TestsPackage" /> <option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.generators.tests.TestsPackage" />
<option name="VM_PARAMETERS" value="-ea" /> <option name="VM_PARAMETERS" value="-ea" />
<option name="PROGRAM_PARAMETERS" value="" /> <option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
@@ -30,10 +30,10 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.codegen.CodegenTestFiles; import org.jetbrains.jet.codegen.CodegenTestFiles;
import org.jetbrains.jet.codegen.GenerationUtils; import org.jetbrains.jet.codegen.GenerationUtils;
import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
import org.jetbrains.jet.generators.tests.generator.TestGeneratorUtil;
import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.jet.plugin.JetFileType;
import org.jetbrains.jet.utils.Printer; import org.jetbrains.jet.utils.Printer;
import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil;
import org.junit.Assert; import org.junit.Assert;
import java.io.File; import java.io.File;
@@ -97,7 +97,7 @@ import static org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.compileKotlinToD
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
public class JetTestUtils { public class JetTestUtils {
public static final String TEST_GENERATOR_NAME = "org.jetbrains.jet.generators.tests.TestsPackage"; public static final String TEST_GENERATOR_NAME = "org.jetbrains.kotlin.generators.tests.TestsPackage";
public static final String PLEASE_REGENERATE_TESTS = "Please regenerate tests (GenerateTests.kt)"; public static final String PLEASE_REGENERATE_TESTS = "Please regenerate tests (GenerateTests.kt)";
private static final Pattern KT_FILES = Pattern.compile(".*?.kt"); private static final Pattern KT_FILES = Pattern.compile(".*?.kt");
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.builtins.arrayIterators package org.jetbrains.kotlin.generators.builtins.arrayIterators
import org.jetbrains.jet.generators.builtins.PrimitiveType import org.jetbrains.kotlin.generators.builtins.PrimitiveType
import org.jetbrains.jet.generators.builtins.generateBuiltIns.* import org.jetbrains.kotlin.generators.builtins.generateBuiltIns.*
import java.io.PrintWriter import java.io.PrintWriter
class GenerateArrayIterators(out: PrintWriter) : BuiltInsSourceGenerator(out) { class GenerateArrayIterators(out: PrintWriter) : BuiltInsSourceGenerator(out) {
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.builtins.arrays package org.jetbrains.kotlin.generators.builtins.arrays
import org.jetbrains.jet.generators.builtins.PrimitiveType import org.jetbrains.kotlin.generators.builtins.PrimitiveType
import org.jetbrains.jet.generators.builtins.generateBuiltIns.* import org.jetbrains.kotlin.generators.builtins.generateBuiltIns.*
import java.io.PrintWriter import java.io.PrintWriter
class GenerateArrays(out: PrintWriter) : BuiltInsSourceGenerator(out) { class GenerateArrays(out: PrintWriter) : BuiltInsSourceGenerator(out) {
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.builtins package org.jetbrains.kotlin.generators.builtins
import org.jetbrains.jet.generators.builtins.ProgressionKind.* import org.jetbrains.kotlin.generators.builtins.ProgressionKind.*
enum class PrimitiveType { enum class PrimitiveType {
BYTE BYTE
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.builtins.functions package org.jetbrains.kotlin.generators.builtins.functions
import java.io.PrintWriter import java.io.PrintWriter
import org.jetbrains.jet.generators.builtins.functions.FunctionKind.* import org.jetbrains.kotlin.generators.builtins.functions.FunctionKind.*
import org.jetbrains.jet.generators.builtins.generateBuiltIns.* import org.jetbrains.kotlin.generators.builtins.generateBuiltIns.*
val MAX_PARAM_COUNT = 22 val MAX_PARAM_COUNT = 22
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.builtins.generateBuiltIns package org.jetbrains.kotlin.generators.builtins.generateBuiltIns
import org.jetbrains.jet.generators.builtins.arrays.* import org.jetbrains.kotlin.generators.builtins.arrays.*
import org.jetbrains.jet.generators.builtins.arrayIterators.* import org.jetbrains.kotlin.generators.builtins.arrayIterators.*
import org.jetbrains.jet.generators.builtins.functions.* import org.jetbrains.kotlin.generators.builtins.functions.*
import org.jetbrains.jet.generators.builtins.iterators.* import org.jetbrains.kotlin.generators.builtins.iterators.*
import org.jetbrains.jet.generators.builtins.progressionIterators.* import org.jetbrains.kotlin.generators.builtins.progressionIterators.*
import org.jetbrains.jet.generators.builtins.progressions.* import org.jetbrains.kotlin.generators.builtins.progressions.*
import org.jetbrains.jet.generators.builtins.ranges.* import org.jetbrains.kotlin.generators.builtins.ranges.*
import java.io.PrintWriter import java.io.PrintWriter
import java.io.File import java.io.File
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.builtins.iterators package org.jetbrains.kotlin.generators.builtins.iterators
import org.jetbrains.jet.generators.builtins.PrimitiveType import org.jetbrains.kotlin.generators.builtins.PrimitiveType
import org.jetbrains.jet.generators.builtins.generateBuiltIns.* import org.jetbrains.kotlin.generators.builtins.generateBuiltIns.*
import java.io.PrintWriter import java.io.PrintWriter
class GenerateIterators(out: PrintWriter) : BuiltInsSourceGenerator(out) { class GenerateIterators(out: PrintWriter) : BuiltInsSourceGenerator(out) {
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.builtins.progressionIterators package org.jetbrains.kotlin.generators.builtins.progressionIterators
import org.jetbrains.jet.generators.builtins.* import org.jetbrains.kotlin.generators.builtins.*
import org.jetbrains.jet.generators.builtins.generateBuiltIns.* import org.jetbrains.kotlin.generators.builtins.generateBuiltIns.*
import org.jetbrains.jet.generators.builtins.ProgressionKind.* import org.jetbrains.kotlin.generators.builtins.ProgressionKind.*
import java.io.PrintWriter import java.io.PrintWriter
fun integerProgressionIterator(kind: ProgressionKind): String { fun integerProgressionIterator(kind: ProgressionKind): String {
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.builtins.progressions package org.jetbrains.kotlin.generators.builtins.progressions
import org.jetbrains.jet.generators.builtins.* import org.jetbrains.kotlin.generators.builtins.*
import org.jetbrains.jet.generators.builtins.generateBuiltIns.* import org.jetbrains.kotlin.generators.builtins.generateBuiltIns.*
import org.jetbrains.jet.generators.builtins.ProgressionKind.* import org.jetbrains.kotlin.generators.builtins.ProgressionKind.*
import java.io.PrintWriter import java.io.PrintWriter
class GenerateProgressions(out: PrintWriter) : BuiltInsSourceGenerator(out) { class GenerateProgressions(out: PrintWriter) : BuiltInsSourceGenerator(out) {
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.builtins.ranges package org.jetbrains.kotlin.generators.builtins.ranges
import org.jetbrains.jet.generators.builtins.* import org.jetbrains.kotlin.generators.builtins.*
import org.jetbrains.jet.generators.builtins.generateBuiltIns.* import org.jetbrains.kotlin.generators.builtins.generateBuiltIns.*
import org.jetbrains.jet.generators.builtins.ProgressionKind.* import org.jetbrains.kotlin.generators.builtins.ProgressionKind.*
import java.io.PrintWriter import java.io.PrintWriter
class GenerateRanges(out: PrintWriter) : BuiltInsSourceGenerator(out) { class GenerateRanges(out: PrintWriter) : BuiltInsSourceGenerator(out) {
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.evaluate package org.jetbrains.kotlin.generators.evaluate
import java.io.File import java.io.File
import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.FileUtil
@@ -42,7 +42,7 @@ fun generate(): String {
p.println("import java.math.BigInteger") p.println("import java.math.BigInteger")
p.println("import java.util.HashMap") p.println("import java.util.HashMap")
p.println() p.println()
p.println("/** This file is generated by org.jetbrains.jet.generators.evaluate:generate(). DO NOT MODIFY MANUALLY */") p.println("/** This file is generated by org.jetbrains.kotlin.generators.evaluate:generate(). DO NOT MODIFY MANUALLY */")
p.println() p.println()
val unaryOperationsMap = arrayListOf<Pair<String, List<JetType>>>() val unaryOperationsMap = arrayListOf<Pair<String, List<JetType>>>()
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.frontend; package org.jetbrains.kotlin.generators.frontend;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IElementType;
@@ -45,7 +45,7 @@ public class GenerateKeywordStrings {
p.println("import java.util.Set;"); p.println("import java.util.Set;");
p.println("import java.util.HashSet;"); p.println("import java.util.HashSet;");
p.println(); p.println();
p.println("/** This class is generated by {@link \"org.jetbrains.jet.generators.frontend.GenerateKeywordStrings\"}. DO NOT MODIFY MANUALLY */"); p.println("/** This class is generated by {@link \"org.jetbrains.kotlin.generators.frontend.GenerateKeywordStrings\"}. DO NOT MODIFY MANUALLY */");
p.println("public class KeywordStringsGenerated {"); p.println("public class KeywordStringsGenerated {");
p.pushIndent(); p.pushIndent();
p.println("private KeywordStringsGenerated() {}"); p.println("private KeywordStringsGenerated() {}");
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.injectors package org.jetbrains.kotlin.generators.injectors
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import org.jetbrains.jet.context.GlobalContext import org.jetbrains.jet.context.GlobalContext
@@ -312,4 +312,4 @@ private fun generator(
injectorPackageName: String, injectorPackageName: String,
injectorClassName: String, injectorClassName: String,
body: DependencyInjectorGenerator.() -> Unit body: DependencyInjectorGenerator.() -> Unit
) = generator(targetSourceRoot, injectorPackageName, injectorClassName, "org.jetbrains.jet.generators.injectors.InjectorsPackage", body) ) = generator(targetSourceRoot, injectorPackageName, injectorClassName, "org.jetbrains.kotlin.generators.injectors.InjectorsPackage", body)
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.mockJDK; package org.jetbrains.kotlin.generators.mockJDK;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.protobuf package org.jetbrains.kotlin.generators.protobuf
import com.intellij.execution.util.ExecUtil import com.intellij.execution.util.ExecUtil
import java.io.File import java.io.File
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.tests; package org.jetbrains.kotlin.generators.tests;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.tests package org.jetbrains.kotlin.generators.tests
import org.jetbrains.jet.generators.tests.generator.TestGenerator import org.jetbrains.kotlin.generators.tests.generator.TestGenerator
import org.jetbrains.jet.generators.tests.generator.TestGenerator.TargetBackend import org.jetbrains.kotlin.generators.tests.generator.TestGenerator.TargetBackend
import java.util.ArrayList import java.util.ArrayList
import org.jetbrains.jet.generators.tests.generator.SimpleTestClassModel import org.jetbrains.kotlin.generators.tests.generator.SimpleTestClassModel
import java.io.File import java.io.File
import java.util.regex.Pattern import java.util.regex.Pattern
import junit.framework.TestCase import junit.framework.TestCase
@@ -73,12 +73,12 @@ import org.jetbrains.jet.resolve.annotation.AbstractAnnotationParameterTest
import org.jetbrains.jet.evaluate.AbstractEvaluateExpressionTest import org.jetbrains.jet.evaluate.AbstractEvaluateExpressionTest
import org.jetbrains.jet.resolve.calls.AbstractResolvedCallsTest import org.jetbrains.jet.resolve.calls.AbstractResolvedCallsTest
import org.jetbrains.jet.plugin.refactoring.rename.AbstractRenameTest import org.jetbrains.jet.plugin.refactoring.rename.AbstractRenameTest
import org.jetbrains.jet.generators.tests.generator.SingleClassTestModel import org.jetbrains.kotlin.generators.tests.generator.SingleClassTestModel
import org.jetbrains.jet.generators.tests.generator.TestClassModel import org.jetbrains.kotlin.generators.tests.generator.TestClassModel
import org.jetbrains.jet.plugin.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest import org.jetbrains.jet.plugin.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest
import org.jetbrains.jet.shortenRefs.AbstractShortenRefsTest import org.jetbrains.jet.shortenRefs.AbstractShortenRefsTest
import org.jetbrains.jet.completion.handlers.AbstractSmartCompletionHandlerTest import org.jetbrains.jet.completion.handlers.AbstractSmartCompletionHandlerTest
import org.jetbrains.jet.generators.tests.generator.TestGeneratorUtil import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil
import org.jetbrains.jet.resolve.AbstractAdditionalResolveDescriptorRendererTest import org.jetbrains.jet.resolve.AbstractAdditionalResolveDescriptorRendererTest
import org.jetbrains.jet.resolve.AbstractReferenceResolveInLibrarySourcesTest import org.jetbrains.jet.resolve.AbstractReferenceResolveInLibrarySourcesTest
import org.jetbrains.jet.resolve.constraintSystem.AbstractConstraintSystemTest import org.jetbrains.jet.resolve.constraintSystem.AbstractConstraintSystemTest
@@ -119,7 +119,7 @@ import org.jetbrains.jet.plugin.parameterInfo.AbstractFunctionParameterInfoTest
import org.jetbrains.jet.psi.patternMatching.AbstractJetPsiUnifierTest import org.jetbrains.jet.psi.patternMatching.AbstractJetPsiUnifierTest
import org.jetbrains.jet.completion.weighers.AbstractBasicCompletionWeigherTest import org.jetbrains.jet.completion.weighers.AbstractBasicCompletionWeigherTest
import org.jetbrains.jet.completion.weighers.AbstractSmartCompletionWeigherTest import org.jetbrains.jet.completion.weighers.AbstractSmartCompletionWeigherTest
import org.jetbrains.jet.generators.tests.reservedWords.generateTestDataForReservedWords import org.jetbrains.kotlin.generators.tests.reservedWords.generateTestDataForReservedWords
import org.jetbrains.k2js.test.semantics.AbstractReservedWordTest import org.jetbrains.k2js.test.semantics.AbstractReservedWordTest
import org.jetbrains.jet.resolve.AbstractReferenceResolveInJavaTest import org.jetbrains.jet.resolve.AbstractReferenceResolveInJavaTest
import org.jetbrains.k2js.test.semantics.AbstractBridgeTest import org.jetbrains.k2js.test.semantics.AbstractBridgeTest
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.tests.reservedWords package org.jetbrains.kotlin.generators.tests.reservedWords
import java.io.File import java.io.File
import org.jetbrains.jet.renderer.KeywordStringsGenerated import org.jetbrains.jet.renderer.KeywordStringsGenerated
@@ -366,4 +366,4 @@ class CyclicStream<T>(val c: List<T>) : Stream<T> {
} }
override fun iterator(): Iterator<T> = iterator override fun iterator(): Iterator<T> = iterator
} }
@@ -1,20 +1,20 @@
/* /*
* Copyright 2010-2013 JetBrains s.r.o. * Copyright 2010-2015 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.tests.generator; package org.jetbrains.kotlin.generators.tests.generator;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.tests.generator; package org.jetbrains.kotlin.generators.tests.generator;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
@@ -32,7 +32,7 @@ import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import static org.jetbrains.jet.generators.tests.generator.TestGenerator.TargetBackend; import static org.jetbrains.kotlin.generators.tests.generator.TestGenerator.TargetBackend;
public class SimpleTestClassModel implements TestClassModel { public class SimpleTestClassModel implements TestClassModel {
private static final Comparator<TestEntityModel> BY_NAME = new Comparator<TestEntityModel>() { private static final Comparator<TestEntityModel> BY_NAME = new Comparator<TestEntityModel>() {
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.tests.generator; package org.jetbrains.kotlin.generators.tests.generator;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
@@ -29,7 +29,7 @@ import java.util.List;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import static org.jetbrains.jet.generators.tests.generator.TestGenerator.TargetBackend; import static org.jetbrains.kotlin.generators.tests.generator.TestGenerator.TargetBackend;
public class SimpleTestMethodModel implements TestMethodModel { public class SimpleTestMethodModel implements TestMethodModel {
@NotNull @NotNull
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.tests.generator; package org.jetbrains.kotlin.generators.tests.generator;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
@@ -33,7 +33,7 @@ import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import static org.jetbrains.jet.generators.tests.generator.TestGenerator.TargetBackend; import static org.jetbrains.kotlin.generators.tests.generator.TestGenerator.TargetBackend;
public class SingleClassTestModel implements TestClassModel { public class SingleClassTestModel implements TestClassModel {
@NotNull @NotNull
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.tests.generator; package org.jetbrains.kotlin.generators.tests.generator;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.tests.generator; package org.jetbrains.kotlin.generators.tests.generator;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.tests.generator; package org.jetbrains.kotlin.generators.tests.generator;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.tests.generator; package org.jetbrains.kotlin.generators.tests.generator;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.tests.generator; package org.jetbrains.kotlin.generators.tests.generator;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.utils.Printer; import org.jetbrains.jet.utils.Printer;
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.builtins.test package org.jetbrains.kotlin.generators.builtins.test
import java.io.PrintWriter import java.io.PrintWriter
import org.jetbrains.jet.generators.builtins.generateBuiltIns.generateBuiltIns import org.jetbrains.kotlin.generators.builtins.generateBuiltIns.generateBuiltIns
import java.io.StringWriter import java.io.StringWriter
import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.util.text.StringUtil
import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.FileUtil
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.test.evaluate package org.jetbrains.kotlin.generators.test.evaluate
import com.intellij.testFramework.UsefulTestCase import com.intellij.testFramework.UsefulTestCase
import org.jetbrains.jet.JetTestUtils import org.jetbrains.jet.JetTestUtils
import org.jetbrains.jet.generators.evaluate import org.jetbrains.kotlin.generators.evaluate
public class GenerateOperationsMapTest() : UsefulTestCase() { public class GenerateOperationsMapTest() : UsefulTestCase() {
public fun testGeneratedDataIsUpToDate(): Unit { public fun testGeneratedDataIsUpToDate(): Unit {
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.frontend; package org.jetbrains.kotlin.generators.frontend;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.injectors; package org.jetbrains.kotlin.generators.injectors;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.generators.protobuf package org.jetbrains.kotlin.generators.protobuf
import junit.framework.TestCase import junit.framework.TestCase
import com.google.protobuf.GeneratedMessage.GeneratedExtension import com.google.protobuf.GeneratedMessage.GeneratedExtension