141529 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anna Kozlova	bba30278f9	method refs: fix variable initializing order (IDEA-132445)	2014-11-06 19:11:29 +01:00
Anna Kozlova	51262ecf74	fix empty dialog	2014-11-06 19:11:28 +01:00
Vladimir Krivosheev	628862ec4f	notnull	2014-11-06 18:55:17 +01:00
Roman Shevchenko	24256c47ec	IDEA-CR-880 (utility method used)	2014-11-06 18:45:33 +01:00
Roman Shevchenko	a0e730b2b6	Merge remote-tracking branch 'origin/master'	2014-11-06 18:01:45 +01:00
Roman Shevchenko	4e851eaffb	IDEA-132440 (more straightforward element lookup)	2014-11-06 18:00:38 +01:00
nik	111e2b3915	external build: tolerate invalid run configurations produced by 'gradle idea' task (IDEA-132120)	2014-11-06 19:51:36 +03:00
Roman Shevchenko	72093f557c	IDEA-132440 (quick fix corrected; cleanup)	2014-11-06 17:11:57 +01:00
Vladimir Krivosheev	0443b40293	AppletConfiguration — don't save defaults — get rid of "module"	2014-11-06 17:11:08 +01:00
Vladimir Krivosheev	521d9ce235	cleanup	2014-11-06 17:11:07 +01:00
Vladimir Krivosheev	0b30ac5a87	add toString to simplify debug	2014-11-06 17:11:07 +01:00
Vladimir Krivosheev	05688e0d4d	revert "use THashMap by default"	2014-11-06 17:11:06 +01:00
Vladimir Krivosheev	03d208ed88	use SmartList/THashMap by default	2014-11-06 17:11:06 +01:00
peter	ad398fa228	FileIndex.*source* javadoc should say that it accounts for both production and tests	2014-11-06 17:05:24 +01:00
Alexander Marchuk	8c373fae76	fix slicing for 1d	2014-11-06 19:03:37 +03:00
Alexander Marchuk	6db4766e9f	Merge remote-tracking branch 'origin/master'	2014-11-06 18:55:00 +03:00
Alexander Marchuk	9848142104	Merge remote-tracking branch 'origin/master'	2014-11-06 18:51:22 +03:00
Dmitry Avdeev	683301ebaf	IDEA-132332 Open Task Hangs if submitted too quickly	2014-11-06 18:48:25 +03:00
Dmitry Avdeev	83bf1e448b	typo	2014-11-06 18:48:24 +03:00
Alexander Marchuk	508aef9319	Merge remote-tracking branch 'origin/master' ... Conflicts: python/helpers/pydev/pydevd_comm.py	2014-11-06 18:37:31 +03:00
Roman Shevchenko	7f5aff2c9b	IDEA-132440 (tests updated)	2014-11-06 16:36:28 +01:00
Kirill Likhodedov	e0987e2379	Revert "[git] IDEA-132265 Don't send update event on repository initialization" ... This breaks GitBranchWidget, because it doesn't update its state on start. There is no good enough fix for the problem until the GitRepositoryManager is fixed and become more synchonous in terms of getting repository for root (IDEA-132330)	2014-11-06 18:20:16 +03:00
Kirill Likhodedov	74568115d0	[git] IDEA-132502 Set all elements at once to avoid too many table change events	2014-11-06 18:20:15 +03:00
Kirill Likhodedov	6f93511ef8	[git] IDEA-132492 Don't show origin/HEAD in log + test ... + add a test for this to GitRepositoryReaderTest, although GitRepositoryReader behaves correctly.	2014-11-06 18:20:15 +03:00
Kirill Likhodedov	4e197ef308	cleanup: remove unused methods	2014-11-06 18:20:15 +03:00
Kirill Likhodedov	b2e4365834	[git] IDEA-130702 Don't spam "No remote found with name" & simplify	2014-11-06 18:20:14 +03:00
Kirill Likhodedov	30f65070cb	[git] Don't spam "Couldn't find branch with name" & simplify ... Although it might indicate an inconsistency in our data structures, it can also be a valid situation, e.g. when branch was removes, but the record from .git/config wasn't removed.	2014-11-06 18:20:14 +03:00
Kirill Likhodedov	af18624b89	[git] cleanup	2014-11-06 18:20:13 +03:00
Kirill Likhodedov	251687c3a0	[git] don't take write action for saveAllDocuments: it is taken inside	2014-11-06 18:20:13 +03:00
Dmitry Trofimov	a5cd5e8b21	Merge remote-tracking branch 'origin/master'	2014-11-06 15:57:18 +01:00
Dmitry Trofimov	d8407af5da	Fix reslice and reformat on enter.	2014-11-06 15:55:48 +01:00
Aleksey Pivovarov	3957c0168f	diff: gutter - allow to specify border color ... * unify default and 'smart' painting * fix NPE: color could be null (checkbox in config disabled -> null)	2014-11-06 17:39:28 +03:00
Andrey Vlasovskikh	566fd92995	Merge remote-tracking branch 'origin/master'	2014-11-06 17:38:23 +03:00
Anna Kozlova	237f36c3ed	functional expressions search: process all files with ->/:: as there are about 400 methods in jdk with type parameter as parameter type which all should be processed on each functional expression search (IDEA-132407)	2014-11-06 15:29:58 +01:00
Anna Kozlova	a1c6a7e861	show definition optimization: do not load psi for anonymouses when possible	2014-11-06 15:29:56 +01:00
Sergey Simonchik	267153f4e3	json: don't warn about comments in .eslintrc files (compliance level for JSON can be configured now)	2014-11-06 17:22:42 +03:00
Andrey Vlasovskikh	ec0b1505c7	Merge branch 'python-fixes'	2014-11-06 17:17:52 +03:00
Konstantin Bulenkov	dc6e69073e	Merge remote-tracking branch 'origin/master'	2014-11-06 15:14:24 +01:00
Konstantin Bulenkov	4e66e187f8	Rollback JBColor wraps	2014-11-06 15:13:07 +01:00
Vladimir.Orlov	30e02887f7	Merge remote-tracking branch 'origin/master'	2014-11-06 17:11:58 +03:00
Vladimir.Orlov	b42c4c7b12	added artifact without jdk bundled for Mac for PyCharm EDU.	2014-11-06 17:08:01 +03:00
Andrey Vlasovskikh	20a75c4842	Fixed completion for 'from <namespace-package>.<submodule>' (PY-6477)	2014-11-06 17:07:05 +03:00
Ekaterina Tuzova	588b72bbb5	Merge remote-tracking branch 'origin/master'	2014-11-06 16:58:25 +03:00
Ekaterina Tuzova	14bf4ccd40	speed up python class rename (restricted search scope for __init__)	2014-11-06 16:57:57 +03:00
Dmitry Trofimov	aad84a8339	Merge remote-tracking branch 'origin/master'	2014-11-06 14:53:12 +01:00
Maxim.Mossienko	660d0e796b	extra care for possible NPE during matching PsiClass implementations with null qname	2014-11-06 14:51:22 +01:00
Dmitry Trofimov	406f1596c8	Merge remote-tracking branch 'origin/master'	2014-11-06 14:48:23 +01:00
Dmitry Trofimov	c4a5dcfdfc	Revert method rename for compatibility.	2014-11-06 14:46:41 +01:00
Andrey Vlasovskikh	7a41605678	Fixed completion for 'import <namespace-package>.<submodule>' (PY-5422, PY-3770, PY-10354)	2014-11-06 16:43:21 +03:00
Roman Shevchenko	1232d9e230	Cleanup (warnings; typos; formatting)	2014-11-06 14:29:47 +01:00