Commit Graph

5221 Commits

Author SHA1 Message Date
Evgeny Gerashchenko 97d96b480e Changed completion for classes, so if they have the same name as already imported, new import is not added. Qualified name is inserted instead. 2012-05-02 19:43:16 +04:00
pTalanov 4e617094ce Merge remote-tracking branch 'origin/master' 2012-05-02 18:16:43 +04:00
pTalanov 3d97549872 Comment out test which corrupt teamcity build. 2012-05-02 18:09:22 +04:00
pTalanov 9af091b715 Fix smoke test. 2012-05-02 17:20:53 +04:00
pTalanov 359778906d Fix maven build. 2012-05-02 16:38:50 +04:00
pTalanov 4830d47e83 Change path to compiler version in teamcity build. 2012-05-02 16:10:01 +04:00
pTalanov 893fb1ffb7 Exclude proguard from build temporarily. 2012-05-02 15:53:34 +04:00
pTalanov f3e2a94745 Rename K2JVMCompilerVersion -> CompilerVersion, move to common. 2012-05-02 15:28:46 +04:00
pTalanov 7ba22df327 Extract JetCompilerMessagingTest from IDECompilerMessagingTest. 2012-05-02 15:25:05 +04:00
pTalanov 7e58e4d919 Add srcdir as K2JSCompiler parameter. 2012-05-02 15:24:25 +04:00
pTalanov ce929fab49 Rename CompileEnvironmentConfiguration. Drop ArgsUtil class. Add CompilerSpecialMode.JS. 2012-05-02 15:23:40 +04:00
pTalanov c7d5f79ec8 Finish merge. 2012-05-02 15:20:47 +04:00
Stepan Koltsov 34829a9ab9 fix code formatting 2012-05-02 14:57:49 +04:00
pTalanov 7da1e31eca Merge remote-tracking branch 'origin/master'
Conflicts:
	build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java
	compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java
	compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentConfiguration.java
	compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
	compiler/tests/org/jetbrains/jet/JetTestUtils.java
	compiler/tests/org/jetbrains/jet/codegen/CompileTextTest.java
2012-05-02 13:39:36 +04:00
Evgeny Gerashchenko eeafd06cd8 Got rid of returning empty range list in position strategies (in places where they depend on syntax errors). 2012-05-02 00:11:04 +04:00
Evgeny Gerashchenko abdf34418a Got rid of returning empty range list in position strategies (in places where they don't depend on syntax errors). 2012-05-02 00:11:03 +04:00
Evgeny Gerashchenko 0fd34a455f Added assert in DefaultErrorMessages checking that all error factories have default renderer. 2012-05-02 00:11:02 +04:00
Stepan Koltsov 427afefce4 replace .sure with !! 2012-05-02 00:01:04 +04:00
Stepan Koltsov d5d05d76f3 explictly test codegen with jdk-headers 2012-05-01 23:49:25 +04:00
Stepan Koltsov 5e77ca553c make most codegen tests are indenendent from jdk-headers/stdlib now 2012-05-01 23:49:22 +04:00
Stepan Koltsov 518f50692f kotlin runtime must be added to classpath
(not just to library root)
2012-05-01 23:49:19 +04:00
Stepan Koltsov b109ac5ad4 store CompilerDependencies in JetCoreEnvironment 2012-05-01 22:59:42 +04:00
Stepan Koltsov ba7a94e17d reuse CodegenTestCase in CompileTextTest 2012-05-01 22:59:39 +04:00
Stepan Koltsov c23feab6d1 JetLiteFixture: assign to myEnvironment only once 2012-05-01 22:32:08 +04:00
Stepan Koltsov 0c7401c932 add java.nio.charset.Charset to mock JDK 2012-05-01 21:47:09 +04:00
Stepan Koltsov 58b706c12e Revert "kotlin runtime must be added to classpath" temporarily
This reverts commit 90910cae34.
2012-05-01 21:22:06 +04:00
Stepan Koltsov d71723131d Revert "enhance tests (mostly codegen)" temporarily
This reverts commit 95f9bcbacb.
2012-05-01 21:21:46 +04:00
Stepan Koltsov 035fd686e0 add -ea to runner
we should definitely make asserts unconditional
2012-05-01 19:22:28 +04:00
Stepan Koltsov 67013cbaf5 fix one more error in error diagnostics 2012-05-01 19:21:44 +04:00
Stepan Koltsov 95f9bcbacb enhance tests (mostly codegen)
* drop dependency on stdlib/alt-headers in the most tests
* assign to myEnvironment at most once in JetLiteFixture
* more tests do not compile runtime
2012-05-01 19:11:48 +04:00
Stepan Koltsov 90910cae34 kotlin runtime must be added to classpath
(not just to library root)
2012-05-01 17:39:56 +04:00
Stepan Koltsov 8278ed8aa5 ImportPath.toString 2012-05-01 17:39:51 +04:00
Svetlana Isakova 028be6a696 stdlib change (after KT-1873 might be restored) 2012-05-01 14:58:08 +04:00
Svetlana Isakova 2bd0be5638 reverted: 'A doubtful try to save compilation' (no more needed) 2012-05-01 14:56:34 +04:00
Leonid Shalupov 8e961e00cc delete obsolete readme on maven plugin 2012-04-30 22:52:21 +04:00
Leonid Shalupov 751092e995 cleanup 2012-04-30 21:43:36 +04:00
Leonid Shalupov 09403a1c6b more jarjar rules 2012-04-30 21:00:20 +04:00
Leonid Shalupov 54fa1f9fbc libraries/runtime: copy runtime module sources locally to help IDEA find them 2012-04-30 20:59:52 +04:00
Leonid Shalupov c5e1225f1c libraries: redundant ${project.basedir} 2012-04-30 20:59:16 +04:00
Stepan Koltsov 20833c690e fix ant dist on mac 2012-04-30 19:31:09 +04:00
Svetlana Isakova 823b6733c2 A doubtful try to save compilation 2012-04-30 16:21:17 +04:00
Svetlana Isakova bd3d90499c stdlib tests temporary revert 2012-04-30 15:44:23 +04:00
Svetlana Isakova 9c0eb285e2 back end test for 'variable as function' call case 2012-04-30 15:44:23 +04:00
Svetlana Isakova 09c065b371 usage 'call.getCallElement' instead of 'call.getCalleeExpression' while 'invisible member' error reporting 2012-04-30 15:44:23 +04:00
Svetlana Isakova 36224dd32c ResolutionCandidate's small change 2012-04-30 15:44:23 +04:00
Svetlana Isakova 2870c7980d ResolvedCallImpl needs temporary trace now 2012-04-30 15:44:23 +04:00
Svetlana Isakova c698f791c8 navigate to variable (not to 'invoke' function) while 'variable as function' call resolve 2012-04-30 15:44:22 +04:00
Svetlana Isakova 2654534ede ChainedTemporaryBindingTrace added 2012-04-30 15:44:22 +04:00
Svetlana Isakova a2e11821de resolvedCalls set instead of multiMap stored in ResolutionTask 2012-04-30 15:44:22 +04:00
Svetlana Isakova a8f959fee8 receiver for second ('invoke') call for 'variable as function' call case added to context 2012-04-30 15:44:22 +04:00