Evgeny Gerashchenko af9f00c177 Merge branch 'decompiler' ...

Conflicts:
	compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
	compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java
	compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java

2012-03-14 14:50:04 +04:00

..

checker

KT-1002 If there's no return in function highlight only last token but not last statement

2012-03-09 12:20:10 +04:00

codeInsight/overrideImplement

KT-1378 Code formatting: spaces around ':'

2012-03-01 21:18:37 +04:00

completion

Completion for top-level functions from class and jar files.

2012-03-11 16:54:06 +04:00

formatter

Activate "around operators" space properties. Remove other from settings

2012-03-12 17:43:29 +04:00

javaFacade

missed shift

2011-12-23 19:51:25 +03:00

libraries

Merge branch 'decompiler'

2012-03-14 14:50:04 +04:00

parameterInfo/functionParameterInfo

Fixed JetFunctionParameterInfoTest. Replaced Int with jet.Int, Boolean with jet.Boolean, etc in test data.

2012-03-12 16:21:17 +04:00

quickfix

Start working with spaces:

2012-03-11 22:11:55 +04:00

refactoring

Fix test - avoid file renaming for now

2012-02-24 15:06:27 +04:00

resolve

KT-763 Ctrl click failed on unresolved reference

2012-01-11 19:32:30 +04:00

templates

Added file templates for new class/trait/enum.

2012-02-16 20:25:29 +04:00

wordSelection

Added test for selection of when entries.

2012-02-27 12:28:47 +04:00