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

Create from usage: Returning immediately to avoid reassignment.

Browse Source
This commit is contained in:
Jack Zhou
2013-05-02 11:17:49 -04:00
parent e0201bf8f3
commit 8d3c1cddb4
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/CreateFunctionFromUsageFix.java
+2 -4
View File
@@ -726,7 +726,7 @@ public class CreateFunctionFromUsageFix extends CreateFromUsageFixBase {
func = JetPsiFactory.createFunction(project, functionText); func = JetPsiFactory.createFunction(project, functionText);
containingFile = currentFile; containingFile = currentFile;
containingFileEditor = currentFileEditor; containingFileEditor = currentFileEditor;
func = (JetNamedFunction) currentFile.add(func); return (JetNamedFunction) currentFile.add(func);
} else { // create as regular function } else { // create as regular function
String functionText = String.format("fun %s(%s)%s { }", functionName, parametersString, returnTypeString); String functionText = String.format("fun %s(%s)%s { }", functionName, parametersString, returnTypeString);
func = JetPsiFactory.createFunction(project, functionText); func = JetPsiFactory.createFunction(project, functionText);
@@ -746,10 +746,8 @@ public class CreateFunctionFromUsageFix extends CreateFromUsageFixBase {
} }
PsiElement rBrace = classBody.getRBrace(); PsiElement rBrace = classBody.getRBrace();
assert rBrace != null; assert rBrace != null;
func = (JetNamedFunction) classBody.addBefore(func, rBrace); return (JetNamedFunction) classBody.addBefore(func, rBrace);
} }
return func;
} }
private void buildAndRunTemplate(@NotNull JetNamedFunction func) { private void buildAndRunTemplate(@NotNull JetNamedFunction func) {