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
82,196 Commits 34 Branches 10 Tags
2c371a6dcddcaadb9cb337eb66482f24f0f8f727
Commit Graph
82196 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anna Kozlova 2c371a6dcd NPE 2012-05-14 19:51:52 +04:00
Roman Shevchenko 4fcb275e55 Java 8: parse extension method bodies 2012-05-14 19:37:11 +04:00
Alexander Lobas d7e6e709c7 Merge remote-tracking branch 'origin/master' 2012-05-14 19:26:35 +04:00
Alexander Lobas c743997c7b RelativeLayout 2012-05-14 19:26:12 +04:00
irengrig 9ecf35ed48 Merge remote branch 'origin/master' 2012-05-14 18:37:44 +04:00
irengrig 33dc313b2b svn tree conflicts UI: prompt before resolve, balloon after resolve 
correction in what paths should be used for resolve
 2012-05-14 18:36:15 +04:00
irengrig db7df5e1d9 svn resolve tree conflicts test: check result files texts as well 2012-05-14 18:34:20 +04:00
irengrig b6e07ebee7 svn tree conflict resolver: 1) put local history labels when resolving to theirs of merge (to mine doesn't change files contents) 
2) change resolve logic (still not sure until svnkit bugs are fixed)
 2012-05-14 18:33:01 +04:00
Dmitry Avdeev 1fd99e39f8 IDEA-85700 Can't save settings in Inspections 2012-05-14 18:32:00 +04:00
Anna Kozlova 11e3c21180 force initial name in rename dialog 2012-05-14 18:27:43 +04:00
Anna Kozlova 2a03100cb3 suggest to rename constructor params when property name is the same (IDEA-85979) 2012-05-14 18:27:41 +04:00
Anna Kozlova fbd775fc8b do not include automatic renamer factories when they would be added automatically 2012-05-14 18:27:40 +04:00
Anna Kozlova 9fde625186 do not suggest to move to library (IDEA-86011) 2012-05-14 18:27:39 +04:00
Anna Kozlova 6711dfcac1 unused return value: ignore simple setters (IDEA-85981) 2012-05-14 18:27:38 +04:00
Anna Kozlova 7c6fc9901e do not reformat during undo 2012-05-14 18:27:36 +04:00
Bas Leijdekkers bc97766222 better fix for IDEA-85620 2012-05-14 15:55:41 +02:00
Dennis Ushakov dae40c57b3 #RUBY-10825 fixed 2012-05-14 17:53:11 +04:00
irengrig 2ea6580146 SVN: new svnkit version 
Build-Version: 1.7.4-v1-SNAPSHOT
Build-Number: r9201_v20120512_1501
 2012-05-14 17:38:21 +04:00
