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

Replace usages of createWhiteSpace(project, ''\n") to specific method

Browse Source
This commit is contained in:
Nikolay Krasko
2012-10-25 15:58:41 +04:00
parent 33240f167d
commit 6a6282b038
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.java
+2 -2
View File
@@ -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");
}
idea/src/org/jetbrains/jet/plugin/editor/importOptimizer/JetImportOptimizer.java
+2 -2
View File
@@ -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);
}
}
idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class AddWhenElseBranchFix extends JetIntentionAction<JetWhenExpression>
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);
}
}
idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableHandler.java
+9 -7
View File
@@ -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));
}
}
}