Commit Graph
249026 Commits
Author SHA1 Message Date
Eldar Abusalimov dcaeb8f8c7 OC-4061: ApplicationUtil: Make runWithCheckCanceled() return result
GitOrigin-RevId: 3aa9f23cc5097e644eddf82a4faca669759b4760
2019-06-10 04:09:35 +03:00
Sergey Simonchik e68246f317 prevent overflow when overridden console cycle buffer size in KB is greater than Integer.MAX_VALUE in bytes (WEB-38966)
GitOrigin-RevId: 41097af6977ad2dcf86fd702f324589099219cc2
2019-06-10 01:07:09 +03:00
Svetlana.Zemlyanskaya 29bdecfcdd IDEA-CR-48136: FUS: record numerical fields if settings reporting is enabled (FUS-444)
(cherry picked from commit bdf5420031054affd584a7b9099e4a2fc496623f)

GitOrigin-RevId: e5c4a5b6fc50bf3bf39f7f4cfc7687888af99cb4
2019-06-09 23:07:12 +03:00
Vladimir Krivosheev a37e5e0577 time distribution using nanosecond accuracy
GitOrigin-RevId: d12e29274d4bf7dafe7f7abd1c32ba93bb6b3b2b
2019-06-09 23:06:35 +03:00
Vladimir Krivosheev 5bf84867ec ensure that amazon ion byte pool size is not greater than threshold (512 KB)
GitOrigin-RevId: cc6f7171ebf3350b1ceb353b9239bd03058395da
2019-06-09 22:08:57 +03:00
Vladimir Krivosheev 569b3aa505 extract PooledBlockAllocatorProvider
GitOrigin-RevId: ac38d22d0707b30e67b2e3cf70f3408042e6cd98
2019-06-09 22:08:27 +03:00
Vladimir Krivosheev f03c341b31 get rid of raw data per node
GitOrigin-RevId: d6d776f9ec3cf5525b769d1dd450043c3f4c52f6
2019-06-09 22:07:56 +03:00
Gregory.Shrago 80f5375e93 migrate fileTypeFactory extensions to fileType beans (fixes IDEA-215776)
GitOrigin-RevId: 8270a9f72143e7785e22bd5d48bc2ed5c75111ff
2019-06-09 22:07:19 +03:00
Konstantin Bulenkov 8fbc212297 introduce two type of listeners: instant and for final selections to avoid flooding of Undo stack in text editors
GitOrigin-RevId: db577f0b97f3a4cf56cb5605a063b55ca5c4d4f3
2019-06-09 18:06:38 +03:00
Kirill Likhodedov a59f605a49 git: fix notification text for update after rejected push
Commits were "received", not "updated" (as it was previously for files).

GitOrigin-RevId: 1022518c4a5d582d7782482ba6da345c10bc3458
2019-06-09 16:07:36 +03:00
Kirill Likhodedov c00917a7b8 git: support old-school Pull & Merge actions to show a log tab with new commits instead of the file tree: IDEA-52643
There are several limitations for these actions to avoid complicating the code for not very frequent cases. If the restrictions are not met, the code just falls back to the previous behavior and shows a file tree.
* Support only the case when a single branch is pulled from, i.e. octopus merges are not supported.
* Don't support pulling to a detached HEAD, or to an empty repository.

GitOrigin-RevId: e84c76f02f5cc21a37eef7f6cd47620d251dab36
2019-06-09 15:11:54 +03:00
Kirill Likhodedov 0f70237a11 git: get the list of branches from Git under a modal progress instead of the EDT: IDEA-215869
GitOrigin-RevId: 42c271bf6b303b0d9089e8945fa22500a7651df6
2019-06-09 15:11:23 +03:00
Kirill Likhodedov d4100b9a7b git: cleanup: don't set the read command silent, it is silent by default
GitOrigin-RevId: f39666f74fdfc554e75da32319d60292a07713b1
2019-06-09 15:10:53 +03:00
Kirill Likhodedov 9e22c53b92 git: in old Git | Pull/Merge actions, separate showing merge dialog from collecting updated files
And use a better API to deal with merge conflicts.

GitOrigin-RevId: 10799d934e1db2667a8c1192f8708e95ebb8dffd
2019-06-09 15:10:22 +03:00
Kirill Likhodedov eccf6b93f8 git: cleanup: move an old method to the class with the only usage
GitOrigin-RevId: 645306834e677bb7a6b8e531ae2a6f4ff0e40527
2019-06-09 15:09:52 +03:00
Kirill Likhodedov 9873b6772b git: cleanup: inline some old method with the only usage
GitOrigin-RevId: 928b762a50ca5c2363b25de29785607bda5853d5
2019-06-09 15:09:21 +03:00
Kirill Likhodedov d7eee72ec0 git: extract calculation of ranges of commits received during Update Project
GitOrigin-RevId: dc500e34261a80878b68cb26e647b12565e9e321
2019-06-09 15:08:51 +03:00
Kirill Likhodedov 85b9a10ccd git: allow the second branch in GitBranchPair to be any kind of GitBranch
Not necessarily the remote branch. It can be useful for local operations (merging a local branch), and doesn't seem to harm others: no code relies on the fact that it is a remote branch

