azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,299 Commits 1 Branch 0 Tags
a2fdfc714fdcf74fb4dcf342fac1938b92f2e822
Commit Graph

16299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikolay Krasko a2fdfc714f Update to idea 138.777 2014-06-26 16:43:13 +04:00
Nikolay Krasko a0e45e9a12 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
 2014-06-25 16:26:01 +04:00
Nikolay Krasko 3f2d65762b Revert temporary commit "-- Attempt to fix completion for extensions" 
This reverts commit b70f9cd675.
 2014-06-25 14:52:41 +04:00
Nikolay Krasko fd4aeb75fc Smart enter for one line statements in for, while and do-while 
#KT-3600 In Progress
 2014-06-25 14:23:00 +04:00
Nikolay Krasko 431f3ad185 Smart enter in function literal expression 
#KT-3600 In Progress
 2014-06-25 14:23:00 +04:00
Nikolay Krasko d4ac3454ce Smart enter for fun declaration 
#KT-3600 In Progress
 2014-06-25 14:22:59 +04:00
Nikolay Krasko 150ac0ab91 Smart enter for 'do-while' expression 
#KT-3600 In Progress
 2014-06-25 14:22:58 +04:00
Nikolay Krasko 56efcd15aa Smart enter for 'when' 
#KT-3600 In Progress
 2014-06-25 14:22:58 +04:00
Nikolay Krasko 8fc60f93d3 Smart enter for 'for' expression 
#KT-3600 In Progress
 2014-06-25 14:22:57 +04:00
Nikolay Krasko fab74d8092 Smart enter for while statement 
#KT-3600 In Progress
 2014-06-25 14:22:56 +04:00
Nikolay Krasko 693080acfc Smart enter for if statement 
#KT-3600 In Progress
 2014-06-25 14:22:56 +04:00
Nikolay Krasko b574e3bd4f Refactoring: move function trimIndent 2014-06-25 14:22:55 +04:00
Nikolay Krasko 513ec93060 Formatting: Move '}' to next line in when 2014-06-25 14:22:55 +04:00
Nikolay Krasko 0716b09920 Fix errors in intentions after parser fixes 2014-06-25 14:22:54 +04:00
Nikolay Krasko d8490ce2a6 Don't parse entries if left brace absent in 'when' 2014-06-25 14:22:53 +04:00
Nikolay Krasko f36f1796d6 Fix recovery for 'for' expression 2014-06-25 14:22:53 +04:00
Nikolay Krasko 2571797411 Don't parse condition if there's no ( for if 2014-06-25 14:22:52 +04:00
Andrey Breslav e06154c204 Don't compile runtime for each test run by default: only do it for All Tests 2014-06-25 12:52:47 +04:00
Ilya Ryzhenkov 1842d30567 Implement equals for NumberRange in JavaScript. 2014-06-24 23:49:16 +04:00
Ilya Ryzhenkov ca7c3d7999 Set operations (distinct, union, intersect, subtract) 2014-06-24 23:49:16 +04:00
Ilya Ryzhenkov 132f2a5fa8 Improve performance for addAll with type check for Collection 2014-06-24 23:49:16 +04:00
Ilya Ryzhenkov 65da4cb2fb Generalize zip(..) to merge(..) { t1, t2 -> ... }, add merge for maps. 2014-06-24 23:49:16 +04:00
Ilya Ryzhenkov f94b79fac3 Minor. Update reference to issue. 2014-06-24 23:49:15 +04:00
Ilya Ryzhenkov 4e4d0b448c Minor. Cleanup test. 2014-06-24 23:49:15 +04:00
Ilya Ryzhenkov 516bae17d7 StringBuilder builder and appendln 2014-06-24 23:49:15 +04:00
Ilya Ryzhenkov 0717511abe Substring and replace before/after first/last occurrence of delimiter. 2014-06-24 23:49:15 +04:00
Evgeny Gerashchenko 1ce0e6cd3e Added exceptions for proguard: constants are used in JPS plugin. 2014-06-24 22:19:12 +04:00
Evgeny Gerashchenko ca4ac43add Added tests with class referenced from proto. 2014-06-24 22:18:19 +04:00
Evgeny Gerashchenko 8479ca76b0 Added clearing proto data in incremental cache. 2014-06-24 22:18:18 +04:00
Evgeny Gerashchenko 471e3e80f2 Minor. Fixed mixed up error messages in test. 2014-06-24 22:18:18 +04:00
Evgeny Gerashchenko 5c49eb0a54 Writing class names in proto map (to avoid ambiguities) 2014-06-24 22:18:17 +04:00
Evgeny Gerashchenko fc7dceba5a Clearing constants data when removing file. 2014-06-24 22:18:16 +04:00
Evgeny Gerashchenko 9dd627a23d Removed ingoring files facility from incremental tests. 
It is not necessary since script.xml are not generated in out directory anymore.
 2014-06-24 22:18:16 +04:00
Evgeny Gerashchenko ab442754d6 Changing lastModified manually in case when it wasn't changed after file overwriting. 2014-06-24 22:18:15 +04:00
Evgeny Gerashchenko 3ee92da6f0 Added test with all types of constants. 2014-06-24 22:18:14 +04:00
Evgeny Gerashchenko bf442a9700 Fixed loading integral constants from compiled classes. 2014-06-24 22:18:13 +04:00
Evgeny Gerashchenko 111feb2574 Added tests with removing files and changing packages. 2014-06-24 22:18:11 +04:00
Evgeny Gerashchenko 7742755de4 Minor. Correct map with expected size creation. 2014-06-24 22:18:11 +04:00
zarechenskiy 0355b1bd53 Implement JavaTypeSubstitutor without PSI 2014-06-24 20:06:13 +04:00
Andrey Breslav 97b7768890 JetTypeChecker refactored: duplicate methods replaced by instance management 2014-06-24 19:13:01 +04:00
Andrey Breslav cd28b216c1 Rename. INSTANCE -> DEFAULT in JetTypeChecker 2014-06-24 19:13:01 +04:00
Andrey Breslav f26cad71d8 Useless final removed 2014-06-24 19:13:01 +04:00
Pavel V. Talanov 40a245a91f Hack to filter out irrelevant actions in quick fix tests output 
Needed because of different behaviour locally and on build server
 2014-06-24 16:37:45 +04:00
Pavel V. Talanov e3c170183e Fix invalid usage of descriptorToDeclaration in QuickFixUtil 2014-06-24 16:37:44 +04:00
Pavel V. Talanov 41dd12d46b Fix invalid usage of descriptorToDeclaration in QuickFixFactoryForTypeMismatchError 2014-06-24 16:37:44 +04:00
Svetlana Isakova 0673dc51d6 Test for KT-3162 More precise try-finally error marking 
#KT-3162 Obsolete
 2014-06-24 16:14:07 +04:00
Svetlana Isakova 6a4ccfd91d Store copies of instruction only once 
removed reference to 'original' instruction
 2014-06-24 16:14:07 +04:00
Svetlana Isakova ad83680666 Refactoring: changed methods order 2014-06-24 16:14:07 +04:00
Svetlana Isakova e4a0651224 Added 'markedAsDead' flag to InstructionImpl 
to be used in tests
 2014-06-24 16:14:07 +04:00
Svetlana Isakova 8680ff4e88 Do not mark comment next to reachable child as unreachable 2014-06-24 16:14:06 +04:00