idea/community.git
5 years agoPsiTypesUtil: reverted erroneous changes in getExpectedTypeByParent (IDEA-CR-15590)
Tagir Valeev [Fri, 11 Nov 2016 10:18:08 +0000 (17:18 +0700)]
PsiTypesUtil: reverted erroneous changes in getExpectedTypeByParent (IDEA-CR-15590)

5 years agotemp reject inplace change signature for super methods
Anna.Kozlova [Thu, 10 Nov 2016 18:39:16 +0000 (19:39 +0100)]
temp reject inplace change signature for super methods

5 years agomigrate to junit 5: collapse with static import if assertion was statically imported...
Anna.Kozlova [Thu, 10 Nov 2016 18:28:49 +0000 (19:28 +0100)]
migrate to junit 5: collapse with static import if assertion was statically imported (IDEA-163650)

5 years agoprohibit dialogs and other swing events under write action appcode/171.885 clion/171.886
peter [Fri, 11 Nov 2016 06:52:52 +0000 (07:52 +0100)]
prohibit dialogs and other swing events under write action

5 years agoIDEA-163767: fixed for assignment, tests for assignment and ternary
Tagir Valeev [Fri, 11 Nov 2016 06:24:09 +0000 (13:24 +0700)]
IDEA-163767: fixed for assignment, tests for assignment and ternary

5 years agoIDEA-163767 Simplify optional.isPresent() inspection doesn't suggest simplify trivial...
Tagir Valeev [Fri, 11 Nov 2016 06:14:55 +0000 (13:14 +0700)]
IDEA-163767 Simplify optional.isPresent() inspection doesn't suggest simplify trivial case

5 years agoOptionalUtil#getMapTypeArgument: check nulls; remove 0-arg check
Tagir Valeev [Fri, 11 Nov 2016 05:02:36 +0000 (12:02 +0700)]
OptionalUtil#getMapTypeArgument: check nulls; remove 0-arg check

5 years agoIDEA-163764 "Replace Optional.isPresent() checks with functional-style expressions... pycharm/171.883 pycharm/171.884
Tagir Valeev [Fri, 11 Nov 2016 04:28:44 +0000 (11:28 +0700)]
IDEA-163764 "Replace Optional.isPresent() checks with functional-style expressions" create uncompilable code
IDEA-163463 Stream API migration: type argument before map appears sometimes when it's unnecessary

5 years agoMoved TypeUtils#getMethodReturnType -> PsiTypesUtil; used in LambdaUtil#getFunctional... webstorm/171.882
Tagir Valeev [Fri, 11 Nov 2016 03:20:32 +0000 (10:20 +0700)]
Moved TypeUtils#getMethodReturnType -> PsiTypesUtil; used in LambdaUtil#getFunctionalInterfaceType amd PsiTypesUtil#getExpectedTypeByParent (IDEA-CR-15590)

5 years agoIDEA-161375 What is Pin Active Tab doing here? appcode/171.875 clion/171.877 dbe/171.879 idea/171.873 phpstorm/171.874 pycharm/171.872 pycharm/171.876 rubymine/171.878
Gregory.Shrago [Fri, 11 Nov 2016 00:07:20 +0000 (03:07 +0300)]
IDEA-161375 What is Pin Active Tab doing here?

5 years ago [groovy] convert DynamicManager from project component to service #2
Yann Cébron [Thu, 10 Nov 2016 20:49:47 +0000 (21:49 +0100)]
 [groovy] convert DynamicManager from project component to service #2

 fix DynamicManagerImpl registration

5 years ago[vcs-log] remove deleted action from vcs-log.xml
Julia Beliaeva [Thu, 10 Nov 2016 20:26:06 +0000 (23:26 +0300)]
[vcs-log] remove deleted action from vcs-log.xml

5 years ago[groovy] convert DynamicManager from project component to service
Daniil Ovchinnikov [Thu, 10 Nov 2016 19:40:27 +0000 (22:40 +0300)]
[groovy] convert DynamicManager from project component to service