GitOrigin-RevId: d101b80dd081aa3beaa24d90fba342b6c98e4070
2019-06-09 15:08:20 +03:00
Kirill Likhodedov d922267423 git: cleanup: mark the property as notnull, since it is actually never null
GitOrigin-RevId: 8c2b7a41c7a8067d17da3e79bc3075852108e0ed
2019-06-09 15:07:50 +03:00
Kirill Likhodedov 95a7c1238f git: cleanup: convert GitBranchPair to a kotlin dataclass and rename properties to more clear names
GitOrigin-RevId: 4433c399640b52f2637e6692d75ecd7c9c2d482b
2019-06-09 15:07:19 +03:00
Kirill Likhodedov e759aaf1ae Rename .java to .kt
GitOrigin-RevId: d2b3411d7fc39466afcdb75e5ff7dd5b4eb8f4a1
2019-06-09 15:06:42 +03:00
Nadya Zabrodina 1a149f2600 shelf: cache pre-loaded shelved lists and update tree model only if needed
* do not update model on show recycled or grouping changed;
* update model on rename;

GitOrigin-RevId: ac19116aff32e5376904c29b5bd6ca6e8a9c30ee
2019-06-09 10:13:22 +03:00
Nadya Zabrodina 308d751f5a shelf: refactoring - create new ShelvedChangeList with changes, separate methods for loading changes
* copy changes from previous shelved changelist if possible;
* avoid loading changed from patch file;
* create changes for shelvedList from already loaded or passed list of FilePatch;
* add annotations;
* update tests;

GitOrigin-RevId: ccc06a4f29bcf74026a9e3a1192d9f158388e5cc
2019-06-09 10:12:52 +03:00
Nadya Zabrodina da1723b438 shelf: refactoring - update and reuse createChangelistCopy method, remove old
* copy binary resources;
* rename local vars;
* update migration test;

GitOrigin-RevId: b3857465b21f331a7c02ea64934cf76ff7ce1edb
2019-06-09 10:12:22 +03:00
Nadya Zabrodina bc0d0a4894 shelf: fix resources deletion - schema dir may be related to another list, so check that it's empty first
GitOrigin-RevId: 00ee80170b0f333f854eb42d4a96571bd8477b73
2019-06-09 10:11:52 +03:00
Nadya Zabrodina 32bd852212 shelf: optimize - do not load patch file for each change
GitOrigin-RevId: 85424b5e32e69cd2157dedc860aa7c88094f528c
2019-06-09 10:11:21 +03:00
Nadya Zabrodina e6f8684bc4 shelf: cleanup - change process title
GitOrigin-RevId: 66b2d9f47a0515abff8e660489bbeeb2676f16fa
2019-06-09 10:10:51 +03:00
Nadya Zabrodina acedee29f0 shelf: cleanup - get/load changes before unshelve
GitOrigin-RevId: d6dda5451e47dd291c2ee6caf6da0723ca847e2d
2019-06-09 10:10:21 +03:00
Nadya Zabrodina 4d4d611de8 shelf: cleanup - use ContainerUtil
GitOrigin-RevId: d1e0472d484d4fe37b042b317bab048f5b0b5c52
2019-06-09 10:09:50 +03:00
Nadya Zabrodina 1dfcc9f433 shelf: cleanup - move unused method to test, move test to another package
GitOrigin-RevId: ef711f238243e8a1552cdbb1f17dca3c68807b43
2019-06-09 10:09:20 +03:00
Nadya Zabrodina 20344df577 shelf: cleanup - fix capitalization
GitOrigin-RevId: e0f6c1759c16aa2e8891c6bd964b1cad40a1e3ab
2019-06-09 10:08:50 +03:00
Nadya Zabrodina 4abb16c7e9 tasks: do not specify changes to unshelve if all are used
GitOrigin-RevId: 37d9e0e0e8589ad1c530ca3265511a9fa560fee6
2019-06-09 10:08:19 +03:00
Nadya Zabrodina 9fc0a99db6 shelf: refactoring - make ShelvedChange immutable, deprecate old method
GitOrigin-RevId: 68cf3dbf6cc8748d68c111a91d124e2293d37869
2019-06-09 10:07:49 +03:00
Nadya Zabrodina 6fb3b95cea shelf: cleanup - remove deprecated API usages
GitOrigin-RevId: f7a0f3ba91b1009beb5799e1faeb5cce30252592
2019-06-09 10:07:19 +03:00
Nadya Zabrodina 0c901a37ff shelf: IDEA-208591 Do not load shelve file content in EDT
* build shelf tree model async on pool thread and show loading icon

