94777 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anna Kozlova	76fd58b48c	dataflow: do not treat fields with qualified this as effectively unqualified (IDEA-99722)	2013-01-25 16:11:35 +04:00
Anna Kozlova	6691f6e7f9	silly assignment: false positive (IDEA-99722)	2013-01-25 16:11:34 +04:00
Alexander Lobas	fc2d65c9d9	Visual Editing	2013-01-25 16:09:00 +04:00
irengrig	76b4d9de98	Merge remote branch 'origin/master'	2013-01-25 16:00:02 +04:00
irengrig	447a904ec0	IDEA-99783 Git log: for performance reasons, do not show stashed commits in git log	2013-01-25 15:58:01 +04:00
Dennis Ushakov	b877514cc1	deprecated method	2013-01-25 15:48:12 +04:00
Kirill Likhodedov	d6e1af112f	[git] Improve notification if exception happens during collecting of unmerged files	2013-01-25 15:45:24 +04:00
Kirill Likhodedov	af6dd71870	[git] Don't add startFailed exception stack trace into the error output ... Use a separate field of GitCommandResult for that.	2013-01-25 15:45:23 +04:00
Nadya.Zabrodina	0dd09f7ad9	IDEA-81214 Conflict Resolver confusion with Mercurial bug fixed ... * If we have merge in progress, which means we have 2 heads (parents), so the revision with greater revision number (not the second one ) is "their" revision pulled from the parent repo, and the revision with lesser revision number (not always first) is the local change.	2013-01-25 15:41:13 +04:00
irengrig	5aac76a59a	IDEA-99689 Fix tooltip on the Git log panel	2013-01-25 15:31:53 +04:00
irengrig	7347cb8b60	Merge remote branch 'origin/master'	2013-01-25 15:28:23 +04:00
irengrig	74789c70bd	IDEA-99614 Changes log graph starts hilighted	2013-01-25 15:25:45 +04:00
Dmitry Avdeev	cd69756ef2	handling non-smart aware editors	2013-01-25 15:02:50 +04:00
Dmitry Avdeev	9a932c4c5e	javadoc	2013-01-25 15:02:49 +04:00
Kirill Likhodedov	2fd9ff7ab9	[vcs] IDEA-93399 Don't show message about invalid executable more than once ... * Use NotificationManager#getNotificationsOfType & custom Notification type to check if notification has already been shown. (it will be re-shown if event log has been cleared) * Make invalid executable notification STICKY_BALLOON by default: since we show it only once it should be visible. * Some minor reformatting & notnulls in ExecutableValidator. Additional fixes not to show the notification twice in certain situations. * HgErrorUtil#isAuthorizationError: if result is null, don't treat it as auth error. * Don't throw VcsException from GitHistoryUtils#history. Supply the exceptionConsumer instead. Don't continue gathering history if exception has happened.	2013-01-25 14:54:17 +04:00
irengrig	38b758bf02	Merge remote branch 'origin/master'	2013-01-25 14:47:40 +04:00
Max Medvedev	ab94c45b40	Hanging inspections: remove test sources from source roots of Groovy library.	2013-01-25 14:39:31 +04:00
Anna Kozlova	2748587cd6	restore module choice for analyze actions (IDEA-99650)	2013-01-25 14:23:12 +04:00
irengrig	0f26da94e5	Merge remote branch 'origin/master'	2013-01-25 14:19:26 +04:00
Rustam Vishnyakov	db7f7b6b63	Added editor parameter for external annotator	2013-01-25 13:47:58 +04:00
Konstantin Bulenkov	154430499d	EA-447864	2013-01-25 10:31:43 +01:00
Maxim.Mossienko	45c215700b	avoid tree.hasFocus calculation at all, we have hasFocus passed to renderer	2013-01-25 10:25:05 +01:00
Alexey Kudravtsev	77ec290f5a	annotations	2013-01-25 13:16:12 +04:00
Alexey Kudravtsev	2836d3981d	cleanup, notnull	2013-01-25 13:16:12 +04:00
Alexey Kudravtsev	546c0b1d46	unmappable characters warning	2013-01-25 13:16:11 +04:00
Anna Kozlova	d9b9ee6490	javafx: move around	2013-01-25 12:36:03 +04:00
Anna Kozlova	14675bb8eb	javafx: add single imports for unresolved tags	2013-01-25 12:36:02 +04:00
Max Medvedev	0c0b1bac6d	IDEA-99690 Groovy: introduce variable should remember if I use explicit type	2013-01-25 12:21:02 +04:00
Max Medvedev	110e76acf7	EA-42128 - NPE: GrMapType.getInternalCanonicalText	2013-01-25 12:21:01 +04:00
Max Medvedev	68209019ea	IDEA-99527 @Immutable forces field to be final	2013-01-25 12:21:01 +04:00
Max Medvedev	085c4fdd4b	IDEA-99470 literal constructors can have named args	2013-01-25 12:21:00 +04:00
Roman Shevchenko	113b4bf902	Noise reduction	2013-01-25 12:15:43 +04:00
Roman Shevchenko	28b46c87bb	More cases in message box test action	2013-01-25 12:15:43 +04:00
Kirill Likhodedov	32e7753a38	[git] reduce logging noise ... This is actually a valid situation to request GitRepositoryManager#getRepositoryForFile for non-Git files. Can be used, for instance, in #update() of Git-only actions to check if the action should be visible at all (when it is under Svn, for instance).	2013-01-25 12:14:17 +04:00
Kirill Likhodedov	b3f3a96c1e	[git] cleanup, null annotations	2013-01-25 12:11:19 +04:00
Gregory.Shrago	c488222e7f	JPA roles cache stability	2013-01-25 02:35:15 +04:00
peter	5f21c0a5a6	a better fix for tests	2013-01-24 23:01:21 +01:00
kirill.safonov	e0d9d6ced9	IDEA-99699 Exception	2013-01-25 01:57:17 +04:00
peter	cd36b37032	fix tests	2013-01-24 22:55:30 +01:00
Eugene Zhuravlev	c6422aad80	resource builders make use of target root filters	2013-01-24 21:23:11 +01:00
Dmitry Trofimov	a4a2a1f5f3	Merge remote-tracking branch 'origin/master'	2013-01-24 21:10:05 +01:00
Dmitry Trofimov	55da56427e	Fixed host selector.	2013-01-24 21:09:30 +01:00
Konstantin Bulenkov	53a8ef1073	IDEA-99732 Evaluate Expression combo box editor selects text each time I press Enter	2013-01-24 21:00:02 +01:00
peter	5bc6f013d5	no passingObjectToItself heuristic in basic completion	2013-01-24 20:37:36 +01:00
Konstantin Bulenkov	2a4083c729	retina/darcula icons	2013-01-24 18:55:21 +01:00
Dmitry Trofimov	6b509ee9d7	Merge remote-tracking branch 'origin/master' ... Conflicts: platform/platform-resources/src/META-INF/LangExtensions.xml	2013-01-24 18:48:40 +01:00
Anna Kozlova	f658544666	javafx: completion of class tags: insert import if needed	2013-01-24 21:18:52 +04:00
Anna Kozlova	f5abe71123	rename: do not qualify refs to fields with this in static context	2013-01-24 21:18:51 +04:00
Anna Kozlova	5379de1358	javafx: default property	2013-01-24 21:18:50 +04:00
peter	a3c90e3197	IDEA-99217 Next field feature	2013-01-24 18:01:42 +01:00