MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity
211,774 Commits 16 Branches 7 Tags
16410c23210fca86f67fcc5357482d23c9c84d4b
Commit Graph

177 Commits

Author SHA1 Message Date
nik
16410c2321 IDEA project configuration: the great module rename 
Rename all modules in IntelliJ IDEA sources to ensure that they follow a consistent naming scheme.

Rename iml files.
 2018-01-25 12:59:02 +03:00
Aleksey Pivovarov
57dcc3624c dir-diff: do not allow to override separator in DiffElement 
* custom separators are never used anyway
* mutable `getPath()` can potentially lead to troubles

This is a better fix for 91482cb5a8
 2017-12-19 15:05:26 +03:00
Alexey Kudravtsev
e07afa8f5c Date/Time in javadocs considered useless for readability 2017-12-06 15:11:04 +03:00
nik
123d1b29be project configuration: improve 'Convert to Repository Library' action 
Hide 'Synchronize' actions in 'Library Diff' dialog (it makes no sense because content of a repository library cannot be modified).
 2017-11-23 16:56:37 +03:00
Aleksey Pivovarov
ca282c5d08 diff: extract base class for DiffRequestChain 2017-10-12 17:32:26 +03:00
Julia Beliaeva
ff689ab695 [file-history] invert colors in 3 panel diff for merge commits 2017-10-03 18:40:04 +03:00
Aleksey Pivovarov
67ca05f306 IDEA-178618 dir-diff: use null instead of default project 
this commit reverts e9e28e9787
 2017-09-11 20:13:25 +03:00
Aleksey Pivovarov
e663031806 IDEA-101502 diff: ignore line separators AND encoding 
follow-up: 523cc17acc
 2017-09-07 17:08:55 +03:00
Kirill Likhodedov
226679d0b9 Remove unnecessary throws declaration in VCS modules 2017-08-30 10:49:14 +03:00
Gregory.Shrago
095c5fd8e4 dir-diff: introduce Promise-based AsyncDiffElement & cleanup 2017-08-25 07:57:16 +03:00
nik
5a78ddad8d diff viewer: allow passing custom DirDiffSettings 
This is needed for example to disable file choosers in a particular DiffRequestPanel.
 2017-07-27 16:29:42 +03:00
Aleksey Pivovarov
89d40e8d71 merge: remove duplication 2017-07-23 00:13:07 +03:00
Aleksey Pivovarov
f31b86179e diff: unify error messages 2017-07-17 13:03:58 +03:00
Aleksey Pivovarov
6f996ef063 EA-104729 - IAE: ErrorDiffRequest.<init> 2017-07-17 13:01:43 +03:00
Aleksey Pivovarov
523cc17acc IDEA-101502 diff: allow to ignore separators in directory diff 2017-07-13 16:16:26 +03:00
Aleksey Pivovarov
da0b4aa8af lst: pass highlight file to the diff context 2017-07-03 15:43:48 +03:00
Aleksey Pivovarov
7cd838ab09 WI-9088 dir-diff: unify mode description in "Compare Directories" and "Sync with Remote" 2017-06-22 17:18:12 +03:00
Aleksey Pivovarov
1f46d1e297 IDEA-171946 vcs: fix encoding issues in diff viewer for Local History 
* use CharsetToolkit to support BOM while decoding byte[]
* pass byte[] to the diff to show differences in encoding
 2017-05-10 18:44:36 +03:00
Aleksey Pivovarov
c50504ef49 diff: lambdify 2017-04-27 15:45:44 +03:00
Aleksey Pivovarov
f7618fd096 diff: DiffRequestFactory.getTitle accepts nulls 
follow-up: 5de57ee32d
 2017-04-15 00:40:16 +03:00
Shaverdova Elena
d5d053b41f IDEA-170909 Sync with Deployed Forgets Last Used "Compare By" Method 2017-04-04 16:22:45 +02:00
Aleksey Pivovarov
2274dbe17c diff: remove inner fragments from MergeLineFragment 2017-02-02 18:21:32 +03:00
Alexey Kudravtsev
ffc41b19b7 <code> replaced with {@code} 2016-12-08 19:42:17 +03:00
Alexey Kudravtsev
50199c13d9 do not self-wrap ProcessCanceledException to fix EA-92422 - AUCRRAE: ReadMostlyRWLock.throwIfImpatient 2016-12-06 12:14:17 +03:00
Anton Tarasov
b0737a9f3a [followup] IDEA-162563 Action menus do not have icons under HiDPI linux 
- New interface: JBUI.JBIcon. EmptyIcon now implements it.
- New method: JBUI.scale(JBIcon)
 2016-10-20 16:12:56 +03:00
