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
89,993 Commits 34 Branches 10 Tags
a40a08d1d955d3d5138595da2dbb4f5cdaced2c2
Commit Graph
89993 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
anna a40a08d1d9 good code red: leave empty subst when processing type params supers (IDEA-67680) 2012-10-18 21:40:03 +02:00
anna fd9d1764e2 good code red: allow containing this before super call (IDEA-67756) 2012-10-18 21:40:03 +02:00
Dmitry Trofimov 14681adb9e Merge remote-tracking branch 'origin/master' 2012-10-18 21:33:47 +02:00
Gregory.Shrago 71328e44bd IDEA-92339 Database Console Copy as HTML improvement 2012-10-18 23:19:44 +04:00
andrey.zaytsev 9188442150 IDEA-92435, IDEA-91516, IDEA-91890 2012-10-18 21:55:43 +04:00
anna b87a66990c nullable problems: do not suggest to annotate as @Nullable when parameter is referenced (IDEA-93083) 2012-10-18 19:36:59 +02:00
anna 7bf48f5252 eclipse: cleanup model (IDEA-91002) 2012-10-18 19:36:58 +02:00
Eugene Zhuravlev fedf3fff7a - Artifact roots are not marked as "generated sources". 
- To properly mark artifact sources as up-to-date, compilation-start timestamp is advanced for every chunk/group of chunks before starting compilation
 2012-10-18 19:15:47 +02:00
peter 1b4658481e iterate dirty scope using actual vfs 2012-10-18 18:40:02 +02:00
peter 871f5378f0 catch ProcessCanceledException during changes update 2012-10-18 18:40:02 +02:00
peter af67001e72 FileHolder.toString 2012-10-18 18:40:01 +02:00
peter 6f02677679 validity assertions (EA-39252) 2012-10-18 18:40:01 +02:00
peter 932362f7e7 validity assertions (EA-39233) 2012-10-18 18:40:01 +02:00
peter a630a8ba74 validity assertions (EA-38796) 2012-10-18 18:40:01 +02:00
Dmitry Lomov f9eac4cc26 Merge branch 'master' of git.labs.intellij.net:idea/community 2012-10-18 18:29:19 +02:00
Dmitry Lomov e73492cd2b Code tolerates null ProgressIndicatorProvider 2012-10-18 18:28:34 +02:00
Vassiliy Kudryashov 7f389c0adc Merge remote-tracking branch 'origin/master' 2012-10-18 20:20:38 +04:00
Vassiliy Kudryashov 9d8fc403ab IDEA-90515 Editor tab dragged by dragging Configuration Menu pop-out items 2012-10-18 20:19:51 +04:00
Kirill Likhodedov cbc7614e09 IDEA-93113 Don't show incoming changes and warn about outdated version if incoming changes are not supported by the VCS committed changes provider. 2012-10-18 20:14:57 +04:00
Bas Leijdekkers a2be6066cf IDEA-92967 (Inspections / Imports / Unused Import: superfluous warning with both static and non-static elements importing) 2012-10-18 17:51:01 +02:00
irengrig f1a47ab52a Merge remote branch 'origin/master' 2012-10-18 19:46:59 +04:00
irengrig 8e5597b7ab vcs server: tests and queries for time and subfolder limitations. 
started [not completed] incoming queries.
added a field to track Subversion-style directory renames (paths under renamed are not registered explicitly, but we need to keep them in our DB)
 2012-10-18 19:44:53 +04:00