5 years ago[groovy] do not use templates to create new file in Move Class
Daniil Ovchinnikov [Thu, 10 Nov 2016 19:25:55 +0000 (22:25 +0300)]
[groovy] do not use templates to create new file in Move Class

5 years agocascade safe delete/make static: don't start for methods with overriders (IDEA-162814)
Anna.Kozlova [Thu, 10 Nov 2016 18:06:26 +0000 (19:06 +0100)]
cascade safe delete/make static: don't start for methods with overriders (IDEA-162814)

5 years agoEA-91530 - CCE: JavaVariableConflictResolver.resolveConflict
Anna.Kozlova [Thu, 10 Nov 2016 16:55:44 +0000 (17:55 +0100)]
EA-91530 - CCE: JavaVariableConflictResolver.resolveConflict

5 years agoIDEA-163826 New > GUI Form entering name containing space just closes dialog
Alexander Lobas [Thu, 10 Nov 2016 17:54:16 +0000 (20:54 +0300)]
IDEA-163826 New > GUI Form entering name containing space just closes dialog

5 years ago[vcs-log] grey labels text color
Julia Beliaeva [Thu, 10 Nov 2016 17:28:26 +0000 (20:28 +0300)]
[vcs-log] grey labels text color

5 years ago[index] minor: myIndexId is always not null
Julia Beliaeva [Thu, 13 Oct 2016 20:25:01 +0000 (23:25 +0300)]
[index] minor: myIndexId is always not null

myIndexId assigned from extension.getName(), which is not null.

5 years ago[vcs-log] messages version also should depend on VcsLogStorage version, since it...
Julia Beliaeva [Thu, 13 Oct 2016 19:30:54 +0000 (22:30 +0300)]
[vcs-log] messages version also should depend on VcsLogStorage version, since it uses commit ids

5 years ago[vcs-log] keep indexes in one folder
Julia Beliaeva [Thu, 13 Oct 2016 19:28:22 +0000 (22:28 +0300)]
[vcs-log] keep indexes in one folder

Introduce new storage scheme: keep indexes in index/<project-log-id>.<index-id>.<version>

5 years ago[vcs-log] minor: inline parameter that is never changed
Julia Beliaeva [Thu, 13 Oct 2016 18:36:00 +0000 (21:36 +0300)]
[vcs-log] minor: inline parameter that is never changed

5 years ago[vcs-log] inputs index is not needed in log
Julia Beliaeva [Thu, 13 Oct 2016 17:33:49 +0000 (20:33 +0300)]
[vcs-log] inputs index is not needed in log

* InputsIndex is null for log indexes.
* Common persistent set is used for keeping indexed status.
* Remove myEmptyCommits from paths index and myNoTrigramsCommits from trigrams index. Commits with no paths or no trigrams wont be re-indexed now since they will be stored in the persistent set.
* Remove PrintIndexInfo action, not very useful and used for debug.
* Rewrite create/dispose code for indexes. Each constructor now throws an exception if something's wrong and all indexes are cleaned-up and recreated together if it is.

5 years ago[vcs-log] extract requestRebuild and overwrite it in log indexes to not use FileBased...
Julia Beliaeva [Thu, 13 Oct 2016 17:57:01 +0000 (20:57 +0300)]
[vcs-log] extract requestRebuild and overwrite it in log indexes to not use FileBasedIndex

5 years ago[index] MapReduceIndex does not necessarily have inputs index
Julia Beliaeva [Thu, 13 Oct 2016 17:43:43 +0000 (20:43 +0300)]
[index] MapReduceIndex does not necessarily have inputs index

Add some Nullable annotations, fix possible NPE.

5 years ago[vcs-log] use enumerators instead of maps for keeping commit sets
Julia Beliaeva [Tue, 11 Oct 2016 18:39:41 +0000 (21:39 +0300)]
[vcs-log] use enumerators instead of maps for keeping commit sets

