Commit Graph

27978 Commits

Author SHA1 Message Date
Denis Zharkov deea0643ad Refine type arguments resolution and rendering
In case of type constructors captured parameters from outer classes

 #KT-5510 Fixed
 #KT-3112 Fixed
 #KT-6325 Fixed
 #KT-408  Fixed
 #KT-6337 Fixed
2015-11-13 14:47:28 +03:00
Denis Zharkov 990bd7e71d Correct parameters of inner's class type constructor
Now it contains copies of outer's class constructor parameters
They are appended just after real type parameters
2015-11-13 14:47:28 +03:00
Denis Zharkov 7b4c0fb83a Use original type parameters for SAM adapter to constructor
It makes SAM descriptors more consistent with real ones
2015-11-13 14:47:28 +03:00
Denis Zharkov d614adcd2a Obtain type parameters of constructor from containing class
Effectively this commit is just inlining of 'typeParameters' parameter
2015-11-13 14:47:28 +03:00
Denis Zharkov c9aa75259b Introduce ClassDescriptor.declaredTypeParameters
Should be a subset of type constructor's parameters
2015-11-13 14:47:28 +03:00
Denis Zharkov 57094954a3 Minor. Simplify control-flow blocks 2015-11-13 14:47:28 +03:00
Denis Zharkov b4b1d16134 Extract and cleanup 'resolveTypeForClass' and 'resolveTypeForTypeParameter' 2015-11-13 14:47:27 +03:00
Valentin Kipyatkov e66f1c2d70 KT-9981 Code cleanup replace usages of !in incorrectly
#KT-9981 Fixed
2015-11-13 14:32:33 +03:00
Mikhail Glukhikh 2f4dbd2084 Code cleanup: get rid of unnecessary !! / ?. / as 2015-11-13 13:13:55 +03:00
Michael Bogdanov 7e8e4e9e1b Fix for KT-2789: NoSuchMethodError when calling trait function with default arguments that returns generic type, KT-9428 Abstract method with one parameter and one default parameter produces NoSuchMethodError, KT-9924 NoSuchMethod when replacing generic with specific type
#KT-2789 Fixed
 #KT-9428 Fixed
 #KT-9924 Fixed