Dmitry Boulytchev 3cc5137367 Storage dum utility final commit (compile server). 2012-05-14 17:31:22 +04:00
Alexander Lobas de71edb785 Merge remote-tracking branch 'origin/master' 2012-05-14 16:26:13 +04:00
Alexander Lobas f6953ac843 RelativeLayout 2012-05-14 16:25:50 +04:00
Vassiliy Kudryashov 4114fcc49d IDEA-85611 Run configurations: impossible to delete the default Make 'before launch' goal 2012-05-14 16:14:40 +04:00
Evgeny Zakrevsky dd795f87f8 git integration. removing panel with "Git: Update". Tree of changes is busy during updating. 2012-05-14 15:39:08 +04:00
Evgeny Zakrevsky 398b070919 Indents in OptionsGroup 2012-05-14 15:39:07 +04:00
Dmitry Lomov 34f3d5c486 IDEA-85898 2012-05-14 13:35:23 +02:00
Dmitry Lomov 51ea19f1fa Merge branch 'upsource-master' 2012-05-14 13:24:58 +02:00
Danila Ponomarenko 8b0924027c Recursive call markers temporary turned off 2012-05-14 15:22:28 +04:00
Dmitry Boulytchev 7ab954ab1f Storage dum utility artifact (compile server). 2012-05-14 15:12:00 +04:00
Vassiliy Kudryashov d56caeb5a3 IDEA-85148 'Commit' dialog merged button tooltip is hard to invoke 2012-05-14 15:09:13 +04:00
Anna Kozlova 4879868fef package scope when package is inside package prefix should contain classes with "subnames" (IDEA-82937) 2012-05-14 14:41:27 +04:00
Anna Kozlova 9d25d530fb refactorings api: ability to define changed places (IDEA-85953) 2012-05-14 14:41:26 +04:00
Kirill Likhodedov 49f674d6a3 Fix @NotNull assertion in GitVcsPanel in tests 2012-05-14 14:31:48 +04:00
Dmitry Lomov bd706a1cda AbstractFileType fixes 2012-05-14 12:26:51 +02:00
Dmitry Lomov 3acfcaf592 Merge branch 'master' into upsource-master 2012-05-14 12:26:30 +02:00
Eugene Kudelevsky e0870a5237 do not filter list of attributes by context, because passed tag may have other namespace (ex. jspx tag) 2012-05-14 14:25:58 +04:00
Eugene Kudelevsky f48d454efe always close jar builder 2012-05-14 14:25:57 +04:00
nik f7d59e8358 reusing method from PsiTestUtil in tests 2012-05-14 14:13:28 +04:00
Maxim.Medvedev 58dce1256e fix npe 2012-05-14 14:04:41 +04:00
Dmitry Boulytchev a6e32320d6 Storage dum utility (compile server). 2012-05-14 13:59:06 +04:00
Danila Ponomarenko dd1d52b2f6 IDEA-86016 False positive 'Recursive call' line marker fix 2012-05-14 13:54:56 +04:00
Roman Shevchenko 70470e66f7 Java 8: 'none' isn't a keyword yet 2012-05-14 13:43:15 +04:00
Roman Shevchenko c583fbbeb6 Deprecate duplicate token sets; cleanup 2012-05-14 13:43:15 +04:00
Dmitry Lomov 4819c6dc9d Merge branch 'master' into upsource-master 2012-05-14 11:38:01 +02:00
Dmitry Lomov d2f6b5ed72 indexing-impl added to utils.gant 2012-05-14 11:36:10 +02:00
Denis.Zhdanov 913cfb3572 IDEA-19061 Integrate the Rearranger-plugin into core-IDEA 
Refactoring
 2012-05-14 13:19:13 +04:00
Denis.Zhdanov 32e9e62430 IDEA-19061 Integrate the Rearranger-plugin into core-IDEA 
*) green code policy;
*) naming convention for the RearrangerSettings fields;
 2012-05-14 13:19:13 +04:00
Denis.Zhdanov bd7be46de5 IDEA-19061 Integrate the Rearranger-plugin into core-IDEA 
*) IRule -> Rule;
*) IRuleInstance -> RuleInstance;
*) IFilePopupEntry -> FilePopupEntry;
 2012-05-14 13:19:12 +04:00
Denis.Zhdanov 6169cf7a3e IDEA-19061 Integrate the Rearranger-plugin into core-IDEA 
Initial bundling iteration. The changes to the initial version available at http://java.net/projects/rearranger/sources:
* switched from log4j to IJ logging;
* 'Rearranger' component is service now;
* plugin descriptor is adapted to the common IJ scheme (id, vendor etc);
* IJ project is configured to have new 'rearranger' module;
* build script is adjusted to process 'rearranger' plugin as well;
* almost all tests are commented and their refactoring is started;
 2012-05-14 13:19:12 +04:00
Dennis Ushakov 6f6eef2487 fix folding exception in haml 2012-05-14 11:03:24 +04:00
irengrig 1bed11eddd Merge remote branch 'origin/master' 2012-05-14 10:20:19 +04:00