Commit Graph
195591 Commits
Author SHA1 Message Date
Egor.Ushakov b0aeeed567 EA-101403 - Throwable: ExceptionUtil.currentStackTrace 2017-05-17 20:09:57 +03:00
Yann Cébron 051a31d28e IDEA-166505 DOM: support more builtin converters 2017-05-17 19:06:09 +02:00
Egor.Ushakov b87c41269a IDEA-172772 Action "Resume program" is not available when IDEA is updating indexes 2017-05-17 20:00:59 +03:00
Vladislav.Soroka 7189297a08 external system import builder should take into account reused existing modules 2017-05-17 19:49:46 +03:00
Dmitry Batkovich 1426fb2cb6 PreferMostUsed weigher: push down the weigher after proximity 2017-05-17 19:26:00 +03:00
Egor.Ushakov d2d43506a6 EA-97500 - NPE: ToStringRenderer.overridesToString 2017-05-17 19:15:09 +03:00
Aleksey Pivovarov e6a24a9909 git: remove unused parameter 2017-05-17 18:57:23 +03:00
Aleksey Pivovarov 33c520e7b0 vcs: @Deprecate createFilePathOnDeleted method
* it is not different from createFilePath
2017-05-17 18:57:23 +03:00
Aleksey Pivovarov ca93c5ec36 vcs: remove unused deprecated method 2017-05-17 18:57:23 +03:00
Aleksey Pivovarov 685d6d6842 vcs: @NotNull 2017-05-17 18:57:23 +03:00
Aleksey Pivovarov c7ce73a82e vcs: remove unused method 2017-05-17 18:57:23 +03:00
Aleksey Pivovarov 19e567607a vcs: remove SVN specific getters from common class 2017-05-17 18:57:23 +03:00
Yann Cébron 9b643f388a [devkit] Cleanup/align/format inspection descriptions 2017-05-17 17:55:55 +02:00
Anton Tarasov 96ef3e613a Fix DeferredIconImpl super class, and some refactoring
This fixes wrong scaling of DeferredIconImp via IconUtil.scale(..)
2017-05-17 18:22:25 +03:00
Bas Leijdekkers f62ab7deaa SSR: fix test 2017-05-17 16:58:38 +02:00
Bas Leijdekkers 3a74c47d57 IPP: handle incomplete code better 2017-05-17 16:58:38 +02:00
Bas Leijdekkers 65af085484 IPP: NPE fix (EA-98815) 2017-05-17 16:58:38 +02:00
Dmitry Batkovich 0c4bb15a60 inspection settings: increase additional padding on mac os (similar to plugin table) 2017-05-17 17:38:53 +03:00
Dmitry Batkovich bf18b79ced Revert: inspection settings: move checkboxes in inspection tree to the left side (because poor mac os users have transparent scroll bar) 2017-05-17 17:38:52 +03:00
Nadya Zabrodina d73487e6a5 [patch]: cleanUp - method rearrangement 2017-05-17 17:23:14 +03:00
Nadya Zabrodina 96dd1c74ad [patch]: refactoring
* make ApplyPatchForBaseRevisionTexts.java immutable;
* remove Warning list from ApplyPatchForBaseRevisionTexts, use LOG.warn;
* extract applying onto baseContent, found base, local as methods;
* do not apply patch onto wrong base someHow: if base is presented then
patch has to be applied exactly otherwise -> warn;
2017-05-17 17:23:12 +03:00
Nadya Zabrodina 263ce7232a [patch]: cleanUp - method refactoring 2017-05-17 17:23:11 +03:00
Nadya Zabrodina d58e85fe25 [patch]: change CharSequence to String, cleanUp, add annotations 2017-05-17 17:23:10 +03:00
Nadya Zabrodina 264852ffc1 [diff]: rename class 2017-05-17 17:23:08 +03:00
Nadya Zabrodina 80285fd1ee [shelf]: rename and convert to interface DiffPreviewUpdateProcessor 2017-05-17 17:23:07 +03:00
Nadya Zabrodina 975b9668b0 [shelf]: add reentrantLock for accessing patch info data from cache 2017-05-17 17:23:05 +03:00
Nadya Zabrodina 6f17ebb857 [shelf]: remove useless FilePath refresh 2017-05-17 17:23:04 +03:00
Nadya Zabrodina 2e6103bbeb [shelf]: create wrapper and implement shelved preview for binaries
* update preview if patchFile changed;
2017-05-17 17:23:03 +03:00
Nadya Zabrodina c19201cb24 [shelf]: cleanUp - extract methods, add annotations, add timeStamp info
* introduce PatchInfo class to store timestamp for last patch parsing;
* change cached loaded patches map types to accept PatchInfo as a value;
* extract isPatchFileChangedOrNotLoaded method for future usages;
2017-05-17 17:23:02 +03:00
Nadya Zabrodina 3a895e21e7 [shelf]: change patch PreLoader storage map to SoftHardCacheMap 2017-05-17 17:23:02 +03:00
Nadya Zabrodina 834ce64151 [shelf]: rename class and set preview toggle state according to setting 2017-05-17 17:23:01 +03:00
Nadya Zabrodina 52b099b6db [diff]: ability to provide custom panel title for patch diff request 2017-05-17 17:23:00 +03:00
Nadya Zabrodina 3023956a97 [shelf]: cleanUp - extract binary content revision creation 2017-05-17 17:22:59 +03:00
Nadya Zabrodina ff2a979ab8 [shelf]: fix annotation 2017-05-17 17:22:58 +03:00
Nadya Zabrodina a53d267096 [shelf]: implement shelf preview for text shelved changes;
* add action on the toolbar;
* now preview wouldn't be changed if shelved patch file was changed;
* todo: need to Implement wrapped for properly refresh and implement
 for binary shelved files also;
