peter 4dd1c9f772 Merge branch 'master' into sort ...

Conflicts:
	platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java

2011-02-15 21:25:18 +01:00

..

completeStatement

IDEA-25139: Proper caret placement for methods, if "next line" brace style is in use.

2011-01-24 16:12:07 +03:00

completion

items that are prefixes of other items should go first

2011-02-14 21:21:32 +01:00

convertToBasicLatin

…

createSubclass/generics

…

daemonCodeAnalyzer

Multi-catch support: resolve to fields

2011-02-15 21:11:44 +01:00

folding

IDEA-63303 Collapsing of multiline //-style comment feature request

2011-01-17 15:51:25 +03:00

generateConstructor

do not generate protected constructors for enums (IDEA-53086)

2010-11-15 13:17:35 +03:00

generateJavadoc

…

invertIfCondition

invert if: do not skip returns as they may contain valuable info (IDEA-61892)

2010-12-22 22:25:20 +03:00

javadocIG

fix JavaDocInfoGeneratorTest

2010-11-25 17:47:40 +03:00

nullityinferrer

infer nullity: skip () and type casts correctly (IDEA-64419)

2011-01-20 18:51:34 +01:00

slice

…

splitIfAction

split if: actually forbid splitting when different operations are on the left of binary expr (IDEA-64877)

2011-02-02 18:07:59 +01:00

underscoresInLiterals

Insert/remove underscores intentions

2011-02-08 12:20:57 +01:00