idea/community.git
6 years agoMerge branch 'nz/shared_shelf'
Nadya Zabrodina [Mon, 17 Aug 2015 16:39:55 +0000 (19:39 +0300)]
Merge branch 'nz/shared_shelf'

Conflicts:
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CompoundShelfFileProcessor.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java

6 years ago[MQ]: save possible reordering etc before editing names
Nadya Zabrodina [Sun, 16 Aug 2015 22:05:28 +0000 (01:05 +0300)]
[MQ]: save possible reordering etc before editing names

6 years agofix possible NPE if we remove test trace phpstorm/142.4066
Maxim.Mossienko [Mon, 17 Aug 2015 11:10:39 +0000 (13:10 +0200)]
fix possible NPE if we remove test trace

6 years agoIG: less duplication
Bas Leijdekkers [Mon, 17 Aug 2015 10:52:23 +0000 (12:52 +0200)]
IG: less duplication

6 years agoIPP: remove incorrect comment
Bas Leijdekkers [Sat, 15 Aug 2015 19:59:22 +0000 (21:59 +0200)]
IPP: remove incorrect comment

6 years agoMerge remote-tracking branch 'origin/master'
Roman Shevchenko [Mon, 17 Aug 2015 10:40:34 +0000 (12:40 +0200)]
Merge remote-tracking branch 'origin/master'

6 years ago[test framework] configures test logger to use a single file appender
Roman Shevchenko [Mon, 17 Aug 2015 10:25:53 +0000 (12:25 +0200)]
[test framework] configures test logger to use a single file appender

6 years agoJavaKeywordCompletion cleanup
peter [Mon, 17 Aug 2015 09:01:30 +0000 (11:01 +0200)]
JavaKeywordCompletion cleanup

6 years agorename JavaCompletionData -> JavaKeywordCompletion
peter [Mon, 17 Aug 2015 08:40:45 +0000 (10:40 +0200)]
rename JavaCompletionData -> JavaKeywordCompletion

6 years agodon't use CompletionData in java
peter [Mon, 17 Aug 2015 08:37:18 +0000 (10:37 +0200)]
don't use CompletionData in java

6 years agoget rid of Java15CompletionData and Java18CompletionData
peter [Mon, 17 Aug 2015 08:16:48 +0000 (10:16 +0200)]
get rid of Java15CompletionData and Java18CompletionData

6 years agoadd CompletionResult.toString
peter [Mon, 17 Aug 2015 08:08:30 +0000 (10:08 +0200)]
add CompletionResult.toString

6 years agojava completion: rewrite throws/default keyword suggestions in methods
peter [Mon, 17 Aug 2015 07:28:52 +0000 (09:28 +0200)]
java completion: rewrite throws/default keyword suggestions in methods

6 years agojava completion: rewrite else/catch/finally keyword suggestions, add tests
peter [Mon, 17 Aug 2015 07:06:23 +0000 (09:06 +0200)]
java completion: rewrite else/catch/finally keyword suggestions, add tests

6 years agoJavaCompletionData: cleanup and modularize
peter [Mon, 17 Aug 2015 06:25:22 +0000 (08:25 +0200)]
JavaCompletionData: cleanup and modularize

6 years agoprevent UncommittedInfo leaks in tests appcode/142.4064 clion/142.4062 dbe/142.4058 idea/142.4059 phpstorm/142.4061 pycharm/142.4063 rubymine/142.4060 webstorm/142.4057
peter [Sun, 16 Aug 2015 20:33:47 +0000 (22:33 +0200)]
prevent UncommittedInfo leaks in tests

