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

Create from usage: Renamed underscore identifier.

Browse Source
This commit is contained in:
Jack Zhou
2013-05-02 11:20:19 -04:00
parent 8d3c1cddb4
commit b527ec45a3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/CreateFunctionFromUsageFix.java
+5 -5
View File
@@ -774,8 +774,8 @@ public class CreateFunctionFromUsageFix extends CreateFromUsageFixBase {
TypeParameterListExpression expression = setupTypeParameterListTemplate(builder, func); TypeParameterListExpression expression = setupTypeParameterListTemplate(builder, func);
// the template built by TemplateBuilderImpl is ordered by element position, but we want types to be first, so hack it // the template built by TemplateBuilderImpl is ordered by element position, but we want types to be first, so hack it
final TemplateImpl template = (TemplateImpl) builder.buildInlineTemplate(); final TemplateImpl templateImpl = (TemplateImpl) builder.buildInlineTemplate();
ArrayList<Variable> variables = template.getVariables(); ArrayList<Variable> variables = templateImpl.getVariables();
for (int i = 0; i < parameters.size(); i++) { for (int i = 0; i < parameters.size(); i++) {
Collections.swap(variables, i * 2, i * 2 + 1); Collections.swap(variables, i * 2, i * 2 + 1);
} }
@@ -784,11 +784,11 @@ public class CreateFunctionFromUsageFix extends CreateFromUsageFixBase {
variables.add(new Variable(TYPE_PARAMETER_LIST_VARIABLE_NAME, expression, expression, false, true)); variables.add(new Variable(TYPE_PARAMETER_LIST_VARIABLE_NAME, expression, expression, false, true));
// run the template // run the template
TemplateManager.getInstance(project).startTemplate(containingFileEditor, template, new TemplateEditingAdapter() { TemplateManager.getInstance(project).startTemplate(containingFileEditor, templateImpl, new TemplateEditingAdapter() {
@Override @Override
public void templateFinished(Template _, boolean brokenOff) { public void templateFinished(Template template, boolean brokenOff) {
// file templates // file templates
int offset = template.getSegmentOffset(0); int offset = templateImpl.getSegmentOffset(0);
final JetNamedFunction func = PsiTreeUtil.findElementOfClassAtOffset(containingFile, offset, JetNamedFunction.class, false); final JetNamedFunction func = PsiTreeUtil.findElementOfClassAtOffset(containingFile, offset, JetNamedFunction.class, false);
assert func != null; assert func != null;
final List<JetTypeReference> typeRefsToShorten = new ArrayList<JetTypeReference>(); final List<JetTypeReference> typeRefsToShorten = new ArrayList<JetTypeReference>();