Commit Graph
183286 Commits
Author SHA1 Message Date
Anna.Kozlova 59d96790b0 unused declaration: don't clear extensions on view close (IDEA-158426) 2016-11-10 10:52:14 +01:00
Anna.Kozlova 5f19749c5e read actions 2016-11-10 10:52:14 +01:00
Anna.Kozlova 20858b539e create test: if already exist, don't close initial dialog to eventually apply changes (IDEA-163452) 2016-11-10 10:52:14 +01:00
Anna.Kozlova 3b9bfd4c99 create test in same root: store answer per project (IDEA-163448) 2016-11-10 10:52:14 +01:00
Anna.Kozlova 848c1f215c inplace change signature: no detection, explicit action 2016-11-10 10:52:14 +01:00
Anna.Kozlova 7aca030c70 junit: mark DataPoints as used 2016-11-10 10:52:14 +01:00
Anna.Kozlova 3809ddc0d5 refresh file after move 2016-11-10 10:52:14 +01:00
Anna.Kozlova e4594aeb48 EA-91108 - PIEAE: PsiInvalidElementAccessException.createByNode 2016-11-10 10:52:14 +01:00
Anna.Kozlova 6e84d187aa logging for EA-91053 - NPE: ExpectedTypesProvider$MyParentVisitor.findClassesWithDeclaredMethod 2016-11-10 10:52:14 +01:00
Anna.Kozlova 7661254306 assert read access EA-91009 - assert: FtlFileViewProvider.getLanguages 2016-11-10 10:52:14 +01:00
Anna.Kozlova 5705682982 logging for EA-91296 - NPE: UnusedDeclarationInspectionBase$.visitElement 2016-11-10 10:52:14 +01:00
Dmitry Batkovich a3e003a945 unused return value: do not highlight methods with super 2016-11-10 10:36:29 +03:00
Tagir Valeev 4465e4420b TypeUtils#getMethodReturnType extracted 2016-11-10 11:48:45 +07:00
Tagir Valeev 898b985223 PsiDiamondTypeUtil#removeRedundantTypeArguments 2016-11-10 10:15:48 +07:00
Maxim.Mossienko 9848dbbad5 less logging in tests 2016-11-09 22:14:18 +01:00
Konstantin Kolosovsky ba1b98a7d7 svn: Fixed "SvnQuickMergeTest" - fixed waiting for "quick merge" to finish 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 296f512f4d vcs: Always invoke "continuation" for "BackgroundTaskGroup"
Otherwise "QueueProcessor.waitFor()" (and therefore
"BackgroundTaskQueue.waitForTasksToFinish()") will never finish in case
of error/cancellation as "QueueProcessor.isProcessing" flag is set to
"false" only when running "continuation"
2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 3136960716 vcs: Removed unused "TaskDescriptor" and related api 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky ad652cdd36 svn: Used "BackgroundTaskGroup" for running quick merge tasks 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky fe61b7a57b svn: Refactoring - removed unnecessary "BaseMergeTask.end()" calls 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 09f0cc6988 svn: Refactored "LocalChangesPromptTask" - used callback to run next task
Removed unnecessary "BaseMergeTask.end()" calls
2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky b7eaa8dfac svn: Refactored "MergeTask" - code simplified
* Do not wrap usual "Task.Backgroundable" instance into "TaskDescriptor"
* Removed "suspend/ping" logic - start next task in callback
2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 32e11c5639 svn: merge: Ask "reintegrate" prompt before "local changes" prompt
"Local changes" prompt and corresponding actions are now performed right
before actual svn merge for all merge options.
2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 329f4631fe svn: Refactored "BaseMergeTask" - renames, warnings fixed 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky fa04e891a8 svn: Do not explicitly perform vfs refresh after "shelving before merge"
All necessary files are automatically refreshed after rollback by
"ShelveChangesManager.shelveChanges()" logic.
2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 9b65492797 svn: Save documents only once while shelving changes before merge 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky ee9be7f8d6 svn: Refactored "IntersectingLocalChangesPanel" - code simplified 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 3b271e2255 svn: Refactored "LocalChangesPromptTask", "Intersection" - code simplified 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 9f9c1a14de svn: Unified "LoadRecentBranchRevisions" and "MergeCalculatorTask" tasks
Removed "LoadRecentBranchRevisions"
2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky e60c03e0ad svn: Refactored "LoadRecentBranchRevisions" - code simplified 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 51a43db9bf svn: Unified "LoadRecentBranchRevisions" and "MergeCalculatorTask" progress messages 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 7052481936 svn: merge: Removed unnecessary progress messages
Necessary messages are already provided by "SvnCommittedChangesProvider"
2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 0d43889421 svn: merge: Removed unnecessary casts and used "SvnChangeList" directly 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 490a230235 svn: Removed unnecessary paging logic from "ToBeMergedDialog"
* This logic hasn't been actually used for 6 years (disabled in 3ecc391
"SVN: one-click merge: remove pages concept" on 7/14/2010). And is not
actually necessary - adding new rows to the table + scrolling is
sufficient here.
* Also removed unused related "PageEngine", "BasePageEngine",
"PagedListWithActions"
2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 51f0ef5298 svn: Removed "ShowRecentInDialogTask" - used "ShowRevisionSelector" instead 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 3c13ee5025 svn: Do not create separate "QuickMerge" instance in "ToBeMergedDialog" 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky b4ec7d0545 svn: Refactored "LoadRecentBranchRevisions" - code simplified 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 8dde25bf78 svn: Moved "change lists by paths" filtering logic to "OneShotMergeInfoHelper" 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 2bb920dae4 svn: Refactored "MergeCalculatorTask" 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky d61bde8206 vcs: Refactored "ChangeBrowserSettings", "BrowseChangesAction" 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky abf18eac89 vcs: Do not fail while parsing before/after revisions in "ChangeBrowserSettings" 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 7ee9d4a457 svn: Refactored "SvnCommittedChangesProvider" - added @Override 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 705ac9a1e5 svn: Refactored "SvnCommittedChangesProvider" - code simplified, warnings fixed 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky dd569e6b37 svn: Removed "QuickMergeInteraction.showRecentListsForSelection()"
Used "QuickMergeInteraction.selectMergeItems()" instead
2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 2041f41007 svn: Made "SelectMergeItemsResult" to be class and not interface 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 87e8cb5bf6 vcs: Removed unused "SelectionManipulation", "SelectionState", "SelectionResult" 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky f054b7560a svn: Refactored "QuantitySelection" - code simplified 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 4ac1f881c4 svn: Do not check all revisions for "manual select" quick merge by default 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 21c19e2e2a svn: merge: Do not show "Load Xxx" buttons if all revisions are loaded 2016-11-09 23:53:59 +03:00
Konstantin Kolosovsky 5fc7eb8dc6 svn: Refactored "QuickMergeInteraction, "ToBeMergedDialog" - renames 2016-11-09 23:53:59 +03:00