anna 4132017a0b move: do not search for usages if new fqn equals to old one (IDEA-92029) 2012-10-18 17:30:56 +02:00
anna bfef30ff03 extract method: do not fold params by default when they are used inside conditional stmts (IDEA-92815) 2012-10-18 17:30:55 +02:00
anna 40b110e84c load debugger manager for default project 2012-10-18 17:30:54 +02:00
anna 9a5a91c3d2 search for main methods also in bases (IDEA-92968) 2012-10-18 17:30:54 +02:00
Bas Leijdekkers 7e449939b8 cleanup 2012-10-18 17:28:29 +02:00
Bas Leijdekkers f571b046a5 cleanup and test 2012-10-18 17:22:49 +02:00
Alexey Kudravtsev 8cdc222c5e visual appeal of dataflow grouped values 2012-10-18 19:04:06 +04:00
Alexey Kudravtsev 96e707004b notnull 2012-10-18 19:04:06 +04:00
Alexey Kudravtsev da4c1d7b34 notnull 2012-10-18 19:04:05 +04:00
Alexey Kudravtsev 8745440c6d EA-40104 - CME: THashIterator.nextIndex 2012-10-18 19:04:04 +04:00
Konstantin Bulenkov bf5afba8da Merge remote-tracking branch 'origin/master' 2012-10-18 16:56:21 +02:00
Konstantin Bulenkov 5d678cc1aa some fixes for new wizard 2012-10-18 16:55:03 +02:00
Eugene Kudelevsky 19ce2639d9 android xml code style notifier 2012-10-18 18:48:26 +04:00
Kirill Likhodedov c1dbaf642a imports 2012-10-18 18:38:28 +04:00
Nadya.Zabrodina da800e2bfe IDEA-64887 Mercurial: change dialog that appears on deleted-modified conflict - merge case added 2012-10-18 18:18:30 +04:00
Kirill Likhodedov 04126e4be6 GitBranch.equals(): simplify, allow subclasses, add null-check to the super.equals 2012-10-18 17:54:01 +04:00
Kirill Likhodedov 5a04d05c4a GitRepositoryReader: fix hash values used for branches. 
1. manually add packed branches one-by-one, to avoid the log-error from GitBranch.equals().
   We want to keep this log-error to catch possible programmer mistakes.
   The algorithm is less efficient, but that shouldn't be a problem because even a thousand of branches seem to be an impossible case.

2. trim() hash values so they don't contain \n at the end.

3. read hash value if repository is rebasing.
 2012-10-18 17:54:00 +04:00
Kirill Likhodedov d3dd748fe7 GitBranch refactoring: encapsulate hash into Hash object; assert in equals 
Introduce the Hash class - encapsulation of the Git hash. To be used everywhere instead of Strings.

The GitBranch constructor calls have been updated, however, getHash() has been left intact for now, and still returns String.
There are several creations of the GitBranch object that don't know the hash of the branch at the time of creation. They use DUMMY_HASH object, but this is to be fixed in the future.

GitBranch.equals still relies just on the name, but now it LOGs an error if two branches with equal names have different hashes, which means that one of the instances is out-of-date.

Added a javadoc to GitBranch.
 2012-10-18 17:54:00 +04:00
Kirill Likhodedov fcbe916dd4 GitReference.equals(): use getFullName() instead of toString() 
The latter may change and may contain debug information and so on.
 2012-10-18 17:53:59 +04:00
Kirill Likhodedov 6c4b6af547 GitReference: better javadocs, style 2012-10-18 17:53:59 +04:00
Kirill Likhodedov 32a59dc39f [git tests] deprecation 2012-10-18 17:53:58 +04:00
Kirill Likhodedov da58fc9222 GitBranch: remove dead code 2012-10-18 17:53:58 +04:00
Kirill Likhodedov 602edc29aa GitBranch: move methods to get the tracking branch to GitBranchUtil, deprecate them. 2012-10-18 17:53:57 +04:00
Kirill Likhodedov e171fdf684 GitBranch: move getMergeBase to the only class using it 2012-10-18 17:53:56 +04:00
Kirill Likhodedov dc14e60134 GitBranch: remove the "active" parameter, because it is not used. 
isActive() is not used anywhere => setActive and constructor parameter can be safely removed.
Btw, there is GitRepository#getCurrentBranch
 2012-10-18 17:53:56 +04:00
Kirill Likhodedov 9e3fc964b6 [git] Remove deprecated code from GitBranch 
GitBranch.current(), list(), listAsStrings(): substitute to GitRepository framework.
Introduce GitBranchUtil.getCurrentBranch() for those cases where GitRepository is not used yet, not to repeat myself with retrieving the instance of GitRepository each time.

Preserve listAsStrings in LowLevelAccessImpl, because --contains is needed there. But refactor it to return the list of branches instead of filling  once of the parameters.

Remove some dead code.
 2012-10-18 17:53:54 +04:00
Kirill Likhodedov f278451a68 [git tests] prepareRemoteRepo(): rename, let it possible to specify target repository and the name of the remote. 2012-10-18 17:53:54 +04:00
Kirill Likhodedov 51584265e1 [git tests] GitExecutor: make myCurrentDir static 
Otherwise mixing GitExecutor to several classes taking part in a single test would result in different current directory values.
 2012-10-18 17:53:53 +04:00