* origin/master:
IDEA-116029 in-place introduce variable name suggestions popup disappears before I can select anything PARTIAL ROLLBACK, fix to be continued...
* origin/master: (46 commits)
partially reverting 10f6a0f: psi depedent index get buffering status updates because they are applied to unsaved committed documents
Move ssh connection provider to remote-run.
use a more memory-efficient structure to hold a long indexed file list
fix test
- Removed dependency on remote-run in vagrant plugin (PY-12254). - New api for path mappings providers (old left for compatibility with RubyMine and PhpStorm) - Fix launching of Python console for remote interpreter.
add -> keyword to cpp and make sure it's lexed correctly (IDEA-121906)
add a proxy test that fails on java 8
enable new nashorn variables view by default
style: remove unnecessary method
for unsaved documents with committed state and psi backed index use the same logic as for unsaved documents with plain index
github tests with wrong notifications fixed
[log] Fix tests. (fix wrong line separators)
[log] Remake VcsLogJoiner without recursion.
[log] IDEA-118947 Implement special highlighting for cherry-pick
[log] Add ability to listen to possible filter changes
[log] Add ability to reuse branches filter popup
[log] Expose VcsLogRefs into API
[log] Expose the VcsLogFilterUi to the API, let set filter value
[log] repaint ui after adding highlighter
[log] make constants final
...
- New api for path mappings providers (old left for compatibility with RubyMine and PhpStorm)
- Fix launching of Python console for remote interpreter.
* Add DeepCompareAction as a toggle action to the vcs log toolbar.
* Clicking on the button starts 'git cherry' in background to
get commits non picked to the current branch.
* Once completed, the log is highlighted so that picked commits
appear in grey.
* If initially there is no branch filter or several branches selected,
propose user to select a single branch, apply filters and start
collecting git cherry.
* If branch filter changes, reset the highlighting.
* If the log refreshes, restart all procedure to make sure that
highlighting is correct, say, after cherry-picking on of the "black"
commits.
* But if current branch changes, reset the highlighting and don't
restart the procedure.
* DeepComparatorHolder maintains a single DeepComparator instance
per each VcsLogUi (i.e. each vcs log).
Roman Shevchenko
Eugene Zhuravlev
Kirill Likhodedov
Dmitry Batrak
Ekaterina Tuzova
Konstantin Bulenkov
peter
Bas Leijdekkers
Dmitry Avdeev
Vladimir Orlov
Artem Govorov
Vassiliy
Maxim.Mossienko
Dmitry Trofimov
Vladimir Krivosheev
Nadya Zabrodina
Erokhin Stanislav