For keeping commits without changed paths or commits without trigrams set-like structure is sufficient. So PersistenceSet interface is created to represent such a structure with an implementation based on PersistentBTreeEnumerator. This allows to reduce the amount of occupied disk space.

5 years ago[vcs-log] replace flush after indexing each commit batch with single flush in the end
Julia Beliaeva [Tue, 11 Oct 2016 17:53:14 +0000 (20:53 +0300)]
[vcs-log] replace flush after indexing each commit batch with single flush in the end

5 years agoMerge remote-tracking branch 'origin/master'
Dmitry Trofimov [Thu, 10 Nov 2016 17:06:22 +0000 (18:06 +0100)]
Merge remote-tracking branch 'origin/master'

5 years agoFix resource path for IDEA-147703
Dmitry Trofimov [Thu, 10 Nov 2016 17:01:00 +0000 (18:01 +0100)]
Fix resource path for IDEA-147703

5 years agomake some quick fixes not require write action
peter [Thu, 10 Nov 2016 16:09:33 +0000 (17:09 +0100)]
make some quick fixes not require write action

5 years agoremove unused PriorityLocalQuickFixWrapper
peter [Thu, 10 Nov 2016 16:04:32 +0000 (17:04 +0100)]
remove unused PriorityLocalQuickFixWrapper

5 years agoremove invalid external annotation entry from Iterable (IDEA-CR-15615)
peter [Thu, 10 Nov 2016 15:33:10 +0000 (16:33 +0100)]
remove invalid external annotation entry from Iterable (IDEA-CR-15615)

5 years agoAntChangeContextFix doesn't need write action
peter [Thu, 10 Nov 2016 14:28:58 +0000 (15:28 +0100)]
AntChangeContextFix doesn't need write action

5 years agoasync console filters: detect line removal earlier, allocate less memory (IDEA-163771)
peter [Thu, 10 Nov 2016 14:13:41 +0000 (15:13 +0100)]
async console filters: detect line removal earlier, allocate less memory (IDEA-163771)

5 years agoremove empty overrider
Anna.Kozlova [Thu, 10 Nov 2016 16:45:15 +0000 (17:45 +0100)]
remove empty overrider

5 years agointroduce variable: distinguish lambda parameters but allow param free expressions...
Anna.Kozlova [Thu, 10 Nov 2016 16:25:29 +0000 (17:25 +0100)]
introduce variable: distinguish lambda parameters but allow param free expressions (IDEA-163785)

5 years agoIDEA-163825 Smart step variants from another line
Egor.Ushakov [Thu, 10 Nov 2016 16:36:35 +0000 (19:36 +0300)]
IDEA-163825 Smart step variants from another line

5 years agoMerge remote-tracking branch 'origin/master'
Dmitry Trofimov [Thu, 10 Nov 2016 16:35:43 +0000 (17:35 +0100)]
Merge remote-tracking branch 'origin/master'

5 years agoProvide fish shell integration with the terminal (IDEA-163063)
Dmitry Trofimov [Thu, 10 Nov 2016 16:34:46 +0000 (17:34 +0100)]
Provide fish shell integration with the terminal (IDEA-163063)

5 years ago[groovy] organize file templates
Daniil Ovchinnikov [Thu, 10 Nov 2016 15:41:35 +0000 (18:41 +0300)]
[groovy] organize file templates

5 years ago[groovy] move GrReferenceResolveRunner to *.resolve package
Daniil Ovchinnikov [Thu, 10 Nov 2016 13:31:33 +0000 (16:31 +0300)]
[groovy] move GrReferenceResolveRunner to *.resolve package

5 years agoremove by instance to ensure that renamed profile is not deleted
Vladimir Krivosheev [Thu, 10 Nov 2016 15:36:26 +0000 (16:36 +0100)]
remove by instance to ensure that renamed profile is not deleted

