171598 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anna.Kozlova	c9f72daaff	push down: preserve @Override if keep abstract was selected (IDEA-155600)	2016-05-04 20:18:45 +02:00
Anna.Kozlova	1a70d8bcbd	push down: apply javadoc settings when keep abstract (IDEA-155596)	2016-05-04 20:18:45 +02:00
Anna.Kozlova	efa0c5c53b	push down: show conflict if method already exist in target class when super signature was generics (IDEA-155578)	2016-05-04 20:18:45 +02:00
Anna.Kozlova	5965c21f44	push down/pull up: ensure raw substitutor correctly erase types in the target class (IDEA-155581)	2016-05-04 20:18:45 +02:00
Anna.Kozlova	da211b4083	NPE (IDEA-155586)	2016-05-04 20:18:45 +02:00
Anna.Kozlova	3042cbb344	push down: order abstract/default/static (IDEA-148492)	2016-05-04 20:18:45 +02:00
Gregory.Shrago	a0bd5aa11a	GPUB: replace variants with name for predicates	2016-05-04 21:16:49 +03:00
Gregory.Shrago	50b2d3c8bb	MockApplication-based tests should fail sometimes, right?	2016-05-04 20:41:37 +03:00
Kirill Likhodedov	97cd06bfc6	Clarify the deprecation method & remove the method which is not used in plugins	2016-05-04 19:59:26 +03:00
Kirill Likhodedov	b4cdeed35f	invokeLater if needed	2016-05-04 19:14:29 +03:00
Kirill Likhodedov	86f0c3edb9	Prefer onSuccess() to invokeLater in run()	2016-05-04 19:12:46 +03:00
Dmitry Trofimov	62b0b38993	Merge branch 'master' of git.labs.intellij.net:idea/community	2016-05-04 18:01:35 +02:00
Vladimir Krivosheev	32a02359e9	cleanup	2016-05-04 17:32:16 +02:00
Vladimir Krivosheev	d3b97f3a79	convert LazyVariablesGroup to kotlin	2016-05-04 17:32:16 +02:00
Vladimir Krivosheev	165272e347	convert LazyVariablesGroup to kotlin	2016-05-04 17:32:16 +02:00
Vladimir Krivosheev	5b1d110084	remove js.debugger.v8.lazy.compilation flag	2016-05-04 17:32:16 +02:00
peter	59e086aa88	add clarifying comments around JavaResolveUtil.getContextClass	2016-05-04 17:26:32 +02:00
Sergey Simonchik	a1bb1795a3	get rid of empty space when a smaller tab selected	2016-05-04 18:25:17 +03:00
Denis Fokin	e256589755	IDEA-147388 Font spacing and boldness in Idea 15 on OSX	2016-05-04 18:04:42 +03:00
Aleksey Pivovarov	39c8cd9b1a	IDEA-81819 merge: add option to automatically apply non-conflicted changes at the resolve beginning	2016-05-04 17:10:32 +03:00
Aleksey Pivovarov	edd18c5673	diff: rename settings configurable	2016-05-04 16:58:54 +03:00
Vassiliy.Kudryashov	c9c12b43cb	IDEA-143366 Preserve bookmarks when line is moved	2016-05-04 16:23:02 +03:00
Anna.Kozlova	f3297a4757	testdata fixed	2016-05-04 15:10:39 +02:00
Anna.Kozlova	61651cb8f3	usage view: exclude invalid files from read-only check	2016-05-04 15:10:39 +02:00
Egor.Ushakov	8049e1c09a	IDEA-155569 Source code does not match appears when the other thread hits a breakpoint	2016-05-04 15:49:36 +03:00
Maxim.Mossienko	2afb1ceb4f	logging cleanup	2016-05-04 14:43:23 +02:00
Pavel Dolgov	669c1114df	Javafx: Simplify properties search and renaming in FXML. Fix NPE (IDEA-105038, IDEA-105231)	2016-05-04 15:28:06 +03:00
Eugene Zhuravlev	f6e393fd4d	licensing: connection via authenticated proxy supported (IDEA-149370)	2016-05-04 14:26:04 +02:00
Anna.Kozlova	d2c8eba5a6	create parameter from usage: invokeLater for tests same as normal case (to avoid refactoring start from write action)	2016-05-04 13:47:03 +02:00
Anna.Kozlova	0da5a0cefd	replace code duplicates: move change signature out of write action	2016-05-04 13:47:03 +02:00
Anna.Kozlova	9b9a8d4051	extract method: shorten qualified names for new return type (IDEA-155518)	2016-05-04 13:47:03 +02:00
Sergey Ignatov	4a82c5f5d0	cleanup	2016-05-04 14:37:21 +03:00
Sergey Ignatov	03b3b19e98	move maven importing tests to the MAVEN_INTEGRATION_TESTS group	2016-05-04 14:37:21 +03:00
Aleksey Pivovarov	6fe346e6ec	IDEA-154620 ui: fix handling of shortcuts with second stroke for local actions ... We need `myFoundComponent` to survive till the next action event, because is is used to find local actions (registered with `registerWithCustomShortcutSet`) in `inSecondStrokeInProgressState`. It is a WeakReference, so this will not cause memory leaks. It was broken in 9b6176d	2016-05-04 14:24:01 +03:00
Aleksey Pivovarov	d63fd6a751	IDEA-75002 merge: allow to assign shortcuts to actions ... * fix action titles - capitalisation, wording	2016-05-04 14:24:01 +03:00
Mikhail Golubev	d36f47ddd7	PY-18970 Check that imports in "project" group don't belong to any library root ... Consider such imports as imports from the standard library or third party libraries instead.	2016-05-04 14:12:10 +03:00
Anna.Kozlova	ade5d0605f	method refs: don't highlight new as constructor call (IDEA-155547)	2016-05-04 12:12:33 +02:00
Aleksey Pivovarov	ba16400102	IDEA-155526 diff: reuse single ActionToolbar instance in DiffRequestProcessor	2016-05-04 13:00:09 +03:00
Dmitry Avdeev	bf4ca8d28a	Merge remote-tracking branch 'origin/master'	2016-05-04 12:22:39 +03:00
Anna.Kozlova	7fb3086dc5	assignability to primitive: check type parameter bounds if applicable (IDEA-155551)	2016-05-04 11:09:25 +02:00
Aleksey Pivovarov	1b6a531c15	ui: fix blinking background on switching between tabs in toolwindow	2016-05-04 11:49:24 +03:00
peter	754991afe4	use app invokeAndWait in SaveProjectAsTemplateAction	2016-05-04 10:20:11 +02:00
peter	989a78499a	clear completion copy cache on file rename	2016-05-04 10:20:11 +02:00
peter	da18fc6bf5	perform interactive text replace inside a transaction	2016-05-04 10:20:10 +02:00
peter	79c1c58f34	todo index cleanup	2016-05-04 10:20:10 +02:00
Sergey Simonchik	0b1d9888f7	use JBUI utility methods to simplify code (IDEA-CR-10241)	2016-05-04 10:36:26 +03:00
Dmitry Batkovich	c4a85f3978	cleanup	2016-05-04 09:39:25 +03:00
Maxim.Mossienko	8b5734173a	serialize keys before calling append	2016-05-03 23:35:41 +02:00
Maxim.Mossienko	d1bf2168e2	handle runtime exception same way as ioexception when we reinitialize index storage with clear (IDEA-152960)	2016-05-03 23:20:52 +02:00
peter	0eb5e619ef	use app invokeAndWait in tests by default	2016-05-03 23:02:48 +02:00