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

(no message)

Browse Source
This commit is contained in:
Eugene Vigdorchik
2005-02-24 18:29:58 +03:00
parent 9ee28a7cda
commit 14f03f00b8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/com/intellij/refactoring/inline/InlineMethodProcessor.java
+3 -3
View File
@@ -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);
source/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java
+1 -1
View File
@@ -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);