MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-05-06 05:10:22 +07:00
Code Issues Packages Projects Releases Wiki Activity

AIOOBE

Browse Source
This commit is contained in:
anna
2009-12-22 22:09:19 +03:00
parent df4a4ff122
commit d7f916a812
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java
View File

@@ -675,17 +675,19 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor {
private void addParmAndThisVarInitializers(BlockData blockData, PsiMethodCallExpression methodCall) throws IncorrectOperationException {
PsiExpression[] args = methodCall.getArgumentList().getExpressions();
for (int i = 0; i < args.length; i++) {
int j = Math.min(i, blockData.parmVars.length - 1);
final PsiExpression initializer = blockData.parmVars[j].getInitializer();
LOG.assertTrue(initializer != null);
if (initializer instanceof PsiNewExpression && ((PsiNewExpression)initializer).getArrayInitializer() != null) { //varargs initializer
final PsiArrayInitializerExpression arrayInitializer = ((PsiNewExpression)initializer).getArrayInitializer();
arrayInitializer.add(args[i]);
continue;
}
if (blockData.parmVars.length > 0) {
for (int i = 0; i < args.length; i++) {
int j = Math.min(i, blockData.parmVars.length - 1);
final PsiExpression initializer = blockData.parmVars[j].getInitializer();
LOG.assertTrue(initializer != null);
if (initializer instanceof PsiNewExpression && ((PsiNewExpression)initializer).getArrayInitializer() != null) { //varargs initializer
final PsiArrayInitializerExpression arrayInitializer = ((PsiNewExpression)initializer).getArrayInitializer();
arrayInitializer.add(args[i]);
continue;
}
initializer.replace(args[i]);
initializer.replace(args[i]);
}
}
if (blockData.thisVar != null) {

6
java/java-tests/testData/refactoring/inlineMethod/StaticMethodWithoutParams.java Normal file
View File

@@ -0,0 +1,6 @@
class A{
static void <caret>foo(){}
static void bar(){
foo(666);
}
}

4
java/java-tests/testData/refactoring/inlineMethod/StaticMethodWithoutParams.java.after Normal file
View File

@@ -0,0 +1,4 @@
class A{
static void bar(){
}
}

4
java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java
View File

@@ -140,6 +140,10 @@ public class InlineMethodTest extends LightCodeInsightTestCase {
doTest();
}
public void testStaticMethodWithoutParams() throws Exception {
doTest();
}
@Override
protected Sdk getProjectJDK() {
return JavaSdkImpl.getMockJdk15("java 1.5");