azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,758 Commits 1 Branch 0 Tags
2f554e46ff5d21c2dc1822594bcb20626b3c7278
Commit Graph

10758 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrey Breslav 2f554e46ff Merge branch 'master' into idea13 2013-06-05 12:33:40 +04:00
Svetlana Isakova 7e564de71a added constraint for package level delegated property 2013-06-04 22:11:43 +04:00
Svetlana Isakova 2b0616b1c4 rename 
ERROR_IDENTIFIER_INFO -> NO_IDENTIFIER_INFO
 2013-06-04 22:11:43 +04:00
Svetlana Isakova 2337f4b948 bug fix 
do not combine receiverInfo with error selectorInfo
 2013-06-04 22:11:43 +04:00
Svetlana Isakova ecec6acde8 use explicit type of delegated property as expected 
while resolving constraint system for delegated expression
 2013-06-04 22:11:43 +04:00
Natalia.Ukhorskaya 8429162220 Merge branch 'master' into idea13 
Conflicts:
	idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java
	idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java
	libraries/stdlib/src/kotlin/properties/Properties.kt
	libraries/stdlib/test/properties/delegation/DelegationTest.kt
	libraries/stdlib/test/properties/delegation/MapDelegationTest.kt
	libraries/stdlib/test/properties/delegation/lazy/LazyValuesTest.kt
	update_dependencies.xml
 2013-06-04 13:14:08 +04:00
Natalia.Ukhorskaya acbccb9411 Get asm from fixed idea build (jar with debug info and patched for java 8) 2013-06-04 11:11:48 +04:00
Andrey Breslav ce402068c9 Using a property for IDEA zip name 
(cherry picked from commit 42683dc)
 2013-06-04 11:11:47 +04:00
Andrey Breslav 9270eec30f Using properties for dependency build id's 
(cherry picked from commit 68b0aa0)
 2013-06-04 11:11:46 +04:00