Aleksey Pivovarov
68c34b9ef2 diff: rename getter 2016-10-18 17:02:56 +03:00
Aleksey Pivovarov
eda0021011 diff: cleanup - use consistent parameter order 2016-10-04 18:39:40 +03:00
Aleksey Pivovarov
0565a1dfaa diff: pass Project to DiffContentFactory methods 2016-10-04 18:39:39 +03:00
Aleksey Pivovarov
99f0307ba8 diff: cleanup 2016-10-04 18:39:39 +03:00
Aleksey Pivovarov
49c94dda7a diff: support BOM differences 2016-10-03 15:22:38 +03:00
Aleksey Pivovarov
b6473f4dfd diff: add default implementations for interface methods 2016-10-03 15:22:38 +03:00
Aleksey Pivovarov
0c4e942a7e EA-87991 EA-87365 diff: do not access Document outside of valid ranges 2016-09-05 19:45:20 +03:00
Aleksey Pivovarov
1499f3dab6 IDEA-141671 IDEA-160646 diff: generate better names for external tools 2016-09-01 14:38:51 +03:00
Aleksey Pivovarov
09295d4c0f vcs: do not use ServiceManager because Upsource might not support it 
* move patch builder into vcs-impl
* use own instance of ComparisonManagerImpl
 2016-07-25 20:53:39 +03:00
Aleksey Pivovarov
1dd2dccafe diff: move fragmented contents to api 2016-07-21 17:04:48 +03:00
Aleksey Pivovarov
fb107e6197 patch: use new diff api 2016-07-15 18:42:54 +03:00
Aleksey Pivovarov
ce738a91fd diff: use line+col instead of offset to navigate to editor 
* offset-based navigation is too confusing when local content differs from the compared one.
* replace OpenFileDescriptor with Navigatable
 2016-07-13 14:59:22 +03:00
Aleksey Pivovarov
ad396e7657 diff: move [*]Fragment conversions into ComparisonManager 
* make ByLine accept lines instead of texts
* simplify ByLine.Line creation
* remove diffSomehow methods
 2016-06-23 18:23:03 +03:00
Aleksey Pivovarov
1108f60d41 merge: compute conflict types on pooled thread 2016-05-24 18:48:56 +03:00
Aleksey Pivovarov
6e3d8650db patch: apply-somehow - rework dialog 
* make it more similar to the merge conflict resolve dialog
* allow editing in diff viewer
 2016-05-12 13:31:40 +03:00
Aleksey Pivovarov
c083fc6c38 vcs: History For Selection - do not reinstall valid DiffRequest on asynchronous update 
* fix possible data race if DiffRequestPanelImpl.setRequest() is called not from EDT
 2016-05-10 16:44:59 +03:00
Aleksey Pivovarov
258e6d6274 diff: diamondify 2016-04-28 12:53:45 +03:00
Aleksey Pivovarov
f76130cfdd diff: unified - keep caret position on content update 2016-04-20 19:39:15 +03:00
Aleksey Pivovarov
3159e7ec83 diff: simplify getting affected side by context 2016-03-03 18:10:48 +03:00
Aleksey Pivovarov
ec85e601d4 diff: do not expose Throwable.toString() to the user 
use getMessage() instead
 2016-02-12 16:53:31 +03:00
Aleksey Pivovarov
8ba0b26e5e diff: drop support of reusable by-line differences 2015-12-23 18:29:53 +03:00
Aleksey Pivovarov
e0fab2263e diff: use new diff viewers in DirDiff 2015-12-23 17:19:17 +03:00
Aleksey Pivovarov
71a7d2c57d diff: move DirDiff api to diff-api package 2015-12-23 17:19:17 +03:00
Aleksey Pivovarov
f2af97c09f diff: make DiffContent implement UserDataHolder 2015-12-23 15:05:12 +03:00
Aleksey Pivovarov
107f9786bf IDEA-139925 diff: fix rendering glitches at the end of file 
* pass lines instead of offsets to the highlighter
* do not respect "Rectangle range", passed from EditorGutter
 2015-12-02 14:27:50 +03:00