5 years agoextract InspectionProfileModifiableModel
Vladimir Krivosheev [Thu, 10 Nov 2016 15:11:05 +0000 (16:11 +0100)]
extract InspectionProfileModifiableModel
introduce modifyAndCommitProjectProfile
use only and only modifyProfile and do not directly create modifiable model

5 years agocleanup
Vladimir Krivosheev [Thu, 10 Nov 2016 11:48:14 +0000 (12:48 +0100)]
cleanup

5 years agoMerge remote-tracking branch 'origin/master'
Dmitry Trofimov [Thu, 10 Nov 2016 15:20:59 +0000 (16:20 +0100)]
Merge remote-tracking branch 'origin/master'

5 years agoSend correct Home/End key sequences in application keypad mode (IDEA-118848)
Dmitry Trofimov [Thu, 10 Nov 2016 15:20:18 +0000 (16:20 +0100)]
Send correct Home/End key sequences in application keypad mode (IDEA-118848)

5 years agocheck for file validness before acquiring its stampt
Maxim.Mossienko [Thu, 10 Nov 2016 15:04:57 +0000 (16:04 +0100)]
check for file validness before acquiring its stampt

5 years agoEA-88507 - IAE: CollapseTagIntention.a
Dmitry Avdeev [Thu, 10 Nov 2016 15:03:56 +0000 (18:03 +0300)]
EA-88507 - IAE: CollapseTagIntention.a

5 years agoSupport indent after comma in parameter lists clion/171.870
Rustam Vishnyakov [Thu, 10 Nov 2016 14:24:27 +0000 (17:24 +0300)]
Support indent after comma in parameter lists

5 years agoIDEA-155785 Lots of IllegalStateException: cannot open system clipboard in the log appcode/171.869
Denis Fokin [Thu, 10 Nov 2016 14:55:36 +0000 (17:55 +0300)]
IDEA-155785 Lots of IllegalStateException: cannot open system clipboard in the log

5 years agoEA-90501 - NPE: SchemaReferencesProvider.createTypeOrElementOrAttributeReference
Dmitry Avdeev [Thu, 10 Nov 2016 14:41:05 +0000 (17:41 +0300)]
EA-90501 - NPE: SchemaReferencesProvider.createTypeOrElementOrAttributeReference

5 years agoPY-21246 Properly wrap injected expressions in parentheses inside f-strings
Mikhail Golubev [Thu, 10 Nov 2016 12:38:40 +0000 (15:38 +0300)]
PY-21246 Properly wrap injected expressions in parentheses inside f-strings

5 years agoPull getAutoPosition() up to PyStringFormatParser#SubstitutionChunk
Mikhail Golubev [Wed, 9 Nov 2016 19:00:59 +0000 (22:00 +0300)]
Pull getAutoPosition() up to PyStringFormatParser#SubstitutionChunk

It allows not to pass index explicitly every time one needs to create
PySubstitutionChunkReference from a chunk.

5 years agoSplit PyConvertToFStringIntention into several classes
Mikhail Golubev [Tue, 8 Nov 2016 16:03:04 +0000 (19:03 +0300)]
Split PyConvertToFStringIntention into several classes

5 years agoJava: Handle type parameter and type use annotations in the inspection "Non-accessibl...
Pavel Dolgov [Thu, 10 Nov 2016 13:40:08 +0000 (16:40 +0300)]
Java: Handle type parameter and type use annotations in the inspection "Non-accessible type is exposed" (IDEA-162768)

5 years agoJava: Handle 'throws' clause in the inspection "Non-accessible type is exposed" ...
Pavel Dolgov [Thu, 10 Nov 2016 11:38:35 +0000 (14:38 +0300)]
Java: Handle 'throws' clause in the inspection "Non-accessible type is exposed" (IDEA-162768)

