Merge master into idea14

Conflicts:
	.idea/runConfigurations/All_Tests.xml
	idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
	idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt
	idea/tests/org/jetbrains/jet/shortenRefs/AbstractShortenRefsTest.kt

Original commit: a0e45e9a12

jps/jps-plugin/testData/incremental/allConstants/build.log

@@ -0,0 +1,22 @@
+Cleaning output files:
+out/production/module/test/TestPackage-const-*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+src/const.kt
+End of files
+
+
+Cleaning output files:
+out/production/module/test/TestPackage-const-*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+src/const.kt
+End of files
+Cleaning output files:
+out/production/module/test/Usage.class
+End of files
+Compiling files:
+src/usage.kt
+End of files

jps/jps-plugin/testData/incremental/allConstants/const.kt

@@ -0,0 +1,12 @@
+package test
+
+val b: Byte = 100
+val s: Short = 20000
+val i: Int = 2000000
+val l: Long = 2000000000000L
+val f: Float = 3.14f
+val d: Double = 3.14
+val bb: Boolean = true
+val c: Char = '\u03c0' // pi symbol
+
+val str: String = ":)"

jps/jps-plugin/testData/incremental/allConstants/const.kt.new.1

@@ -0,0 +1,12 @@
+package test
+
+val b: Byte = 50 + 50
+val s: Short = 10000 + 10000
+val i: Int = 1000000 + 1000000
+val l: Long = 1000000000000L + 1000000000000L
+val f: Float = 0.0f + 3.14f
+val d: Double = 0.0 + 3.14
+val bb: Boolean = !false
+val c: Char = '\u03c0' // pi symbol
+
+val str: String = ":)"

jps/jps-plugin/testData/incremental/allConstants/const.kt.new.2

@@ -0,0 +1,12 @@
+package test
+
+val b: Byte = 0
+val s: Short = 0
+val i: Int = 0
+val l: Long = 0
+val f: Float = 0.0f
+val d: Double = 0.0
+val bb: Boolean = false
+val c: Char = 'x'
+
+val str: String = ":("

jps/jps-plugin/testData/incremental/allConstants/usage.kt

@@ -0,0 +1,4 @@
+package test
+
+deprecated("$b $s $i $l $f $d $bb $c $str")
+class Usage

jps/jps-plugin/testData/incremental/classRecreated/A.kt.new.2

@@ -0,0 +1,3 @@
+package test
+
+class A

jps/jps-plugin/testData/incremental/classRecreated/a.kt

@@ -0,0 +1,3 @@
+package test
+
+class A

jps/jps-plugin/testData/incremental/classRecreated/a.kt.delete.1

@@ -0,0 +1 @@
+

jps/jps-plugin/testData/incremental/classRecreated/build.log

@@ -0,0 +1,17 @@
+Cleaning output files:
+out/production/module/test/A.class
+End of files
+Compiling files:
+End of files
+
+
+Compiling files:
+src/A.kt
+End of files
+Cleaning output files:
+out/production/module/test/TestPackage-other-*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+src/other.kt
+End of files

jps/jps-plugin/testData/incremental/classRecreated/other.kt

@@ -0,0 +1,4 @@
+package test
+
+fun other() {
+}

jps/jps-plugin/testData/incremental/dependencyClassReferenced/a.kt

@@ -0,0 +1,6 @@
+package test
+
+fun a(ref: kotlin.test.Asserter) {
+    b(ref)
+    println(":)")
+}

jps/jps-plugin/testData/incremental/dependencyClassReferenced/a.kt.new

@@ -0,0 +1,6 @@
+package test
+
+fun a(ref: kotlin.test.Asserter) {
+    b(ref)
+    println(":)")
+}

jps/jps-plugin/testData/incremental/dependencyClassReferenced/b.kt

@@ -0,0 +1,6 @@
+package test
+
+fun b(ref: kotlin.test.Asserter) {
+    a(ref)
+    println(":)")
+}

jps/jps-plugin/testData/incremental/dependencyClassReferenced/build.log

@@ -0,0 +1,7 @@
+Cleaning output files:
+out/production/module/test/TestPackage-a-*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+src/a.kt
+End of files

jps/jps-plugin/testData/incremental/filesExchangePackages/a.kt

@@ -0,0 +1,3 @@
+package foo
+
+fun a() = "a"

jps/jps-plugin/testData/incremental/filesExchangePackages/b.kt

@@ -0,0 +1,3 @@
+package foo
+
+fun b() = "b"

jps/jps-plugin/testData/incremental/filesExchangePackages/b.kt.new

@@ -0,0 +1,3 @@
+package bar
+
+fun b() = "b"

jps/jps-plugin/testData/incremental/filesExchangePackages/build.log

@@ -0,0 +1,17 @@
+Cleaning output files:
+out/production/module/bar/BarPackage-c-*.class
+out/production/module/bar/BarPackage.class
+out/production/module/foo/FooPackage-b-*.class
+out/production/module/foo/FooPackage.class
+End of files
+Compiling files:
+src/b.kt
+src/c.kt
+End of files
+Cleaning output files:
+out/production/module/foo/FooPackage-a-*.class
+out/production/module/foo/FooPackage.class
+End of files
+Compiling files:
+src/a.kt
+End of files

jps/jps-plugin/testData/incremental/filesExchangePackages/c.kt

@@ -0,0 +1,3 @@
+package bar
+
+fun c() = "c"

jps/jps-plugin/testData/incremental/filesExchangePackages/c.kt.new

@@ -0,0 +1,3 @@
+package foo
+
+fun c() = "c"