GitOrigin-RevId: 1fad7362914f2a8e112a05d030902aa5b7249194
2019-06-09 10:06:43 +03:00
Roman Shevchenko 92618aa563 Cleanup (warnings; formatting)
GitOrigin-RevId: 66bfab21c8145dc58fe480030b367492b9420c70
2019-06-09 09:06:33 +03:00
Svetlana.Zemlyanskaya f5eae4a117 FUS: delete legacy components
GitOrigin-RevId: a188712e08805c536c42fb0b1dc909b2441a0b3a
2019-06-09 00:06:33 +03:00
Konstantin Kolosovsky 8a63d28003 vcs: Show non-modal commit button as default button only if focus is in "Local Changes" (IDEA-215858)
GitOrigin-RevId: 6e7a30cfe05d7a4fb55620c23102a65d2781a864
2019-06-08 22:10:17 +03:00
Konstantin Kolosovsky 7a069d9127 vcs: Add splitter between changes tree and commit panel in "Local Changes" (IDEA-212227)
GitOrigin-RevId: bc9b3a020b11648f5a7e43767c2da636633c4e98
2019-06-08 22:09:47 +03:00
Konstantin Kolosovsky 989faf6663 vcs: Provide setting to switch between modal/non-modal commit (IDEA-215766)
Setting applies only to projects under git/hg

GitOrigin-RevId: 24bc1fd18ba8c6501f46847846e56445ddc2192d
2019-06-08 22:09:16 +03:00
Konstantin Kolosovsky 476bccdd71 vcs: Allow switching between modal/non-modal commit without restart
GitOrigin-RevId: e16f23d602f4a7a2c321615b92d4dd13cae07348
2019-06-08 22:08:46 +03:00
Konstantin Kolosovsky c67a1b0bbd vcs: Refactor "ChangesTree" - allow show/hide checkboxes dynamically
"DefaultTreeUI.getRenderer()" adds renderer to the "CellRendererPane" thereby removing it from its previous parent. This means that after returning "MyTreeCellRenderer.myTextRenderer" as renderer, we can not use "MyTreeCellRenderer" itself anymore as one of its children was removed. So now we always return "MyTreeCellRenderer" with correctly set checkbox visibility.

GitOrigin-RevId: 049f214ade5aee0ef3d9a948bc0a1ae7756eca54
2019-06-08 22:08:16 +03:00
Svetlana.Zemlyanskaya 8dca51209f FUS: remove redundant checks for state collectors
We don't need a separate cache for whitelisted groups because data validation is performed for all events by SensitiveDataValidator

GitOrigin-RevId: 78845062c5ed7b071cde80fb661ffac6c44b4777
2019-06-08 22:07:45 +03:00
Svetlana.Zemlyanskaya 91842ec6d4 FUS: make sure application is initialized before tests
GitOrigin-RevId: de78115bf946d0da7de4088607b7f300fe54b3ab
2019-06-08 22:07:09 +03:00
Vladimir Krivosheev 8b10a3f9bd remove deprecated StatusBarCustomComponentFactory (10 years ago), do not create memory indicator widget if not initial setting is false (part 2 - cleanup)
GitOrigin-RevId: 79f19655b739a06875e5d37ce19efc3e5966f110
2019-06-08 20:10:37 +03:00
Vladimir Krivosheev 649c46f93d remove deprecated StatusBarCustomComponentFactory (10 years ago), do not create memory indicator widget if not initial setting is false (part 2 - cleanup)
GitOrigin-RevId: 373458e5dc5660833eec8b7ed4df9aa962c308b9
2019-06-08 20:10:06 +03:00
Nikolay.Rykunov 40b78decfb Enable ChangeReminder plugin by default
GitOrigin-RevId: 87dee83e9d5699cbed74c4de48a94377e93abd7a
2019-06-08 20:09:36 +03:00
Vladimir Krivosheev 9c27dc5643 remove deprecated StatusBarCustomComponentFactory (10 years ago), do not create memory indicator widget if not initial setting is false
GitOrigin-RevId: b5e5702580c42449adf940017e5c51adbdb9631f
2019-06-08 20:09:06 +03:00
Vladimir Krivosheev aca011a70c ensure that TouchBarsManager library is loaded before WelcomeFrame/project
GitOrigin-RevId: 31d397d71f2a178cba4b21b06e6a136b43f74506
2019-06-08 20:08:35 +03:00
Alexander Zolotov cd864d290a TextMate: support highlighting unregistered token types
GitOrigin-RevId: 24df4192eecc0d62c0e5c06c08d259643ca09c6a
2019-06-08 20:08:04 +03:00