5 years agoJava: Added module-info.class to the mock jdk 8 because it's is needed for Java 9...
Pavel Dolgov [Thu, 10 Nov 2016 10:26:44 +0000 (13:26 +0300)]
Java: Added module-info.class to the mock jdk 8 because it's is needed for Java 9 tests and is safely ignored by Java 8 tests

5 years agoJava: Handle most common cases of annotations in the inspection "Non-accessible type...
Pavel Dolgov [Wed, 9 Nov 2016 18:05:41 +0000 (21:05 +0300)]
Java: Handle most common cases of annotations in the inspection "Non-accessible type is exposed" (IDEA-162768)

5 years agofixing RealFetchTest
Dmitry Avdeev [Thu, 10 Nov 2016 13:38:58 +0000 (16:38 +0300)]
fixing RealFetchTest

5 years agoMerge branch 'mskr/webstorm-js-bugs'
Maxim Kropotov [Thu, 10 Nov 2016 13:48:16 +0000 (16:48 +0300)]
Merge branch 'mskr/webstorm-js-bugs'

5 years agosplit top level var name (WEB-14233)
Dennis Ushakov [Thu, 10 Nov 2016 13:19:14 +0000 (16:19 +0300)]
split top level var name (WEB-14233)

5 years agocleanup
Alexey Kudravtsev [Thu, 10 Nov 2016 12:35:16 +0000 (15:35 +0300)]
cleanup

5 years agomake isInNonCancelableSection() an instance method to open possibilities for optimisa...
Alexey Kudravtsev [Thu, 10 Nov 2016 12:34:41 +0000 (15:34 +0300)]
make isInNonCancelableSection() an instance method to open possibilities for optimisations; test added

5 years agomoved to ProgressManager
Alexey Kudravtsev [Thu, 10 Nov 2016 11:41:08 +0000 (14:41 +0300)]
moved to ProgressManager

5 years agooptimize caret cloning - do a cheap check first
Dmitry Batrak [Thu, 10 Nov 2016 12:17:04 +0000 (15:17 +0300)]
optimize caret cloning - do a cheap check first

this makes EditorMultiCaretColumnModeTest.testPageMovementsInteroperateWithLineMovements work much faster,
as position markers in CaretImpl are not created needlessly, and System.gc() in RangeMarkerTree.errMsg is not invoked

5 years agofix tests falling after fix WEB-23995 JSON schema: "type is not allowed" for valid...
irengrig [Thu, 10 Nov 2016 12:07:07 +0000 (13:07 +0100)]
fix tests falling after fix WEB-23995 JSON schema: "type is not allowed" for valid schema and instance

5 years agoPY-21264 Use send_process_created_message() in the original piece of code where it... appcode/171.867 appcode/171.953 clion/171.866
Alexander Koshevoy [Thu, 10 Nov 2016 11:13:51 +0000 (14:13 +0300)]
PY-21264 Use send_process_created_message() in the original piece of code where it was extracted from

5 years agoIDEA-163730 Incorrect value of logic operation stringVar == "value" - inter only...
Egor.Ushakov [Thu, 10 Nov 2016 11:18:21 +0000 (14:18 +0300)]
IDEA-163730 Incorrect value of logic operation stringVar == "value" - inter only from jdk 7

5 years agoextracted isInNonCancelableSection() method
Alexey Kudravtsev [Wed, 9 Nov 2016 12:30:25 +0000 (15:30 +0300)]
extracted isInNonCancelableSection() method

5 years agocancel even earlier - when one of the processors returned false
Alexey Kudravtsev [Wed, 9 Nov 2016 12:25:26 +0000 (15:25 +0300)]
cancel even earlier - when one of the processors returned false

5 years agoDBE: EA-91019 - IAE: BalloonImpl.revalidate phpstorm/171.865
Alexander Kass [Thu, 10 Nov 2016 09:55:46 +0000 (12:55 +0300)]
DBE: EA-91019 - IAE: BalloonImpl.revalidate