jps/jps-plugin/testData/incremental/multiplePackagesModified/a1.kt

@@ -0,0 +1,3 @@
+package a
+
+fun a1() = ":)"

jps/jps-plugin/testData/incremental/multiplePackagesModified/a2.kt.new

@@ -0,0 +1,3 @@
+package a
+
+fun a2() = ":))"

jps/jps-plugin/testData/incremental/multiplePackagesModified/b1.kt

@@ -0,0 +1,3 @@
+package b
+
+fun b1() = ":("

jps/jps-plugin/testData/incremental/multiplePackagesModified/b2.kt

@@ -0,0 +1,3 @@
+package b
+
+fun b2() = ":(("

jps/jps-plugin/testData/incremental/multiplePackagesModified/build.log

@@ -0,0 +1,17 @@
+Cleaning output files:
+out/production/module/b/BPackage-b2-*.class
+out/production/module/b/BPackage.class
+End of files
+Compiling files:
+src/a2.kt
+End of files
+Cleaning output files:
+out/production/module/a/APackage-a1-*.class
+out/production/module/a/APackage.class
+out/production/module/b/BPackage-b1-*.class
+out/production/module/b/BPackage.class
+End of files
+Compiling files:
+src/a1.kt
+src/b1.kt
+End of files

jps/jps-plugin/testData/incremental/ourClassReferenced/Klass.kt

@@ -0,0 +1,3 @@
+package klass
+
+class Klass

jps/jps-plugin/testData/incremental/ourClassReferenced/Klass.kt.new.2

@@ -0,0 +1,3 @@
+package klass
+
+class Klass

jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt

@@ -0,0 +1,8 @@
+package test
+
+import klass.*
+
+fun a(klass: Klass) {
+    b(klass)
+    println(":)")
+}

jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt.new.1

@@ -0,0 +1,8 @@
+package test
+
+import klass.*
+
+fun a(klass: Klass) {
+    b(klass)
+    println(":)")
+}

jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt.new.2

@@ -0,0 +1,8 @@
+package test
+
+import klass.*
+
+fun a(klass: Klass) {
+    b(klass)
+    println(":)")
+}

jps/jps-plugin/testData/incremental/ourClassReferenced/b.kt

@@ -0,0 +1,8 @@
+package test
+
+import klass.*
+
+fun b(klass: Klass) {
+    a(klass)
+    println(":)")
+}

jps/jps-plugin/testData/incremental/ourClassReferenced/build.log

@@ -0,0 +1,18 @@
+Cleaning output files:
+out/production/module/test/TestPackage-a-*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+src/a.kt
+End of files
+
+
+Cleaning output files:
+out/production/module/klass/Klass.class
+out/production/module/test/TestPackage-a-*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+src/Klass.kt
+src/a.kt
+End of files

jps/jps-plugin/testData/incremental/packageRecreated/a.kt

@@ -0,0 +1,3 @@
+package test
+
+fun a() = "a"

jps/jps-plugin/testData/incremental/packageRecreated/a.kt.delete.1

@@ -0,0 +1 @@
+

jps/jps-plugin/testData/incremental/packageRecreated/b.kt.new.2

@@ -0,0 +1,3 @@
+package test
+
+fun b() = "b"

jps/jps-plugin/testData/incremental/packageRecreated/build.log

@@ -0,0 +1,11 @@
+Cleaning output files:
+out/production/module/test/TestPackage-a-*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+End of files
+
+
+Compiling files:
+src/b.kt
+End of files

jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/a.kt

@@ -0,0 +1,3 @@
+package test
+
+fun a() = "a"

jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/a.kt.new.1

@@ -0,0 +1,3 @@
+package test2
+
+fun a() = "a"

jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/b.kt.new.2

@@ -0,0 +1,3 @@
+package test
+
+fun b() = "b"

jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/build.log

@@ -0,0 +1,19 @@
+Cleaning output files:
+out/production/module/test/TestPackage-a-*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+src/a.kt
+End of files
+
+
+Compiling files:
+src/b.kt
+End of files
+Cleaning output files:
+out/production/module/test2/Test2Package-a-*.class
+out/production/module/test2/Test2Package.class
+End of files
+Compiling files:
+src/a.kt
+End of files

jps/jps-plugin/testData/incremental/packageRemoved/a.kt

@@ -0,0 +1,3 @@
+package test
+
+fun a() = "a"

jps/jps-plugin/testData/incremental/packageRemoved/b.kt

@@ -0,0 +1,3 @@
+package test
+
+fun b() = "b"

jps/jps-plugin/testData/incremental/packageRemoved/build.log

@@ -0,0 +1,9 @@
+Cleaning output files:
+out/production/module/test/TestPackage-a-*.class
+out/production/module/test/TestPackage.class
+End of files
+Cleaning output files:
+out/production/module/test/TestPackage-b-*.class
+End of files
+Compiling files:
+End of files

jps/jps-plugin/testData/incremental/soleFileChangesPackage/a.kt

@@ -0,0 +1,3 @@
+package foo
+
+fun a() = "a"

jps/jps-plugin/testData/incremental/soleFileChangesPackage/a.kt.new

@@ -0,0 +1,4 @@
+package bar
+
+fun a() = "a"
+fun aa() = "aa"

jps/jps-plugin/testData/incremental/soleFileChangesPackage/build.log

@@ -0,0 +1,7 @@
+Cleaning output files:
+out/production/module/foo/FooPackage-a-*.class
+out/production/module/foo/FooPackage.class
+End of files
+Compiling files:
+src/a.kt
+End of files