From 6a6282b0388a03a0dba016f42342b5435573596a Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 25 Oct 2012 15:58:41 +0400 Subject: [PATCH] Replace usages of createWhiteSpace(project, ''\n") to specific method --- .../jetbrains/jet/lang/psi/JetPsiFactory.java | 4 ++-- .../importOptimizer/JetImportOptimizer.java | 4 ++-- .../plugin/quickfix/AddWhenElseBranchFix.java | 2 +- .../JetIntroduceVariableHandler.java | 16 +++++++++------- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.java index 79ad8974575..675258e266a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.java @@ -78,12 +78,12 @@ public class JetPsiFactory { return createWhiteSpace(project, " "); } - public static PsiElement createWhiteSpace(Project project, String text) { + private static PsiElement createWhiteSpace(Project project, String text) { JetProperty property = createProperty(project, "val" + text + "x"); return property.findElementAt(3); } - public static PsiElement createNewLineWhiteSpace(Project project) { + public static PsiElement createNewLine(Project project) { return createWhiteSpace(project, "\n"); } diff --git a/idea/src/org/jetbrains/jet/plugin/editor/importOptimizer/JetImportOptimizer.java b/idea/src/org/jetbrains/jet/plugin/editor/importOptimizer/JetImportOptimizer.java index 62341585e1e..9e0f11ede8d 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/importOptimizer/JetImportOptimizer.java +++ b/idea/src/org/jetbrains/jet/plugin/editor/importOptimizer/JetImportOptimizer.java @@ -24,9 +24,9 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.java.JvmAbi; +import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper; import org.jetbrains.jet.util.QualifiedNamesUtil; @@ -93,7 +93,7 @@ public class JetImportOptimizer implements ImportOptimizer { jetFile.deleteChildRange(firstForDelete, lastForDelete); if (elementBeforeImports != null) { - jetFile.addAfter(JetPsiFactory.createWhiteSpace(jetFile.getProject(), "\n"), elementBeforeImports); + jetFile.addAfter(JetPsiFactory.createNewLine(jetFile.getProject()), elementBeforeImports); } } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java index d4ddc6f88a1..53db5ed1a85 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java @@ -56,7 +56,7 @@ public class AddWhenElseBranchFix extends JetIntentionAction PsiElement insertBeforeAnchor = element.getCloseBraceNode(); if (insertBeforeAnchor != null) { PsiElement insertedBranch = element.addBefore(JetPsiFactory.createElseWhenEntry(project), insertBeforeAnchor); - element.addAfter(JetPsiFactory.createNewLineWhiteSpace(project), insertedBranch); + element.addAfter(JetPsiFactory.createNewLine(project), insertedBranch); } } diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableHandler.java index 1a287968de5..cc593c8926f 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableHandler.java @@ -38,7 +38,9 @@ import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.di.InjectorForMacros; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.lang.resolve.*; +import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.jet.lang.resolve.BindingTraceContext; +import org.jetbrains.jet.lang.resolve.ObservableBindingTrace; import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.JetType; @@ -262,12 +264,12 @@ public class JetIntroduceVariableHandler extends JetIntroduceHandlerBase { commonContainer instanceof JetClassInitializer); if (!needBraces) { property = (JetProperty)commonContainer.addBefore(property, anchor); - commonContainer.addBefore(JetPsiFactory.createWhiteSpace(project, "\n"), anchor); + commonContainer.addBefore(JetPsiFactory.createNewLine(project), anchor); } else { JetExpression emptyBody = JetPsiFactory.createEmptyBody(project); PsiElement firstChild = emptyBody.getFirstChild(); - emptyBody.addAfter(JetPsiFactory.createWhiteSpace(project, "\n"), firstChild); + emptyBody.addAfter(JetPsiFactory.createNewLine(project), firstChild); if (replaceOccurrence && commonContainer != null) { for (JetExpression replace : allReplaces) { boolean isActualExpression = expression == replace; @@ -316,9 +318,9 @@ public class JetIntroduceVariableHandler extends JetIntroduceHandlerBase { if (elem != null) { reference.set((JetExpression)elem); } - emptyBody.addAfter(JetPsiFactory.createWhiteSpace(project, "\n"), firstChild); + emptyBody.addAfter(JetPsiFactory.createNewLine(project), firstChild); property = (JetProperty)emptyBody.addAfter(property, firstChild); - emptyBody.addAfter(JetPsiFactory.createWhiteSpace(project, "\n"), firstChild); + emptyBody.addAfter(JetPsiFactory.createNewLine(project), firstChild); actualExpression = reference.get(); diff = actualExpression.getTextRange().getStartOffset() - emptyBody.getTextRange().getStartOffset(); actualExpressionText = actualExpression.getText(); @@ -334,7 +336,7 @@ public class JetIntroduceVariableHandler extends JetIntroduceHandlerBase { } else { property = (JetProperty)emptyBody.addAfter(property, firstChild); - emptyBody.addAfter(JetPsiFactory.createWhiteSpace(project, "\n"), firstChild); + emptyBody.addAfter(JetPsiFactory.createNewLine(project), firstChild); emptyBody = (JetExpression)anchor.replace(emptyBody); } for (PsiElement child : emptyBody.getChildren()) { @@ -358,7 +360,7 @@ public class JetIntroduceVariableHandler extends JetIntroduceHandlerBase { PsiElement nextnext = next.getNextSibling(); if (nextnext != null && nextnext.getNode().getElementType() == JetTokens.ELSE_KEYWORD) { if (next instanceof PsiWhiteSpace) { - next.replace(JetPsiFactory.createWhiteSpace(project, " ")); + next.replace(JetPsiFactory.createWhiteSpace(project)); } } }