Nikolay Krasko
579bd6785e
Merge remote-tracking branch 'origin/master' into idea-13-0
...
Conflicts:
compiler/testData/asJava/nullabilityAnnotations/Generic.java
idea/src/META-INF/plugin.xml
idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java
idea/testData/completion/basic/java/PropertyMetadata.kt
update_dependencies.xml
2014-03-05 14:52:50 +04:00
Alexander Udalov
0da92e22a2
Move jet.JetObject -> kotlin.jvm.internal.KObject
...
Don't use JetObject as a marker class in KotlinRuntimeLibraryUtil anymore,
since there are other classes for this purpose (KotlinPackage, Unit)
2014-03-02 19:54:58 +04:00
Nikolay Krasko
202b9847d7
Revert 9f3b739: Update to IDEA 13.1 (134.1007)
2014-02-23 23:56:01 +04:00
Natalia Ukhorskaya
9f3b73986a
Update to IDEA 13.1 (134.1007)
2014-02-17 10:45:48 +04:00
Andrey Breslav
9229062926
Do not annotate bare type parameters as @Nullable
...
This is to account for the case of, say
class Function<R> { fun invoke(): R }
it would be a shame to put @Nullable on the return type of the function, and force all callers to check for null,
so we put no annotations
2014-02-07 16:41:12 -08:00
