85580 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
peter	7bb504d9a1	IDEA-89211 Slow reaction on completion (~2 sec)	2012-07-25 18:19:20 +02:00
irengrig	a5e0528002	Merge remote branch 'origin/master'	2012-07-25 20:10:21 +04:00
irengrig	93da19c320	VCS: correctly put "after update" local history label only after text merge conflicts are resolved ... also wrap merge text conflict actions into commands to be revertable and better presented in local history	2012-07-25 19:56:02 +04:00
Roman Shevchenko	796ee6c253	Cleanup	2012-07-25 17:17:35 +02:00
peter	5bd0e4d437	prefer adjacent words	2012-07-25 17:14:09 +02:00
peter	8a7c395e32	IDEA-87938 Completion: extend 'middle-matching' by '*word*parts*' in completion	2012-07-25 16:58:01 +02:00
peter	ce36c39d5b	tolerate invalid lookup elements (EA-36054)	2012-07-25 16:58:01 +02:00
peter	f4fb982b4a	sometimes the best assertion fix is to remove the assertion (EA-36471)	2012-07-25 16:58:01 +02:00
peter	a4aa089f32	check for file validity (EA-35730)	2012-07-25 16:58:00 +02:00
peter	1a56f4f45d	don't render invalid elements in goto popups (EA-36847)	2012-07-25 16:58:00 +02:00
peter	ffaf18383a	don't query screen location of an invisible lookup (EA-37170)	2012-07-25 16:58:00 +02:00
peter	5a599b5ea4	add read action (EA-37255)	2012-07-25 16:58:00 +02:00
peter	53ce72fc8c	diagnose unexpected character in chained completion (EA-37306)	2012-07-25 16:57:59 +02:00
peter	3b293fb1b8	anything wrong with PsiType's equals/hashCode?	2012-07-25 16:57:59 +02:00
peter	eb4ad10e97	diagnose java file cloned as text (EA-37424)	2012-07-25 16:57:59 +02:00
peter	cefbc4172f	tolerate auto-import terminating completion (EA-37467)	2012-07-25 16:57:59 +02:00
peter	2a210afea6	diagnose offsets (EA-37519)	2012-07-25 16:57:58 +02:00
peter	554c0fa571	assert validity (EA-37586)	2012-07-25 16:57:58 +02:00
peter	d687da9406	diagnose usage search with no targets (EA-37593)	2012-07-25 16:57:58 +02:00
peter	249e38cef2	don't search in invalid elements (EA-37626)	2012-07-25 16:57:57 +02:00
peter	c9715dcedc	EA-37654 no idea why the document has changed during the pass	2012-07-25 16:57:57 +02:00
peter	e34e3149c8	fixed assertion in CopyReferenceAction	2012-07-25 16:57:57 +02:00
Roman Shevchenko	cbd17337b9	Read attributes of a well-hidden file	2012-07-25 16:54:35 +02:00
andrey.zaytsev	2b800cdfdb	breakpoints-ui. some ui changes. don't close dialog on click outside. IDEA-89248 View breakpoints dialog is unusable: class filter dialog — add class pattern	2012-07-25 18:44:40 +04:00
Denis.Zhdanov	394786de9c	IDEA-66333 Quick documentation lookup on mouse hover ... Use matchers in a thread-local manner	2012-07-25 18:27:01 +04:00
Denis.Zhdanov	50597d5583	IDEA-89240 AE at com.intellij.codeInsight.documentation.DockablePopupManager.createToolWindow	2012-07-25 18:27:01 +04:00
Sergey Simonchik	37f796e911	IDEA-89183 Analyze stracktrace should scroll to the top	2012-07-25 18:14:37 +04:00
Kirill Likhodedov	d26941bad0	Custom Show Diff action handlers; implement for Git to fix IDEA-89160. ... * Introduce VcsHistoryProvider#getHistoryDiffHandler and DiffFromHistoryHandler to let VCSs implement custom behavior on "Show Diff" invocation from the file history panel. Return null as default. * Implement the StandardDiffFromHistoryHandler, which completely retains the old functionality. * For Git return the GitDiffFromHistoryHandler which works as usual when comparing two revisions, but has different code when 1 commit is selected, and it is a merge commit. * If a merge commit is selected, show a popup where user can choose the parent commit to compare with. * Additionally, if the file was not actually modified in the merge commit (i.e. the merge happened without any conflicts requiring manual resolution), display a short notification about that to make it clear that the file was not touched in this revision (this solves the confusion problem described in IDEA-89160). * Add information about parents to the GitFileRevision: it is collected in GitHistoryUtils#history anyway.	2012-07-25 17:46:44 +04:00
Denis.Zhdanov	58bed730fa	IDEA-89241 QuickDoc view (ctrl-mouse over): provide descriptions for Pin and Show buttons	2012-07-25 17:36:47 +04:00
Bas Leijdekkers	b2a2f143c2	make intention work on nested try statement without resource lists	2012-07-25 15:35:58 +02:00
Roman Shevchenko	6ea14c95a9	Junction attributes reading test	2012-07-25 15:19:16 +02:00
irengrig	38866971ac	IDEA-62649 SVN Revert: Says "Subversion Rollback" in Progress Window	2012-07-25 17:01:54 +04:00
Denis.Zhdanov	4bd7133a4f	IDEA-89216 Quick Documentation Info (Ctrl+Mouse over): correct the tooltip's width	2012-07-25 16:57:50 +04:00
Denis.Zhdanov	db4bd28783	IDEA-66333 Quick documentation lookup on mouse hover ... Corrected 'mouse moved from the tooltip' algorithm	2012-07-25 16:57:50 +04:00
irengrig	1b36f27a9b	Git: logging in outgoing provider...	2012-07-25 16:56:36 +04:00
Dmitry Trofimov	b6103e0b31	Merge remote-tracking branch 'origin/master'	2012-07-25 13:47:05 +02:00
Evgeny Pasynkov	bb5af0e32b	Merge branch 'master' of git.labs.intellij.net:idea/community	2012-07-25 13:34:11 +02:00
Dmitry Jemerov	0a54cefed1	correctly calculate relative path for packages	2012-07-25 13:27:40 +02:00
Evgeny Gerashchenko	93bc5abbb9	Wrapped stream in CoreLocalVirtualFile with buffered, since simple FileInputStream doesn't support mark/reset.	2012-07-25 15:03:58 +04:00
Roman Shevchenko	382ca7d594	Test plus	2012-07-25 13:00:30 +02:00
Evgeny Pasynkov	c72bb9b43b	Merge branch 'master' of git.labs.intellij.net:idea/community	2012-07-25 12:41:05 +02:00
Dmitry Avdeev	de4dec0ae5	RunConfigurable: "Share" option moved next to "Name" field	2012-07-25 14:24:58 +04:00
Dmitry Avdeev	289a6a9b6c	some space added	2012-07-25 14:24:57 +04:00
Evgeny Pasynkov	f6f0002a06	Merge branch 'master' into upsource-master	2012-07-25 12:15:47 +02:00
Evgeny Pasynkov	8cdaaee00d	move PsiShortNamesCache to java-indexing	2012-07-25 12:10:51 +02:00
peter	7740567b1e	show progress window in the same modality state it was started (IDEA-88788)	2012-07-25 11:06:15 +02:00
peter	ad5e700fad	IDEA-89217 Completion doesn't suggests constants inside annotation array	2012-07-25 11:06:15 +02:00
peter	2e571948ab	IDEA-88179 Allow to switch off completion item selection by typing dot, space etc.	2012-07-25 11:06:15 +02:00
Yuri Denison	6a39c45c4b	#RUBY-11649 fixed	2012-07-25 12:24:28 +04:00
Andrey Vokin	27b9fc66d3	Some useful test methods moved from ruby-tests to common test frameworks	2012-07-25 11:07:05 +04:00