2015-11-13 10:14:01 +03:00
Michael Bogdanov 3f995935d3 Fix for KT-9022: Wrong result when use break in if condition
#KT-9022 Fixed
2015-11-13 10:14:00 +03:00
Ilya Chernikov 20ca8cd435 Additional fix to the previous one: Disabling parallel builds without daemon again and undoing apprpriate fix to broken tests problem, since it effectively cancelled fix for parallel building itself and was causing exceptions on heavy builds
(cherry picked from commit bb66776)
2015-11-12 19:15:14 +01:00
Nikolay Krasko 0b01c8a4cf Minor: remove warnings in KotlinCliJavaFileManagerImpl 2015-11-12 19:19:44 +03:00
Nikolay Krasko bd4ffb9ced Announce we are going to invalidate file to collect invalidatation trace
See DebugUtil.currentInvalidationTrace()
2015-11-12 19:19:43 +03:00
Nikolay Krasko 33fd247bde Test that fails with package prefixes but works good without them 2015-11-12 19:19:42 +03:00
Nikolay Krasko 03310491d0 Update to idea 143.747.5 2015-11-12 19:19:41 +03:00
Ilya Chernikov 4643d7fc4d Disabling parallel builds without daemon again and undoing apprpriate fix to broken tests problem, since it effectively cancelled fix for parallel building itself and was causing exceptions on heavy builds
(cherry picked from commit 0610452)
2015-11-12 17:15:14 +01:00
Zalim Bashorov b7772f32ce Minor: add more logging to KotlinBuilder 2015-11-12 18:39:43 +03:00
Dmitry Jemerov c734cad429 fix typo: 'a' before uuid 2015-11-12 14:22:58 +01:00
Michael Bogdanov de6731cb4b Additional diagnostic for KT-9980: KotlinFrontEndException: Exception while analyzing expression 2015-11-12 14:38:09 +03:00
Zalim Bashorov ca71f929f9 Add new tests for incremental compilation and disable the one for current IC 2015-11-12 13:43:25 +03:00
Zalim Bashorov e1ad942804 Add separate build logs for tests which result is different in the new incremental compilation 2015-11-12 13:43:24 +03:00
Zalim Bashorov 5a6c04357b Add the ability to have separate log file for experimental incremental compilation tests 2015-11-12 13:43:23 +03:00
Zalim Bashorov 5ca7ce2b50 Make accessingFunctionsViaRenamedFileClass test more sensible 2015-11-12 13:43:22 +03:00
Zalim Bashorov f144bb38da ChangesInfo -> CompilationResult 2015-11-12 13:43:21 +03:00
Zalim Bashorov d4a18a3ef2 Integrate components of the new incremental compilation 2015-11-12 13:43:20 +03:00
Zalim Bashorov 4caf1b54f7 Minor: re-sort statements in KotlinBuilder::doBuild 2015-11-12 13:43:19 +03:00
Zalim Bashorov 3ce84d04e6 Minor: get rid of KotlinBuilder.ChangesProcessor 2015-11-12 13:43:19 +03:00
Zalim Bashorov 2944e998f7 Minor: don't trim file content in KotlinTestUtils#doLoadFile 2015-11-12 13:43:18 +03:00
Zalim Bashorov 28366a0bf4 Fix refer to classes from default package in SMAP 2015-11-11 22:59:05 +03:00
Dmitry Jemerov 45ef9b02c4 remove some leftovers of old package facades in IDE code 2015-11-11 19:25:11 +01:00
Michael Nedzelsky 5b59fc74bc fix access from tests to internal elements in production code in case of circular dependency 2015-11-11 19:16:21 +03:00
Ilya Gorbunov a8b11ff07b Make MutableMap.set return Unit
#KT-7853 Fixed
2015-11-11 19:00:10 +03:00
Ilya Gorbunov 7844030ba4 Restore correct sorting order (after cleanup in 17fc1d95) 2015-11-11 19:00:09 +03:00
Ilya Gorbunov a793a63b73 Simplify message expression from lambda argument when converting assert to if. 2015-11-11 19:00:08 +03:00
Ilya Gorbunov 3639afafce Deprecated with ERROR preconditions with eager message. 2015-11-11 19:00:03 +03:00
Ilya Gorbunov 07c570f35d Replace getStackTrace usages in j2k and testData. 2015-11-11 18:59:56 +03:00
Ilya Gorbunov 0579f6c8bf Replace Regex.match and matchAll usages 2015-11-11 18:59:55 +03:00
Ilya Gorbunov f06d521bfe Refactor intention test files enumerating, do not use deprecated filter method, which would get another behavior after dropping deprecated one. 2015-11-11 18:59:54 +03:00
Ilya Gorbunov be9b14545f Drop deprecations and tighten up left ones. 2015-11-11 18:59:53 +03:00
Ilya Gorbunov 5b484f1e05 Make emptyMap upperbound to be Any? rather than Any.
#KT-9963
2015-11-11 17:14:41 +03:00
Dmitry Jemerov 6f2fb3f9aa don't analyze class repeatedly if we already found an annotated member there
#KT-8557 Fixed
2015-11-11 15:09:18 +01:00
Valentin Kipyatkov de11d571ef KT-9928 Replacement not offered for a usage of symbol deprecated with DeprecationLevel.ERROR
#KT-9928 Fixed
2015-11-11 16:49:52 +03:00
Ilya Gorbunov 75f5cec190 Minor: remove inapplicable operator modifiers. 2015-11-11 16:41:40 +03:00
Ilya Gorbunov f7135dfe50 Do not override default AbstractList iterator() implementation for primitiveArray.asList wrappers.
#KT-9927 Fixed
2015-11-11 16:41:39 +03:00
Michael Bogdanov 3651ec9294 Support access to protected members within inline functions 2015-11-11 14:34:48 +03:00
Michael Bogdanov 5a8ead0092 Fix for KT-8204: java.lang.VerifyError for super method invocation in inline function
#KT-8204 Fixed
2015-11-11 14:34:47 +03:00
Mikhail Glukhikh 04f7805d52 Minor comment to CastClassReceiver 2015-11-11 13:30:19 +03:00
Ilya Gorbunov f105329fb4 Fix test dependent on exact documentation wording in stdlib. 2015-11-11 04:05:07 +03:00
Ilya Gorbunov 0fb8419bd1 Update testdata for LoadBuiltinsTest 2015-11-11 03:53:54 +03:00