From 14f03f00b89ca590f8fb586ac5eb7f7d501eddca Mon Sep 17 00:00:00 2001 From: Eugene Vigdorchik Date: Thu, 24 Feb 2005 18:29:58 +0300 Subject: [PATCH] (no message) --- .../intellij/refactoring/inline/InlineMethodProcessor.java | 6 +++--- .../refactoring/move/moveInner/MoveInnerProcessor.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/com/intellij/refactoring/inline/InlineMethodProcessor.java b/source/com/intellij/refactoring/inline/InlineMethodProcessor.java index 8dfcb5f2c41d..ae459ccc559d 100644 --- a/source/com/intellij/refactoring/inline/InlineMethodProcessor.java +++ b/source/com/intellij/refactoring/inline/InlineMethodProcessor.java @@ -464,7 +464,7 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor { String resultName = null; if (returnType != null && returnType != PsiType.VOID) { resultName = myCodeStyleManager.propertyNameToVariableName("result", VariableKind.LOCAL_VARIABLE); - resultName = myCodeStyleManager.suggestUniqueVariableName(resultName, block.getFirstChild(), true); + resultName = myCodeStyleManager.suggestUniqueVariableName(resultName, block.getLBrace(), true); PsiDeclarationStatement declaration = myFactory.createVariableDeclarationStatement(resultName, returnType, null); declaration = (PsiDeclarationStatement)block.addAfter(declaration, null); resultVar = (PsiLocalVariable)declaration.getDeclaredElements()[0]; @@ -479,7 +479,7 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor { name = myCodeStyleManager.variableNameToPropertyName(name, VariableKind.PARAMETER); name = myCodeStyleManager.propertyNameToVariableName(name, VariableKind.LOCAL_VARIABLE); if (!name.equals(parmName)) { - name = myCodeStyleManager.suggestUniqueVariableName(name, block.getFirstChild(), true); + name = myCodeStyleManager.suggestUniqueVariableName(name, block.getLBrace(), true); } RefactoringUtil.renameVariableReferences(parm, name, GlobalSearchScope.projectScope(myProject)); String defaultValue = CodeInsightUtil.getDefaultValueOfType(parm.getType()); @@ -501,7 +501,7 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor { String[] names = myCodeStyleManager.suggestVariableName(VariableKind.LOCAL_VARIABLE, null, null, thisType) .names; thisVarName = names[0]; - thisVarName = myCodeStyleManager.suggestUniqueVariableName(thisVarName, block.getFirstChild(), true); + thisVarName = myCodeStyleManager.suggestUniqueVariableName(thisVarName, block.getLBrace(), true); PsiExpression initializer = myFactory.createExpressionFromText("null", null); PsiDeclarationStatement declaration = myFactory.createVariableDeclarationStatement(thisVarName, thisType, initializer); diff --git a/source/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java b/source/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java index d7d6f2e87eb1..9d193efe8b4b 100644 --- a/source/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java +++ b/source/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java @@ -160,7 +160,7 @@ public class MoveInnerProcessor extends BaseRefactoringProcessor { } newClass = (PsiClass)newClass.replace(myInnerClass); if (defaultDocComment != null && myInnerClass.getDocComment() == null) { - newClass.addBefore(defaultDocComment, newClass.getFirstChild()); + newClass.addAfter(defaultDocComment, null); } newClass.getModifierList().setModifierProperty(PsiModifier.STATIC, false);