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

..

completion

Smart completion: more correct Tab key handling

2014-05-07 22:50:20 +04:00

editorActions

Idea 138: Update to Idea 138.515

2014-06-20 17:14:28 +04:00

hint

Use HintManager instead of JBPopupFactory to notify of intention failure

2014-05-22 15:48:01 +04:00

intention

Intention "Convert to expression body"

2014-01-23 18:50:26 +04:00

lookup

Smart completion: special items with "!!" and "?:" for nullable members

2014-04-21 22:14:20 +04:00

navigation

Add tests for EA-52767 and KT-4366: "java.lang.IllegalArgumentException: Could not find a classifier for "...

2014-01-15 22:01:03 +04:00

template

Smart completion: lambda item uses template to allow change parameter names

2014-04-21 22:06:15 +04:00

annotations.xml

Shorten References: Do not optimize imports until shortening is finished

2014-06-23 19:32:27 +04:00