2017-05-17 17:22:57 +03:00
Nadya Zabrodina e593d4dff9 [diff]: move toggle diff preview action into separated class 2017-05-17 17:22:56 +03:00
Nadya Zabrodina 20ad59ddbb [diff]: move preview panel with horizontal splitter into separated class
* create common refreshable diff processor class, rename method
* add javadoc for refreshable RequestProcessor
2017-05-17 17:22:55 +03:00
Nadya Zabrodina be35049bde [patch]: create patch content viewer and diff tool
* show patch content as a diff if no local file was found
 for shelved change (IDEA-166238, IDEA-155689);
2017-05-17 17:22:54 +03:00
Nadya Zabrodina 8b481db96f [diff]: remove hacky code with write-once document and add WriteAction 2017-05-17 17:22:53 +03:00
Nadya Zabrodina 570528accd [diff]: move scrollToChange method implementation to its base class 2017-05-17 17:22:52 +03:00
Nadya Zabrodina 7984542877 [patch]: cleanUp - make proper diff title capitalization 2017-05-17 17:22:51 +03:00
Nadya Zabrodina 27901e20aa [shelf]: implement show diff and show diff with local from shelvedView
* for new and deleted files get content directly from patch/local file;
* for modified files:
  - try to detect base if base found show diff local or base with
   patch applied on base;
  - if no base detected then show diff with local and patch applied
   to local (maybe somehow);
2017-05-17 17:22:50 +03:00
Nadya Zabrodina 2649c411a4 [patch]: rename method
* add an ability to get single hunk text for any single hunk patches,
 e.g. deleted, new files changes
2017-05-17 17:22:49 +03:00
Nadya Zabrodina c77c624dcb [diff]: add an ability to show diff notifications in PatchDiffViewer
* change DiffContext to UserDataHolder in getCustomNotifications method;
* make ApplyPatchDiffRequest extends UserDataHolder;
2017-05-17 17:22:48 +03:00
Nadya Zabrodina 3f0a6dea63 [patch]: cleanUp - change Result diff content panel title to Current 2017-05-17 17:22:47 +03:00
Nadya Zabrodina 2d3041c2dc [patch]: get rid of Getters, remove unnecessary invokeAndWait 2017-05-17 17:22:46 +03:00
Nadya Zabrodina 5f0ed26635 [patch]: add an ability to call getBaseVersionContent from any Thread
* use Task.WithResult instead of VcsUtil.runVcsProcessWithProgress which
 is EDT required method;
* optimize try/catch blocks;
* add annotation;
2017-05-17 17:22:45 +03:00
Nadya Zabrodina 06a7e1d503 [shelf]: do not load history if the base texts are already inside patch 2017-05-17 17:22:44 +03:00
Nadya Zabrodina 140109f1eb [shelf]: annotate as Nullable 2017-05-17 17:22:43 +03:00
Nadya Zabrodina d06642558c [shelf]: cleanUp and lambdify 2017-05-17 17:22:42 +03:00