azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: rename

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-05-15 12:52:22 +03:00
parent b9a45172c8
commit b6e885ba84
2 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignature.kt
+2 -3
View File
@@ -78,12 +78,11 @@ public class JetChangeSignature(project: Project,
if (configuration.performSilently(affectedFunctions) if (configuration.performSilently(affectedFunctions)
|| ApplicationManager.getApplication()!!.isUnitTestMode()) { || ApplicationManager.getApplication()!!.isUnitTestMode()) {
JetChangeSignatureDialog.createRefactoringProcessor( JetChangeSignatureDialog.createRefactoringProcessorForSilentChangeSignature(
project, project,
commandName ?: ChangeSignatureHandler.REFACTORING_NAME, commandName ?: ChangeSignatureHandler.REFACTORING_NAME,
adjustedDescriptor, adjustedDescriptor,
defaultValueContext defaultValueContext
).run() ).run()
} }
else { else {
@@ -131,6 +130,6 @@ TestOnly public fun createChangeInfo(project: Project,
val adjustedDescriptor = jetChangeSignature.adjustDescriptor(declarations) ?: return null val adjustedDescriptor = jetChangeSignature.adjustDescriptor(declarations) ?: return null
val processor = JetChangeSignatureDialog.createRefactoringProcessor(project, "", adjustedDescriptor, defaultValueContext) as JetChangeSignatureProcessor val processor = JetChangeSignatureDialog.createRefactoringProcessorForSilentChangeSignature(project, ChangeSignatureHandler.REFACTORING_NAME, adjustedDescriptor, defaultValueContext) as JetChangeSignatureProcessor
return processor.getChangeInfo() return processor.getChangeInfo()
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureDialog.java
+20 -24
View File
@@ -50,7 +50,6 @@ import com.intellij.util.ui.table.JBTableRow;
import com.intellij.util.ui.table.JBTableRowEditor; import com.intellij.util.ui.table.JBTableRowEditor;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.kotlin.descriptors.Visibilities; import org.jetbrains.kotlin.descriptors.Visibilities;
import org.jetbrains.kotlin.descriptors.Visibility; import org.jetbrains.kotlin.descriptors.Visibility;
import org.jetbrains.kotlin.idea.JetFileType; import org.jetbrains.kotlin.idea.JetFileType;
@@ -462,7 +461,6 @@ public class JetChangeSignatureDialog extends ChangeSignatureDialogBase<
@Override @Override
@NotNull @NotNull
protected BaseRefactoringProcessor createRefactoringProcessor() { protected BaseRefactoringProcessor createRefactoringProcessor() {
String commandName1 = commandName != null ? commandName : getTitle();
JetChangeInfo changeInfo = evaluateChangeInfo( JetChangeInfo changeInfo = evaluateChangeInfo(
myParametersTableModel, myParametersTableModel,
myReturnTypeCodeFragment, myReturnTypeCodeFragment,
@@ -471,11 +469,11 @@ public class JetChangeSignatureDialog extends ChangeSignatureDialogBase<
getMethodName(), getMethodName(),
myDefaultValueContext myDefaultValueContext
); );
return new JetChangeSignatureProcessor(myProject, changeInfo, commandName1); return new JetChangeSignatureProcessor(myProject, changeInfo, commandName != null ? commandName : getTitle());
} }
@TestOnly @NotNull
public static BaseRefactoringProcessor createRefactoringProcessor( public static BaseRefactoringProcessor createRefactoringProcessorForSilentChangeSignature(
@NotNull Project project, @NotNull Project project,
@NotNull String commandName, @NotNull String commandName,
@NotNull JetMethodDescriptor method, @NotNull JetMethodDescriptor method,
@@ -500,36 +498,34 @@ public class JetChangeSignatureDialog extends ChangeSignatureDialogBase<
} }
private static JetChangeInfo evaluateChangeInfo( private static JetChangeInfo evaluateChangeInfo(
@NotNull JetCallableParameterTableModel myParametersTableModel, @NotNull JetCallableParameterTableModel parametersModel,
@Nullable PsiCodeFragment myReturnTypeCodeFragment, @Nullable PsiCodeFragment returnTypeCodeFragment,
@NotNull JetMethodDescriptor myMethod, @NotNull JetMethodDescriptor methodDescriptor,
@Nullable Visibility visibility, @Nullable Visibility visibility,
@NotNull String methodName, @NotNull String methodName,
@NotNull PsiElement myDefaultValueContext @NotNull PsiElement defaultValueContext
) { ) {
List<JetParameterInfo> parameters = new ArrayList<JetParameterInfo>(myParametersTableModel.getRowCount()); List<JetParameterInfo> parameters = new ArrayList<JetParameterInfo>(parametersModel.getRowCount());
for (int i = 0; i < myParametersTableModel.getItems().size(); i++) { for (ParameterTableModelItemBase<JetParameterInfo> parameter : parametersModel.getItems()) {
JetParameterInfo parameter = myParametersTableModel.getItems().get(i).parameter; parameter.parameter.setCurrentTypeText(parameter.typeCodeFragment.getText().trim());
parameter.setCurrentTypeText(myParametersTableModel.getItems().get(i).typeCodeFragment.getText().trim());
parameters.add(parameter); parameters.add(parameter.parameter);
JetExpressionCodeFragment codeFragment = JetExpressionCodeFragment codeFragment = (JetExpressionCodeFragment) parameter.defaultValueCodeFragment;
(JetExpressionCodeFragment) myParametersTableModel.getItems().get(i).defaultValueCodeFragment; JetExpression oldDefaultValue = parameter.parameter.getDefaultValueForCall();
JetExpression oldDefaultValue = parameter.getDefaultValueForCall();
if (!codeFragment.getText().equals(oldDefaultValue != null ? oldDefaultValue.getText() : "")) { if (!codeFragment.getText().equals(oldDefaultValue != null ? oldDefaultValue.getText() : "")) {
parameter.setDefaultValueForCall(codeFragment.getContentElement()); parameter.parameter.setDefaultValueForCall(codeFragment.getContentElement());
} }
} }
String returnTypeText = myReturnTypeCodeFragment != null ? myReturnTypeCodeFragment.getText().trim() : ""; String returnTypeText = returnTypeCodeFragment != null ? returnTypeCodeFragment.getText().trim() : "";
JetMethodDescriptor descriptor = myMethod instanceof JetMutableMethodDescriptor JetMethodDescriptor descriptor = methodDescriptor instanceof JetMutableMethodDescriptor
? ((JetMutableMethodDescriptor) myMethod).getOriginal() ? ((JetMutableMethodDescriptor) methodDescriptor).getOriginal()
: myMethod; : methodDescriptor;
JetType returnType = getType((JetTypeCodeFragment) myReturnTypeCodeFragment); JetType returnType = getType((JetTypeCodeFragment) returnTypeCodeFragment);
return new JetChangeInfo(descriptor, methodName, returnType, returnTypeText, return new JetChangeInfo(descriptor, methodName, returnType, returnTypeText,
visibility, parameters, myParametersTableModel.getReceiver(), myDefaultValueContext); visibility, parameters, parametersModel.getReceiver(), defaultValueContext);
} }
@Override @Override