Evgeny Gerashchenko c51a70b3b8 Optimized obtaining super methods. 2013-06-03 18:20:36 +04:00
Evgeny Gerashchenko 343a28ac2d Ignored local Gradle repository. 2013-06-03 17:47:36 +04:00
Evgeny Gerashchenko 3e5feeb436 Minor. Added comments. 2013-06-03 17:40:58 +04:00
Evgeny Gerashchenko 89b3f953d1 Fixed broken reference to jar. 2013-06-03 17:40:57 +04:00
Evgeny Gerashchenko 6d0b8f953d Typo. 2013-06-03 17:40:57 +04:00
Nikolay Krasko 555e182d6d Fix returned indices from TextBlockTransferableData 
Thanks to Alexander (https://github.com/Alefas) for idea

 #KT-3662 Fixed
 2013-05-31 20:55:35 +04:00
Andrey Breslav 6d6e627641 Support custom JDK annotations path for TeamCity 2013-05-31 20:35:32 +04:00
Svetlana Isakova 61f50fc832 removed 'allowNamespaces' flag 
from creating IdentifierInfo
 2013-05-31 16:29:07 +04:00
Svetlana Isakova 42b34586bd made ReceiverValueVisitor an interface 2013-05-31 16:29:07 +04:00
Svetlana Isakova f05f616230 KT-2422 Invalid warning "Condition is always true" 
#KT-2422 fixed
 2013-05-31 16:29:07 +04:00
Leonid Shalupov 213e8c11c9 Merge pull request #283 from nskvortsov/master 
Isolated classloading for kotlin gradle plugin
 2013-05-31 05:18:16 -07:00
Natalia Ukhorskaya 3b72b2be0c Merge pull request #282 from lopekpl/type_mismatch_in_literals3 
QuickFixes for TYPE_MISMATCH
 2013-05-31 01:29:32 -07:00
Maxim Shafirov 868bf90de2 Rollback 0514ddc719 due to failing tests 2013-05-31 11:35:11 +04:00
Maxim Shafirov 58914cdf33 Delegate properties stdlib, take 2. 2013-05-30 19:06:45 +04:00
shafirov a954508284 Merge pull request #284 from erokhins/master 
fix Iterable<T>.toSortedList in libraries
 2013-05-30 07:04:46 -07:00
Erokhin Stanislav 0514ddc719 fix Iterable<T>.toSortedList 2013-05-30 17:09:31 +04:00
Nikita Skvortsov 5429c1333e Tests for wrapped plugin, some polishing 2013-05-30 15:21:27 +04:00
Nikita Skvortsov 9f0acd0e98 fix tests 2013-05-30 15:21:26 +04:00
Nikita Skvortsov 308c12f45c first class loader wrapper implementation 2013-05-30 15:21:26 +04:00
Nikita Skvortsov 7e36547b38 Added wrapper module for gradle plugin 2013-05-30 15:21:25 +04:00
Nikita Skvortsov 7e58d83121 rename module 2013-05-30 15:21:25 +04:00
Natalia.Ukhorskaya fc3a413fba Check not null annotations for parameters in IdeaJdkAnnotationsReflectedTest 2013-05-30 13:07:53 +04:00
Evgeny Gerashchenko 92bc46ab8f Fixed starting in profiler. 2013-05-30 13:07:52 +04:00
Andrey Breslav 5a50caa8ac The error message now tells the user about jps.kotlin.home 
For TeamCity users
 2013-05-30 13:07:51 +04:00
Andrey Breslav a8267b370e Do not fail on circular dependencies + better message 2013-05-30 13:07:50 +04:00
Evgeny Gerashchenko bc8a6d9023 Ignoring all workspace.xml files. 2013-05-30 13:07:49 +04:00
Evgeny Gerashchenko 63899bdd5d Sorted .gitignore 2013-05-30 13:07:48 +04:00
Evgeny Gerashchenko b2ed1b1e96 Cleanup in .gitignore 2013-05-30 13:07:47 +04:00
Evgeny Gerashchenko 771cf85179 Added my dictionary with "klass" word. 2013-05-30 13:07:46 +04:00
Mikhael Bogdanov 61b495e95c Fixed 'lowercaseFirstLetter' for test data in 280 pull request 2013-05-30 13:07:45 +04:00
Sergey Rostov d847123c9c KDoc wiki links pair matcher and @tags highlighter 2013-05-30 13:07:44 +04:00
Sergey Rostov 940008cdaa KDoc lexer refactored (got rid of hacks and separate tokens for words). Fixed bug with isInComment(element) detection. 2013-05-30 13:07:42 +04:00
Sergey Rostov 85ab1619a7 Update KetTokens.Comments TokenSet 2013-05-30 13:07:41 +04:00
Sergey Rostov 9dfe0f42a3 KT-1545, KT-3161 KDoc formatter 2013-05-30 13:07:40 +04:00
Sergey Rostov c4bdf72054 KT-1545, KT-3161 KDoc lexer & parser 2013-05-30 13:07:38 +04:00
Sergey Rostov 92659ca7a5 KT-3161 JetCommenter implementation stub 2013-05-30 13:07:37 +04:00
Michał Sapalski d849258757 Support for generic classes in quickfix for NOTHING_TO_OVERRIDE 2013-05-30 13:07:36 +04:00
Michał Sapalski 642d073bc9 Quickfix for NOTHING_TO_OVERRIDE: add function to one of supertypes. 2013-05-30 13:07:35 +04:00
Mikhael Bogdanov 11c44890a7 KT-3652: Char is converted to Int when used inside string interpolation 
#KT-3652 Fixed
 2013-05-30 13:07:33 +04:00
Andrey Breslav aa90dac6d1 Support jps.kotlin.home 2013-05-30 13:07:32 +04:00
Andrey Breslav 8511137596 Support jps.kotlin.home 2013-05-30 13:07:31 +04:00