Commit Graph
618 Commits
Author SHA1 Message Date
unknown f87d17b2a3 extract super class: check for conflicts under progress; skip check for superclass inheritors mismatch - as no actual members would go there 2010-07-05 14:55:33 +04:00
unknown 5b9cce7e4a push down conflicts: ensure no conflict exist when push method would use "protected" overrider 2010-07-05 14:55:32 +04:00
unknown 862c964a70 pull up conflicts: do not warn if moved method would use super instead (IDEA-56212) 2010-07-05 14:55:32 +04:00
Alexey Kudravtsev 959be8cf44 mockJDKs in ultimate killed, added mockJDK-1.4 to community 2010-07-02 14:23:04 +04:00
unknown d63f1f294e check for method type params inclusive (IDEA-56192) 2010-07-01 13:37:08 +04:00
Dmitry Jemerov 19561df92a correctly fix testdata after Max's incorrect changes 2010-07-01 12:35:13 +04:00
nik cea8b6666f test fixed 2010-07-01 12:00:14 +04:00
Maxim Shafirov 4a81558cff Fix testdata accidentially modified during scrollpane refactoring. 2010-06-30 14:00:51 +04:00
Maxim Shafirov d98fe01f6a Some unnecessary JScrollPane -> JBScrollPane conversions have been done, unrolling. 2010-06-29 22:25:58 +04:00
Maxim Shafirov b4caafd564 All scrollpanes replaces with JBScrollPane. 2010-06-29 17:36:03 +04:00
anna 57298b6cb2 introduce parameter: respect varargs when rise conflict on params count/args count mismatch (IDEA-56024) 2010-06-29 16:14:50 +04:00
anna d2576e4aea inline: do not warn about non existing write usages 2010-06-24 13:45:18 +04:00
anna 3b92192bdd extract class: mutate static methods, fields imports ( IDEA-55588 ) 2010-06-23 19:24:24 +04:00
anna 62cc6669be refactorings optimization: optimize imports extracted outof write action 2010-06-21 17:28:02 +04:00
anna bfc75928b9 NPE: check raw substitution during inline 2010-06-16 12:43:29 +04:00
anna 5b61215773 testdata fixed 2010-06-09 18:04:30 +04:00
anna ad87ed290e move as enum: strip enum qualifiers in case statements 2010-06-09 17:32:57 +04:00
anna a45cb23ea5 extract enum: do not migrate other constants to enum 2010-06-09 17:32:56 +04:00
anna bcdcfd764c extract enum: change types accordingly (switch cases) 2010-06-09 17:32:55 +04:00
irengrig 6c796f35e7 Merge branch 'master' of git.labs.intellij.net:idea/community 2010-06-08 16:56:28 +04:00
anna 48913eb2fe extract method: null checks should not miss final modifiers ( IDEA-55515 ) 2010-06-04 12:00:44 +04:00
anna 2504abd6be pull up: static class references should NOT be updated if that classe was pulled as well 2010-06-04 12:00:42 +04:00
anna 563dc867cc replace constructor with builder: qualify references ( IDEA-55476 ) 2010-06-04 12:00:38 +04:00
Roman Shevchenko c6632e8517 IntroduceFieldInSameClassTest fix (migrated to 1.5 mock JDK) 2010-06-03 20:53:28 +04:00
anna 863fbfddb8 extract enum ( IDEA-11228 ) 2010-06-03 12:39:42 +04:00
anna a4b700a126 rename: qualify to avoid undiagnosed shadowing ( IDEA-20634 ) 2010-06-03 12:39:39 +04:00
anna 941142b346 introduce field: extract error expression on class level ( IDEA-41570 ) 2010-06-03 12:39:38 +04:00
anna feda077bb7 inline variable: captured wildcard != wildcard so isAssignable should be used in order to avoid redundant class casts (IDEA-27243); though isAssignable can't replace equals as for primitive types cast can change expr semantics, e.g. (float)intVar1/intVar2 2010-06-03 12:39:37 +04:00
Maxim Medvedev 5d39963fa8 Merge branch 'master' into changeSignature 2010-06-01 09:45:59 +04:00
anna dda3a86763 testdatafixed 2010-05-31 20:21:45 +04:00
anna 3f3d8329ed replace method duplicates: qualified/unqualified static access ( IDEA-23412 ) 2010-05-31 19:33:23 +04:00
anna 40d73b7c32 replace method duplicates: qualify with super instead of this when method is located in the base class ( IDEA-21753 ) 2010-05-31 19:33:22 +04:00
anna 6283165ab2 find method duplicates: match super expressions ( IDEA-45118 ) 2010-05-31 19:33:21 +04:00
Kirill Likhodedov 275f48c7ce Merge branch 'master' of git.labs.intellij.net:idea/community 2010-05-31 19:21:04 +04:00
anna aa48a3ee1d do not rise conflict on type parameter rename ( IDEA-55362 ) 2010-05-31 15:22:16 +04:00
anna 67ef43adcc find method duplicates: correct this according to the replacement place ( IDEA-22960 ) 2010-05-31 13:07:34 +04:00
Maxim Medvedev 9b56725bd0 fixes & tests 2010-05-30 17:28:36 +04:00
Maxim Medvedev 06dc46d6cd Merge branch 'master' into changeSignature 2010-05-29 17:23:45 +04:00
anna 9e165bcd23 do not treat usages of constructor as non-code (although !reference.isResolvedTo(element) as reference resolves to the constructor's class) 2010-05-27 20:00:10 +04:00
Maxim Medvedev 5db1013634 Merge commit 'origin/master' into changeSignature 2010-05-26 14:31:15 +04:00
anna dd2b032223 expected types should take into account output values
( IDEA-44946,  IDEA-44982,  IDEA-44983,  IDEA-45034)
2010-05-26 13:28:41 +04:00
anna c1db7b9edc introduce variable: suppose that params are equivalent if they have the same name and types were already checked (IDEA-41074) 2010-05-26 13:28:39 +04:00
anna 5c6d20dc4e extract method: do not declare variables after call with local class defined in extracted method (IDEA-46775) 2010-05-26 13:28:38 +04:00
anna 6806c16bfd method duplicates: qualify match in order to prevent name conflict ( IDEA-24764 ) 2010-05-26 13:28:38 +04:00
anna abfb0af852 safe delete: enable on local variables; treat side effects as conflicts ( IDEA-17366 ) 2010-05-26 13:28:35 +04:00
Maxim Medvedev b11b8c7b86 merge master 2010-05-21 17:39:25 +04:00
anna b594f2d5a7 introduce field: selected type should be used instead of local variable type 2010-05-21 11:40:03 +04:00
anna 6af63745e1 method duplicates: pass array 2 vararg method call ( IDEA-53635) 2010-05-21 10:03:11 +04:00
Denis Zhdanov dde1392157 IDEA-42167 Reformat code works wrong
Test data is revised in accordance with corrected algorithm
2010-05-20 15:12:31 +04:00
Denis Zhdanov 2434cb367f Merge branch 'master' of git@git.labs.intellij.net:idea/community 2010-05-17 10:25:12 +04:00