Commit Graph
183286 Commits
Author SHA1 Message Date
Konstantin Kolosovsky 079a073fc2 svn: Fixed "SvnQuickMergeTest" - do not check source branch history size
Previous checks were incorrect as we do not apply any special revision
filtering for "manual select" quick merge (see
"LoadRecentBranchRevisions"). Now we just check that branch copy
revision exists in passed revisions list (which is sufficient here).
2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky a01da02ddb svn: Refactored "SvnQuickMergeTest" - code simplified 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky c6b0c64da5 svn: Extracted inner "ShowRevisionSelector" class to separate file 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky e115eb5594 svn: Refactored "BaseMergeTask" and inheritors - code simplified 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky bb731e990c svn: Refactored "OneShotMergeInfoHelper" - warnings fixed, code simplified 2016-11-09 23:53:59 +03:00
Daniil Ovchinnikov 47dcdb023f [groovy] enable references within groovy-doc comments (IDEA-163663) 2016-11-09 22:23:17 +03:00
Dmitry Trofimov 6f37851864 Merge remote-tracking branch 'origin/master' 2016-11-09 19:50:55 +01:00
Dmitry Trofimov 8e65ccea3f Activate virtualenv in zsh via shell integration (IDEA-163063) 2016-11-09 19:48:14 +01:00
Dmitry Trofimov 474a92d837 Source .zshrc from user defined $ZDOTDIR (IDEA-162571) 2016-11-09 19:46:36 +01:00
Roman Shevchenko 868ea8e2a2 Cleanup (warnings; formatting) 2016-11-09 19:19:27 +01:00
Roman Shevchenko d368611e7b Cleanup (corrects LVCS validation action name) 2016-11-09 19:13:46 +01:00
Roman Shevchenko b140b66d84 [platform] moves LVCS storage validation into an internal action 2016-11-09 19:08:20 +01:00
Egor.Ushakov c55c68b210 use slightly faster concreteMethodByName instead of methodsByName where possible 2016-11-09 20:48:23 +03:00
Egor.Ushakov f474714d33 IDEA-163730 Incorrect value of logic operation stringVar == "value" 2016-11-09 20:48:23 +03:00
Dmitry Trofimov bde9ee39c5 Merge remote-tracking branch 'origin/master' 2016-11-09 18:45:31 +01:00
Dmitry Trofimov 6e390f1b69 'PATH' environment variable should be passed to the script after virtual env activation (PY-21194) 2016-11-09 18:44:27 +01:00
Elizaveta Shashkova 096ecf1532 Fix errors and fully support matplotlib interactive mode in run and debug with the option "Show command line afterwards" enabled (PY-21330) 2016-11-09 20:42:31 +03:00
Vladimir Krivosheev e5a05b2d1d potential fix IDEA-163701 No warning from enabled inspection after refactoring and changing inspection profile settings 2016-11-09 18:39:51 +01:00
Vladimir Krivosheev fb836e3bf8 ExecutorAction — be tolerant to incompatible plugins 2016-11-09 18:39:51 +01:00
Vladimir Krivosheev 3b4992dd34 convert ExecutorAction to kotlin 2016-11-09 18:39:50 +01:00
Vladimir Krivosheev 6e3102df7c convert ExecutorAction to kotlin 2016-11-09 18:39:50 +01:00
Vladimir Krivosheev fe612d8088 remove app level fireProfileChanged/fireProfileChanged 2016-11-09 18:39:49 +01:00
Vladimir Krivosheev 33ab2e75be do not init project inspection profile on updateProfile — it will be done in any case (was already discussed and confirmed, this part of code was not updated) 2016-11-09 18:39:49 +01:00
Roman Shevchenko 354bf15308 [platform] gets rid of junk log files from LossyEncodingInspection 2016-11-09 18:18:56 +01:00
Alexander Koshevoy 0a3468c59d PY 21264 BaseDebuggerReader.awaitReadyToRead() method is excessive and it is not needed to be used 2016-11-09 19:37:17 +03:00
Dmitry Trofimov 463eef32f0 Merge remote-tracking branch 'origin/master' 2016-11-09 17:10:30 +01:00
Rustam Vishnyakov 2190bd7b27 Skip array content when searching for statement start (fixes WEB-24067 Some bugs with reformat code) 2016-11-09 19:06:34 +03:00
Dennis Ushakov 421d00c4d5 use provided element as original one may become invalid due to reparse (WEB-24108) 2016-11-09 19:03:31 +03:00
Dmitry Trofimov 563591a9f8 The test is only valid on unix 2016-11-09 16:57:51 +01:00
Daniil Ovchinnikov 9ac0b7580f [groovy] get rid of GroovyExtensionProvider service 2016-11-09 18:45:27 +03:00
Egor.Ushakov da36599adc IDEA-163697 Debugger shows wrong values for TreeMap entries 2016-11-09 18:01:32 +03:00
peter 7de46bd758 Merge remote-tracking branch 'origin/master' 2016-11-09 15:59:12 +01:00
peter ee0f76a421 Merge branch 'jvgogh-master' 2016-11-09 15:49:44 +01:00
peter 412a476330 Merge branch 'master' of https://github.com/jvgogh/intellij-community into jvgogh-master 2016-11-09 15:46:34 +01:00
peter 318f983279 make Iterable.iterator notnull (IDEA-163719) 2016-11-09 15:43:40 +01:00
Elizaveta Shashkova be2b4456bc Respect working directory setting in Python Console (PY-21373) 2016-11-09 17:29:29 +03:00
irengrig 47204fa8ee WEB-23995 JSON schema: "type is not allowed" for valid schema and instance 2016-11-09 15:24:01 +01:00
Vladimir Krivosheev 9943f26d5d cleanup, prepare WEB-24091 IllegalArgumentException when inspect closure 2016-11-09 14:56:58 +01:00
Vladimir Krivosheev aa48a44df4 convert IndexedVariablesConsumer, FunctionValue, ValueType, PrimitiveValue to kotlin 2016-11-09 14:56:57 +01:00
Vladimir Krivosheev 240c0b2d33 convert IndexedVariablesConsumer, FunctionValue, ValueType, PrimitiveValue to kotlin 2016-11-09 14:56:57 +01:00
Denis Fokin fb337eaa6a IDEA-155785 Lots of IllegalStateException: cannot open system clipboard in the log 2016-11-09 16:51:02 +03:00
Pavel Dolgov 327ddd3ed5 Javafx: Code cleanup - removed unused imports, removed explicit type parameters, removed access to static members via derived class 2016-11-09 16:42:34 +03:00
peter b261c7fd57 IDEA-163678 "Passing non-null argument to 'Optional'" warning expected 2016-11-09 14:31:09 +01:00
Dmitry Avdeev 987a4aaffd IDEA-144646 Billion laughs in .idea/misc.xml: project model 2016-11-09 16:26:59 +03:00
Dmitry Avdeev 12adce2bee IDEA-144646 Billion laughs in .idea/misc.xml: fixed jps deps 2016-11-09 16:14:55 +03:00
Roman Shevchenko 1a5ec5d9ab [platform] restores Kotlin compatibility; deprecates exposed fields 2016-11-09 13:45:07 +01:00
Pavel Dolgov 44319d3b0c Merge remote-tracking branch 'origin/master' 2016-11-09 15:41:53 +03:00
Vladimir Krivosheev 126d4b3981 IDEA-CR-15513 rename to DefaultRunProgramRunner 2016-11-09 13:38:40 +01:00
Rustam Vishnyakov 9e4d3492cd Some explanatory JavaDoc 2016-11-09 15:29:42 +03:00
Sergey Malenkov 4340dcbb57 EA-91291 - NPE: BaseProjectTreeBuilder._select 2016-11-09 15:29:01 +03:00