5 years agofollowing IDEA-CR-15552
Anna.Kozlova [Thu, 10 Nov 2016 10:16:48 +0000 (11:16 +0100)]
following IDEA-CR-15552

5 years agounused declaration: don't clear extensions on view close (IDEA-158426)
Anna.Kozlova [Thu, 10 Nov 2016 09:43:39 +0000 (10:43 +0100)]
unused declaration: don't clear extensions on view close (IDEA-158426)

5 years agoread actions
Anna.Kozlova [Thu, 10 Nov 2016 09:12:43 +0000 (10:12 +0100)]
read actions

5 years agocreate test: if already exist, don't close initial dialog to eventually apply changes...
Anna.Kozlova [Wed, 9 Nov 2016 18:15:07 +0000 (19:15 +0100)]
create test: if already exist, don't close initial dialog to eventually apply changes (IDEA-163452)

5 years agocreate test in same root: store answer per project (IDEA-163448)
Anna.Kozlova [Wed, 9 Nov 2016 18:10:48 +0000 (19:10 +0100)]
create test in same root: store answer per project (IDEA-163448)

5 years agoinplace change signature: no detection, explicit action
Anna.Kozlova [Wed, 9 Nov 2016 17:16:23 +0000 (18:16 +0100)]
inplace change signature: no detection, explicit action

5 years agojunit: mark DataPoints as used
Anna.Kozlova [Wed, 9 Nov 2016 14:22:09 +0000 (15:22 +0100)]
junit: mark DataPoints as used

5 years agorefresh file after move
Anna.Kozlova [Wed, 9 Nov 2016 13:07:22 +0000 (14:07 +0100)]
refresh file after move

5 years agoEA-91108 - PIEAE: PsiInvalidElementAccessException.createByNode
Anna.Kozlova [Wed, 9 Nov 2016 10:42:09 +0000 (11:42 +0100)]
EA-91108 - PIEAE: PsiInvalidElementAccessException.createByNode

5 years agologging for EA-91053 - NPE: ExpectedTypesProvider$MyParentVisitor.findClassesWithDecl...
Anna.Kozlova [Wed, 9 Nov 2016 10:23:52 +0000 (11:23 +0100)]
logging for EA-91053 - NPE: ExpectedTypesProvider$MyParentVisitor.findClassesWithDeclaredMethod

5 years agoassert read access EA-91009 - assert: FtlFileViewProvider.getLanguages
Anna.Kozlova [Wed, 9 Nov 2016 10:19:09 +0000 (11:19 +0100)]
assert read access EA-91009 - assert: FtlFileViewProvider.getLanguages

5 years agologging for EA-91296 - NPE: UnusedDeclarationInspectionBase$.visitElement
Anna.Kozlova [Wed, 9 Nov 2016 09:58:26 +0000 (10:58 +0100)]
logging for EA-91296 - NPE: UnusedDeclarationInspectionBase$.visitElement

5 years agounused return value: do not highlight methods with super appcode/171.863 clion/171.864
Dmitry Batkovich [Thu, 10 Nov 2016 07:35:50 +0000 (10:35 +0300)]
unused return value: do not highlight methods with super

5 years agoTypeUtils#getMethodReturnType extracted pycharm/171.861 pycharm/171.862
Tagir Valeev [Thu, 10 Nov 2016 04:48:45 +0000 (11:48 +0700)]
TypeUtils#getMethodReturnType extracted

5 years agoPsiDiamondTypeUtil#removeRedundantTypeArguments webstorm/171.860
Tagir Valeev [Tue, 8 Nov 2016 07:21:53 +0000 (14:21 +0700)]
PsiDiamondTypeUtil#removeRedundantTypeArguments

5 years agoless logging in tests appcode/171.854 clion/171.858 dbe/171.851 idea/171.853 phpstorm/171.855 pycharm/171.856 pycharm/171.857 rubymine/171.859
Maxim.Mossienko [Wed, 9 Nov 2016 12:29:14 +0000 (13:29 +0100)]
less logging in tests

