MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity
181,014 Commits 34 Branches 10 Tags
9849261daedd112b8aa577d24104ffb7174da217
Commit Graph
181014 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anna.Kozlova 9849261dae inline constructor: avoid javadoc references 
EA-89601 - UOE: InlineMethodProcessor$.inlineUsage
 2016-10-11 12:19:48 +02:00
Alexander Zolotov 3f59f22a23 Custom foldings: do not require common direct parent while grouping by regions 2016-10-11 13:10:36 +03:00
Vladislav.Soroka 42c1b97824 IDEA-162340 Diff for pom.xml: IAE at MavenParentProjectFileProcessor.process() 2016-10-11 12:35:50 +03:00
Alexander Zolotov 27da368711 Fix folding tests 2016-10-11 11:55:19 +03:00
Daniil Ovchinnikov b08aa2994d [groovy] support AutoClone copy constructor and simple styles (IDEA-134714) 2016-10-11 11:39:16 +03:00
Anna.Kozlova 41c2429966 new inference: postpone unresolved variables in favor to variables with proper equals bound 2016-10-11 10:27:29 +02:00
Dmitry Batkovich 80c888528e inspection view: npe in preview editor while folding append EA-89543 2016-10-11 10:16:09 +03:00
Gregory.Shrago 23ed6a22fc fix getContentScope() 2016-10-11 05:40:37 +03:00
Dmitry Trofimov 8940884149 Revert to Tool Window API 2016-10-11 04:29:44 +02:00
Dmitry Trofimov f7bf6567ec Fix Django console to work with the refactored Python console from #PR444 2016-10-11 04:29:27 +02:00
Dmitry Trofimov 1f06bd6663 Merge branch 'multiline-console' of https://github.com/fitermay/intellij-community into traff/console-rework4 2016-10-11 04:27:08 +02:00
Dmitry Trofimov a5d99f602a Revert to avoid conflicts. 
(cherry picked from commit 18058b47ea38b55969e85d23d267d35cc035786a)
 2016-10-11 04:26:53 +02:00
Dmitry Trofimov ea6972d9a8 Terminal shell integration with zsh 2016-10-11 04:14:51 +02:00
Dmitry Trofimov 57c8c3265e Default to /bin/sh if /bin/bash is absent 2016-10-11 04:14:51 +02:00
Dmitry Trofimov 02de2e3346 First try to find /bin/bash 
/bin/sh on Linux is not the same.
 2016-10-11 04:14:51 +02:00
Dmitry Trofimov 5f705629f4 Fix shell script syntax 2016-10-11 04:14:51 +02:00
Gregory.Shrago 5528e1155b employ UserDataHolderEx#putUserDataIfAbsent if available 2016-10-11 04:55:51 +03:00
Gregory.Shrago 2fecb4b0fc introduce predefined ProjectScope#getEverythingScope 2016-10-11 04:31:41 +03:00
Konstantin Kolosovsky 1e291e5e57 IDEA-133398 Do not use "--reintegrate" for merging with svn 1.8+ clients 
svn 1.8+ clients automatically detect if reintegrate merge should be
performed.
 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky 0fbf03256f svn: Use automatic sync/reintegrate merges if merge info is supported 
Do not specify certain revisions for "Merge All" operation if merge info
is supported - svn detects necessary revisions and performs
corresponding merge operation automatically.
 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky be51cac86d svn: merge: Optimized branch copy point calculation performance 
Utilized "svn log --stop-on-copy" behavior instead of analyzing all svn
repository history
 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky 2e2a5ebb22 svn: Refactored "FirstInBranch" - used "SVNURL" instead of "String" 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky 9e3ac5b3e9 svn: Refactored "WorkingCopyFormat" - code simplified 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky 9386416f1a svn: Refactored "MergeCalculatorTask" - do not check if merge info is supported 
It is already checked in "CheckRepositorySupportsMergeInfoTask".
 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky 6c91a46fff svn: Refactored "LocalChangesPromptTask" - removed "myCopyPoint" field 
Change lists passed to the task are all obtained from merge source
branch. So we should just utilize url of this branch when calculating
relative paths.
 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky 0ce5f59977 svn: Refactored "LocalChangesPromptTask" - code simplified 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky 9e9f3424eb svn: Refactored "FirstInBranch" - code simplified 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky 5b1d3e0682 vcs: Removed unused "ThreadSafeTransparentlyFailedValue" 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky b82854e3c6 svn: Extracted "LookForBranchOriginTask", utilized it in quick merge 
"LookForBranchOriginTask" is extracted from previously used
"SvnBranchPointsCalculator.getFirstCopyPointTask()" logic
 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky e900069b85 svn: Moved "MergeCalculatorTask.myMergeChecker" preparation to pooled thread 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky a14a30f72f svn: Refactoring - removed "ContinuationContext" method parameter from quick merge tasks 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky 3c1e43b53b svn: Refactored "SvnBranchPointsCalculator" - code simplified 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky 1685c53a4a Removed unused "ValueHolder" interface 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky af19e6fc86 svn: Refactored "SvnBranchPointsCalculator" - removed "myCache" field 
Utilized "getBestHit()" and "persist()" directly
 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky 7bcdfe9ec7 svn: Refactoring - inlined "PersistentHolder" logic to "SvnBranchPointsCalculator" 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky 2b2765b4e4 svn: Refactored "SvnBranchPointsCalculator.PersistentHolder" - code simplified 
"myPersistentMap" already provides stored data as "TreeMap". So we just
utilize it instead of implementing same logic using separate
"myForSearchMap".
 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky 140f5965c6 svn: Unified quick merge errors displaying 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky 89feb50e83 svn: Refactored "GeneralRunner", "SeparatePiecesRunner" and "TaskDescriptor" 
Code simplified
 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky 289f68e966 svn: Removed unused methods from "ContinuationContext" and implementations 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky a6f550b59b svn: Removed unnecessary "Continuation" and tests 
Used "SeparatePiecesRunner" directly
 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky e77d7053fe svn: Made "LoadRecentBranchRevisions" and "ShowRevisionSelector" extend "BaseMergeTask" 
Code simplified
 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky f97ff5f6bc svn: Refactored "BaseMergeTask" and inheritors 
* Used single "QuickMerge" constructor parameter instead of 2 separate
"MergeContext" and "QuickMergeInteraction" parameters
* Code simplified, warnings fixed, @NotNull
 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky e7ba0f7c78 svn: Refactored "QuickMerge" - code simplified 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky a32e8c0ab3 svn: Refactored "SvnQuickMergeTest" - removed duplication 
Reused common "wait for quick merge completion" logic
 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky 12d04d00f9 svn: Removed unnecessary "MergeDialogI" interface 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky c6e03dc98e svn: Moved "load more change lists" logic directly to "ToBeMergedDialog" 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky acacaef803 svn: Refactored "QuickMergeInteractionImpl" - code simplified 
Updated corresponding "QuickMergeInteraction" interface methods
 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky 8cc5e9bf08 svn: Refactored "QuickMergeInteraction" - @NotNull 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky 6455b1d78e svn: Removed unnecessary "QuickMergeInteraction.showError()" 
Utilized "QuickMergeInteraction.showErrors()" instead
 2016-10-11 04:28:23 +03:00
Konstantin Kolosovsky 3aca4d55bb svn: Refactored "QuickMergeTestInteraction" and inheritors 2016-10-11 04:28:23 +03:00