6 years agoallow bg mode when deleting unversioned files (EA-71829 - Throwable: DumbServiceImpl...
peter [Sun, 16 Aug 2015 20:20:00 +0000 (22:20 +0200)]
allow bg mode when deleting unversioned files (EA-71829 - Throwable: DumbServiceImpl.scheduleCacheUpdate)

6 years agoallow modal dumb mode in file chooser (EA-71872 - Throwable: RefreshSessionImpl....
peter [Sun, 16 Aug 2015 20:04:40 +0000 (22:04 +0200)]
allow modal dumb mode in file chooser (EA-71872 - Throwable: RefreshSessionImpl.<init>)

6 years agocorrect LookupElementDecorator.isValid (EA-71871 - ISE: LookupItem.getObject)
peter [Sun, 16 Aug 2015 20:02:17 +0000 (22:02 +0200)]
correct LookupElementDecorator.isValid (EA-71871 - ISE: LookupItem.getObject)

6 years agosmart pointers should survive on DocumentEx.moveText
peter [Sun, 16 Aug 2015 16:12:40 +0000 (18:12 +0200)]
smart pointers should survive on DocumentEx.moveText

6 years agosupport smart range pointers for non-physical files
peter [Sun, 16 Aug 2015 16:04:19 +0000 (18:04 +0200)]
support smart range pointers for non-physical files

6 years agofix Collections.emptyMap not being suggested in completion if jdk8 is used
peter [Sun, 16 Aug 2015 15:06:49 +0000 (17:06 +0200)]
fix Collections.emptyMap not being suggested in completion if jdk8 is used

6 years agoinfer method type arguments from context in basic completion
peter [Sun, 16 Aug 2015 14:25:44 +0000 (16:25 +0200)]
infer method type arguments from context in basic completion

6 years agodon't apply document changes when there are no smart pointers in a file
peter [Sun, 16 Aug 2015 13:34:24 +0000 (15:34 +0200)]
don't apply document changes when there are no smart pointers in a file

6 years agoOC-11982 Navigate from Objective-C to Swift derived methods and classes (review) appcode/142.4045 appcode/142.4051 appcode/142.4053 clion/142.4047 clion/142.4050 clion/142.4052 dbe/142.4041 idea/142.4042 phpstorm/142.4044 phpstorm/142.4049 pycharm/142.4046 rubymine/142.4043 webstorm/142.4040
Alexander Lobas [Sat, 15 Aug 2015 19:47:45 +0000 (22:47 +0300)]
OC-11982 Navigate from Objective-C to Swift derived methods and classes (review)

6 years agowhen really overriding up / down action do not call default handler clion/142.4038
Maxim.Mossienko [Sat, 15 Aug 2015 14:43:57 +0000 (16:43 +0200)]
when really overriding up / down action do not call default handler

6 years agoAnother hash function for duplicates (IDEA-143730)
Maxim.Mossienko [Fri, 14 Aug 2015 09:49:41 +0000 (11:49 +0200)]
Another hash function for duplicates (IDEA-143730)

6 years ago[git] Make GitPushSource public to let it available from plugins
Kirill Likhodedov [Sat, 15 Aug 2015 12:42:49 +0000 (15:42 +0300)]
[git] Make GitPushSource public to let it available from plugins

6 years agojavadoc for DialogWrapper#showAndGet
Kirill Likhodedov [Sat, 15 Aug 2015 12:37:41 +0000 (15:37 +0300)]
javadoc for DialogWrapper#showAndGet

Based on the PR #293 by Kendos-Kenlen.

6 years agodisarm test appcode/142.4037 clion/142.4035 phpstorm/142.4036
Valentin Fondaratov [Sat, 15 Aug 2015 10:34:56 +0000 (13:34 +0300)]
disarm test

6 years agovfs: avoid unnecessary validity checks in getId()
peter [Sat, 15 Aug 2015 09:45:54 +0000 (11:45 +0200)]
vfs: avoid unnecessary validity checks in getId()

6 years agoSelfElementInfo: cache frequently called *DocumentManager.getInstance
peter [Sat, 15 Aug 2015 09:23:15 +0000 (11:23 +0200)]
SelfElementInfo: cache frequently called *DocumentManager.getInstance

6 years agoManualRangeMarker: really honor surviveOnExternalChange, add getMarkerCount
peter [Sat, 15 Aug 2015 09:12:56 +0000 (11:12 +0200)]
ManualRangeMarker: really honor surviveOnExternalChange, add getMarkerCount

6 years agoManualRangeMarker: honor surviveOnExternalChange appcode/142.4034 clion/142.4033
peter [Sat, 15 Aug 2015 08:17:39 +0000 (10:17 +0200)]
ManualRangeMarker: honor surviveOnExternalChange

6 years agocache MarkerCache
peter [Sat, 15 Aug 2015 08:00:47 +0000 (10:00 +0200)]
cache MarkerCache

6 years agologRefreshWorker writeability handling (debugging p4 tests)
peter [Sat, 15 Aug 2015 07:59:55 +0000 (09:59 +0200)]
logRefreshWorker writeability handling (debugging p4 tests)

6 years agoIG: fix lastStatementIsCallToMethodWithAssertion() logic appcode/142.4031 dbe/142.4027 phpstorm/142.4028 pycharm/142.4029 rubymine/142.4026 webstorm/142.4024
Bas Leijdekkers [Fri, 14 Aug 2015 21:07:27 +0000 (23:07 +0200)]
IG: fix lastStatementIsCallToMethodWithAssertion() logic

6 years agoIG: less duplication
Bas Leijdekkers [Fri, 14 Aug 2015 06:22:05 +0000 (08:22 +0200)]
IG: less duplication

6 years agomake IG test light
Bas Leijdekkers [Sun, 9 Aug 2015 20:21:12 +0000 (22:21 +0200)]
make IG test light

6 years agoEA-71836 LightClassReference.getResolveScope shouln't return null
peter [Fri, 14 Aug 2015 19:45:34 +0000 (21:45 +0200)]
EA-71836 LightClassReference.getResolveScope shouln't return null

6 years agoMarkerCache: use typed unboxed RangeKey instead of untyped boxed Trinity
peter [Fri, 14 Aug 2015 19:29:38 +0000 (21:29 +0200)]
MarkerCache: use typed unboxed RangeKey instead of untyped boxed Trinity

6 years agouse textMatches instead of getText in injection consistency checks
peter [Fri, 14 Aug 2015 19:21:30 +0000 (21:21 +0200)]
use textMatches instead of getText in injection consistency checks

6 years agogive internal injected PSI operations names so that we don't waste time creating...
peter [Fri, 14 Aug 2015 19:07:10 +0000 (21:07 +0200)]
give internal injected PSI operations names so that we don't waste time creating Throwable for them

6 years agoget rid of yellow code in JavaDocInfoGenerator and test
Dmitry Batrak [Fri, 14 Aug 2015 18:15:25 +0000 (21:15 +0300)]
get rid of yellow code in JavaDocInfoGenerator and test

6 years agoIDEA-142516 QuickDocs are missing generic parameters
Dmitry Batrak [Fri, 14 Aug 2015 18:02:48 +0000 (21:02 +0300)]
IDEA-142516 QuickDocs are missing generic parameters

6 years agoI18nQuickFixDialog expanded to deal with xml properties files IDEA-143926
Dmitry Batkovich [Fri, 14 Aug 2015 17:57:44 +0000 (20:57 +0300)]
I18nQuickFixDialog expanded to deal with xml properties files IDEA-143926

6 years agoreplace duplicates on extract method with signature change: use folded values if...
Anna Kozlova [Thu, 13 Aug 2015 05:02:46 +0000 (22:02 -0700)]
replace duplicates on extract method with signature change: use folded values if present (IDEA-143613)

6 years agojunit/testng configuration ui: ensure correct document is updated (IDEA-143334)
Anna Kozlova [Thu, 13 Aug 2015 04:16:40 +0000 (21:16 -0700)]
junit/testng configuration ui: ensure correct document is updated (IDEA-143334)

6 years agofor -> foreach: treat parenthesis (IDEA-143630)
Anna Kozlova [Thu, 13 Aug 2015 03:45:13 +0000 (20:45 -0700)]
for -> foreach: treat parenthesis (IDEA-143630)

6 years agointroduce parameter: ensure correct scope is picked in case of anonymous class (IDEA...
Anna Kozlova [Thu, 13 Aug 2015 02:58:33 +0000 (19:58 -0700)]
introduce parameter: ensure correct scope is picked in case of anonymous class (IDEA-143435)

6 years agojunit: restore exception prefix if trace contains failure message (IDEA-143564);...
Anna Kozlova [Thu, 13 Aug 2015 01:48:12 +0000 (18:48 -0700)]
junit: restore exception prefix if trace contains failure message (IDEA-143564); try to avoid truncation of failure message if it contains 'expected' substring

6 years agoCCE ( EA-71762)
Anna Kozlova [Wed, 12 Aug 2015 16:55:22 +0000 (09:55 -0700)]
CCE ( EA-71762)

6 years agoEA-71665 - IAE: ContentManagerImpl.setSelectedContent
Egor.Ushakov [Fri, 14 Aug 2015 17:28:28 +0000 (20:28 +0300)]
EA-71665 - IAE: ContentManagerImpl.setSelectedContent

6 years agocleanup
Dmitry Batkovich [Fri, 14 Aug 2015 16:56:10 +0000 (19:56 +0300)]
cleanup

6 years agocompilation fix
Dmitry Batkovich [Fri, 14 Aug 2015 16:54:50 +0000 (19:54 +0300)]
compilation fix

6 years agoResourceBundlesEditor: basic implementation of copy action from rbe
Dmitry Batkovich [Fri, 14 Aug 2015 16:53:20 +0000 (19:53 +0300)]
ResourceBundlesEditor: basic implementation of copy action from rbe

6 years agoIDEA-55521 merge: add verbose logging
Aleksey Pivovarov [Fri, 14 Aug 2015 15:44:31 +0000 (18:44 +0300)]
IDEA-55521 merge: add verbose logging

6 years agoNew color pipette for Mac
Alexander Zolotov [Fri, 14 Aug 2015 15:53:16 +0000 (18:53 +0300)]
New color pipette for Mac

6 years agoExtract color pipette interface
Alexander Zolotov [Wed, 12 Aug 2015 13:56:47 +0000 (16:56 +0300)]
Extract color pipette interface

6 years agoCleanup color picker
Alexander Zolotov [Tue, 11 Aug 2015 16:41:19 +0000 (19:41 +0300)]
Cleanup color picker

6 years agoWEB-17670 Indent in the prompt for the CSS tag
Alexander Zolotov [Tue, 11 Aug 2015 11:29:32 +0000 (14:29 +0300)]
WEB-17670 Indent in the prompt for the CSS tag

6 years agosync EnvironmentVariablesData#readExternal with #writeExternal
Sergey Simonchik [Fri, 14 Aug 2015 15:55:10 +0000 (18:55 +0300)]
sync EnvironmentVariablesData#readExternal with #writeExternal

6 years agoIDEA-142377 Emacs emulation C-M-f and C-M-b are incorrect appcode/142.4021
Dmitry Batrak [Fri, 14 Aug 2015 15:33:15 +0000 (18:33 +0300)]
IDEA-142377 Emacs emulation C-M-f and C-M-b are incorrect

6 years agofix smart pointer range markers being updated twice
peter [Fri, 14 Aug 2015 15:26:53 +0000 (17:26 +0200)]
fix smart pointer range markers being updated twice

6 years agofasten smart pointer belts on first change in any committed document: it's cheap...
peter [Fri, 14 Aug 2015 13:34:18 +0000 (15:34 +0200)]
fasten smart pointer belts on first change in any committed document: it's cheap now and hopefully fixes EA-71480 - assert: SelfElementInfo.updateRange

6 years agodocument and test that invokeLater runnable might be executed in a less modal state
peter [Fri, 14 Aug 2015 11:46:43 +0000 (13:46 +0200)]
document and test that invokeLater runnable might be executed in a less modal state

6 years agodo not hang in case stepic.org is unavailable
Ekaterina Tuzova [Fri, 14 Aug 2015 13:52:47 +0000 (16:52 +0300)]
do not hang in case stepic.org is unavailable

6 years agomore logs
Alexey Kudravtsev [Fri, 14 Aug 2015 13:39:05 +0000 (16:39 +0300)]
more logs

6 years agotest fix
Alexey Kudravtsev [Fri, 14 Aug 2015 11:05:12 +0000 (14:05 +0300)]
test fix

6 years agotoString() added
Alexey Kudravtsev [Wed, 12 Aug 2015 17:29:05 +0000 (20:29 +0300)]
toString() added

6 years agoany changed to current
Alexey Kudravtsev [Wed, 12 Aug 2015 10:04:24 +0000 (13:04 +0300)]
any changed to current

6 years agotest are rewritten to be more compact clion/142.4020
Dmitry Batkovich [Fri, 14 Aug 2015 14:42:54 +0000 (17:42 +0300)]
test are rewritten to be more compact

6 years agoIDEA-126257 JDK 1.8: Debugger doesn't show variables *outside* lambda - better check...
Egor.Ushakov [Fri, 14 Aug 2015 14:22:06 +0000 (17:22 +0300)]
IDEA-126257 JDK 1.8: Debugger doesn't show variables *outside* lambda - better check for found variable

6 years agomemory leak in a window for expandable items
Sergey Malenkov [Fri, 14 Aug 2015 14:12:36 +0000 (17:12 +0300)]
memory leak in a window for expandable items

6 years agofire more specific event (fireIntervalAdded) on TextFieldWithHistory.MyModel#insertEl...
Sergey Simonchik [Fri, 14 Aug 2015 14:03:23 +0000 (17:03 +0300)]
fire more specific event (fireIntervalAdded) on TextFieldWithHistory.MyModel#insertElementAt

6 years agoJavaLineBreakpointType made more extendable
Nikolay.Tropin [Fri, 14 Aug 2015 13:58:27 +0000 (16:58 +0300)]
JavaLineBreakpointType made more extendable

6 years agoIDEA-142054 Make Alt+Enter accept selection in bulb menu.
Dmitry Batrak [Fri, 14 Aug 2015 13:48:23 +0000 (16:48 +0300)]
IDEA-142054 Make Alt+Enter accept selection in bulb menu.

6 years agoUse the method parameter which may be different from the ui setting IDEA-125257
Kirill Likhodedov [Fri, 14 Aug 2015 13:29:36 +0000 (16:29 +0300)]
Use the method parameter which may be different from the ui setting IDEA-125257

6 years agodiff: add heuristic for by-word diff
Aleksey Pivovarov [Thu, 13 Aug 2015 18:12:42 +0000 (21:12 +0300)]
diff: add heuristic for by-word diff

try better detecting of edges of inline insertion

6 years agoSupport BOTTOM side phpstorm/142.4019
Alexander Lobas [Fri, 14 Aug 2015 13:02:09 +0000 (16:02 +0300)]
Support BOTTOM side

6 years agorun manager: respected passed RunnerAndConfigurationSettings instance
Sergey Simonchik [Fri, 14 Aug 2015 13:03:48 +0000 (16:03 +0300)]
run manager: respected passed RunnerAndConfigurationSettings instance

6 years agoIDEA-141852 Quick documentation doesn't support @value tag without hash preceding...
Dmitry Batrak [Fri, 14 Aug 2015 12:50:47 +0000 (15:50 +0300)]
IDEA-141852 Quick documentation doesn't support @value tag without hash preceding variable reference

6 years agorun manager: test for toolwindow activation suppression
Sergey Simonchik [Fri, 14 Aug 2015 12:39:54 +0000 (15:39 +0300)]
run manager: test for toolwindow activation suppression

6 years ago'Add annotations to classpath' quickfix supported when IDEA is running from sources
nik [Fri, 14 Aug 2015 12:33:26 +0000 (15:33 +0300)]
'Add annotations to classpath' quickfix supported when IDEA is running from sources

6 years agoEDU-363 Additional "I give up" option
Liana Bakradze [Fri, 14 Aug 2015 12:32:18 +0000 (15:32 +0300)]
EDU-363 Additional "I give up" option

6 years agoInspectionToolsConfigurable: "share with team" -> "copy to project" to be consistent...
Dmitry Batkovich [Fri, 14 Aug 2015 12:20:17 +0000 (15:20 +0300)]
InspectionToolsConfigurable: "share with team" -> "copy to project" to be consistent with code style configurable

6 years agoIDEA-143890 Debugger: after failed Run to Cursor the terminated process is shown...
Egor.Ushakov [Fri, 14 Aug 2015 12:08:49 +0000 (15:08 +0300)]
IDEA-143890 Debugger: after failed Run to Cursor the terminated process is shown as "running"

6 years agoIDEA-143553: Include intellij kotlin sources into sources.zip
nik [Fri, 14 Aug 2015 11:50:39 +0000 (14:50 +0300)]
IDEA-143553: Include intellij kotlin sources into sources.zip

6 years agoInspectionToolsConfigurable: "share to team" -> "share with team" (IDEA-143916)
Dmitry Batkovich [Fri, 14 Aug 2015 11:04:29 +0000 (14:04 +0300)]
InspectionToolsConfigurable: "share to team" -> "share with team" (IDEA-143916)

6 years agoPsiViewer: use a file type instead to obtain PSI if language dialect is not set
Sergey Savenko [Fri, 14 Aug 2015 10:26:14 +0000 (13:26 +0300)]
PsiViewer: use a file type instead to obtain PSI if language dialect is not set

6 years agomaven: oss.sonatype.org/service moved permanently to https
Vladislav.Soroka [Fri, 14 Aug 2015 09:35:14 +0000 (12:35 +0300)]
maven: oss.sonatype.org/service moved permanently to https

6 years agodebug logging in CompositeDocumentationProvider (inspired by IDEA-143619) appcode/142.4018
Dmitry Batrak [Fri, 14 Aug 2015 09:24:34 +0000 (12:24 +0300)]
debug logging in CompositeDocumentationProvider (inspired by IDEA-143619)

6 years agoClass brace style settings applies also for anonymous classes (IDEA-143678) clion/142.4017
Yaroslav Lepenkin [Fri, 14 Aug 2015 07:51:40 +0000 (10:51 +0300)]
Class brace style settings applies also for anonymous classes (IDEA-143678)

6 years agosmart pointer getRange should be O(1) for committed documents
peter [Fri, 14 Aug 2015 08:41:20 +0000 (10:41 +0200)]
smart pointer getRange should be O(1) for committed documents

6 years agoavoid quadratic smart pointer getRange for many document changes
peter [Fri, 14 Aug 2015 07:38:51 +0000 (09:38 +0200)]
avoid quadratic smart pointer getRange for many document changes

6 years agoDetect indent only for committed document, delay until document is committed. (EA...
Yaroslav Lepenkin [Thu, 13 Aug 2015 08:06:44 +0000 (11:06 +0300)]
Detect indent only for committed document, delay until document is committed. (EA-70519)
When getIndentOptionsByFile is performed, document is uncommitted and indent detector should normally detect something, null is returned by detector and getIndentOptionsByFile returns default indent options for language, but marked by "setRecalculateForCommittedDocument" so later we could schedule settings update for committed document.
Detection logic moved from EditorImpl to SettingsImpl.

6 years agomove DEFAULT_EXT to state map to avoid dependency on DirectoryStorageData
Vladimir Krivosheev [Thu, 13 Aug 2015 12:25:47 +0000 (14:25 +0200)]
move DEFAULT_EXT to state map to avoid dependency on DirectoryStorageData

6 years agosimplification: get rid of StorageData — use StateMap directly (it is possible since...
Vladimir Krivosheev [Thu, 13 Aug 2015 12:22:44 +0000 (14:22 +0200)]
simplification: get rid of StorageData — use StateMap directly (it is possible since IDEA-CR-4311 get rid of ModuleFileData)

6 years ago[vcs-log] diagnostic for EA-70783 appcode/142.4016 clion/142.4013 dbe/142.4003 idea/142.4004 phpstorm/142.4009 pycharm/142.4011 rubymine/142.4010 webstorm/142.4005
Julia Beliaeva [Thu, 13 Aug 2015 19:44:50 +0000 (22:44 +0300)]
[vcs-log] diagnostic for EA-70783

6 years ago[vcs-log] fix EA-71283 (check if project is disposed)
Julia Beliaeva [Thu, 13 Aug 2015 19:23:40 +0000 (22:23 +0300)]
[vcs-log] fix EA-71283 (check if project is disposed)