5 years agosvn: Fixed "SvnQuickMergeTest" - fixed waiting for "quick merge" to finish
Konstantin Kolosovsky [Fri, 28 Oct 2016 07:14:53 +0000 (10:14 +0300)]
svn: Fixed "SvnQuickMergeTest" - fixed waiting for "quick merge" to finish

5 years agovcs: Always invoke "continuation" for "BackgroundTaskGroup"
Konstantin Kolosovsky [Fri, 28 Oct 2016 06:44:35 +0000 (09:44 +0300)]
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"

5 years agovcs: Removed unused "TaskDescriptor" and related api
Konstantin Kolosovsky [Wed, 26 Oct 2016 12:17:41 +0000 (15:17 +0300)]
vcs: Removed unused "TaskDescriptor" and related api

5 years agosvn: Used "BackgroundTaskGroup" for running quick merge tasks
Konstantin Kolosovsky [Wed, 26 Oct 2016 12:10:45 +0000 (15:10 +0300)]
svn: Used "BackgroundTaskGroup" for running quick merge tasks

5 years agosvn: Refactoring - removed unnecessary "BaseMergeTask.end()" calls
Konstantin Kolosovsky [Tue, 25 Oct 2016 23:49:31 +0000 (02:49 +0300)]
svn: Refactoring - removed unnecessary "BaseMergeTask.end()" calls

5 years agosvn: Refactored "LocalChangesPromptTask" - used callback to run next task
Konstantin Kolosovsky [Tue, 25 Oct 2016 23:35:15 +0000 (02:35 +0300)]
svn: Refactored "LocalChangesPromptTask" - used callback to run next task

Removed unnecessary "BaseMergeTask.end()" calls

5 years agosvn: Refactored "MergeTask" - code simplified
Konstantin Kolosovsky [Tue, 25 Oct 2016 11:00:46 +0000 (14:00 +0300)]
svn: Refactored "MergeTask" - code simplified

* Do not wrap usual "Task.Backgroundable" instance into "TaskDescriptor"
* Removed "suspend/ping" logic - start next task in callback

5 years agosvn: merge: Ask "reintegrate" prompt before "local changes" prompt
Konstantin Kolosovsky [Fri, 21 Oct 2016 13:32:43 +0000 (16:32 +0300)]
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.

5 years agosvn: Refactored "BaseMergeTask" - renames, warnings fixed
Konstantin Kolosovsky [Fri, 21 Oct 2016 12:50:05 +0000 (15:50 +0300)]
svn: Refactored "BaseMergeTask" - renames, warnings fixed

5 years agosvn: Do not explicitly perform vfs refresh after "shelving before merge"
Konstantin Kolosovsky [Fri, 21 Oct 2016 12:17:46 +0000 (15:17 +0300)]
svn: Do not explicitly perform vfs refresh after "shelving before merge"

All necessary files are automatically refreshed after rollback by
"ShelveChangesManager.shelveChanges()" logic.

5 years agosvn: Save documents only once while shelving changes before merge
Konstantin Kolosovsky [Thu, 20 Oct 2016 14:14:09 +0000 (17:14 +0300)]
svn: Save documents only once while shelving changes before merge

5 years agosvn: Refactored "IntersectingLocalChangesPanel" - code simplified
Konstantin Kolosovsky [Thu, 20 Oct 2016 11:43:17 +0000 (14:43 +0300)]
svn: Refactored "IntersectingLocalChangesPanel" - code simplified

5 years agosvn: Refactored "LocalChangesPromptTask", "Intersection" - code simplified
Konstantin Kolosovsky [Thu, 20 Oct 2016 10:58:11 +0000 (13:58 +0300)]
svn: Refactored "LocalChangesPromptTask", "Intersection" - code simplified