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

Fix line separators insertion

Browse Source
This commit is contained in:
Nikolay Krasko
2012-01-19 16:43:49 +04:00
parent 0e13952e0e
commit 14bccd9352
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java
+3 -2
View File
@@ -53,11 +53,12 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns
return; return;
} }
String lineSeparator = System.getProperty("line.separator"); final PsiElement newLineWhitespace = JetPsiFactory.createWhiteSpace(body.getProject(), "\n");
for (DescriptorClassMember selectedElement : selectedElements) { for (DescriptorClassMember selectedElement : selectedElements) {
body.addBefore(JetPsiFactory.createWhiteSpace(body.getProject(), lineSeparator + lineSeparator), body.getRBrace()); // TODO: Insert spaces should be done by formatter
body.addBefore(newLineWhitespace, body.getRBrace());
final DeclarationDescriptor descriptor = selectedElement.getDescriptor(); final DeclarationDescriptor descriptor = selectedElement.getDescriptor();
if (descriptor instanceof NamedFunctionDescriptor) { if (descriptor instanceof NamedFunctionDescriptor) {
idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassHelper.java
+6 -3
View File
@@ -47,7 +47,10 @@ public class ImportClassHelper {
JetImportDirective newDirective = JetPsiFactory.createImportDirective(file.getProject(), importString); JetImportDirective newDirective = JetPsiFactory.createImportDirective(file.getProject(), importString);
String lineSeparator = System.getProperty("line.separator"); // TODO: Should be processed with formatter
final PsiElement newLineWhitespace = JetPsiFactory.createWhiteSpace(file.getProject(), "\n");
final PsiElement doubleLineWhitespace = JetPsiFactory.createWhiteSpace(file.getProject(), "\n\n");
if (!importDirectives.isEmpty()) { if (!importDirectives.isEmpty()) {
// Check if import is already present // Check if import is already present
@@ -59,14 +62,14 @@ public class ImportClassHelper {
JetImportDirective lastDirective = importDirectives.get(importDirectives.size() - 1); JetImportDirective lastDirective = importDirectives.get(importDirectives.size() - 1);
lastDirective.getParent().addAfter(newDirective, lastDirective); lastDirective.getParent().addAfter(newDirective, lastDirective);
lastDirective.getParent().addAfter(JetPsiFactory.createWhiteSpace(file.getProject(), lineSeparator), lastDirective); lastDirective.getParent().addAfter(newLineWhitespace, lastDirective);
} }
else { else {
List<JetDeclaration> declarations = file.getDeclarations(); List<JetDeclaration> declarations = file.getDeclarations();
assert !declarations.isEmpty(); assert !declarations.isEmpty();
JetDeclaration firstDeclaration = declarations.iterator().next(); JetDeclaration firstDeclaration = declarations.iterator().next();
firstDeclaration.getParent().addBefore(newDirective, firstDeclaration); firstDeclaration.getParent().addBefore(newDirective, firstDeclaration);
firstDeclaration.getParent().addBefore(JetPsiFactory.createWhiteSpace(file.getProject(), lineSeparator + lineSeparator), firstDeclaration); firstDeclaration.getParent().addBefore(doubleLineWhitespace, firstDeclaration);
} }
} }
} }
idea/testData/codeInsight/overrideImplement/generateMulti.kt.after
-2
View File
@@ -11,10 +11,8 @@ class SomeOther<S> : Some<S> {
override fun someFoo() { override fun someFoo() {
throw UnsupportedOperationException() throw UnsupportedOperationException()
} }
override fun someGenericFoo(): S { override fun someGenericFoo(): S {
throw UnsupportedOperationException() throw UnsupportedOperationException()
} }
override fun someOtherFoo(): Int = 0 override fun someOtherFoo(): Int = 0
} }