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

Fix deleting of semicolon when it required to mark statement empty

Browse Source 
#KT-18142 fixed
#KT-18141 fixed
This commit is contained in:
Simon Ogorodnik
2017-05-30 17:58:47 +03:00
parent 558203e2bb
commit 682a278cb8
11 changed files with 117 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/kotlin/j2k/ast/Statements.kt
+9
View File
@@ -69,6 +69,9 @@ class IfStatement(
if (!elseStatement.isEmpty) {
builder append br append "else" append brAfterElse append elseStatement.wrapToBlockIfRequired()
}
else if (thenStatement.isEmpty) {
builder append ";"
}
}
}
@@ -79,6 +82,9 @@ class WhileStatement(val condition: Expression, val body: Element, singleLine: B
override fun generateCode(builder: CodeBuilder) {
builder append "while (" append condition append ")" append br append body.wrapToBlockIfRequired()
if (body.isEmpty) {
builder append ";"
}
}
}
@@ -106,6 +112,9 @@ class ForeachStatement(
builder append ":" append explicitVariableType
}
builder append " in " append collection append ")" append br append body.wrapToBlockIfRequired()
if (body.isEmpty) {
builder append ";"
}
}
}
j2k/testData/fileOrElement/for/forWithoutBody.java
Vendored
+6
View File
@@ -0,0 +1,6 @@
public class A {
public void aVoid() {
for (int i = 0; i < 10; i++);
System.out.println("Done");
}
}
j2k/testData/fileOrElement/for/forWithoutBody.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
class A {
fun aVoid() {
for (i in 0..9);
println("Done")
}
}
j2k/testData/fileOrElement/foreachStatement/foreachWithoutBody.java
Vendored
+8
View File
@@ -0,0 +1,8 @@
public class A {
public void aVoid() {
int[] array = new int[10];
for (int i : array);
System.out.println("Done");
}
}
j2k/testData/fileOrElement/foreachStatement/foreachWithoutBody.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
class A {
fun aVoid() {
val array = IntArray(10)
for (i in array);
println("Done")
}
}
j2k/testData/fileOrElement/ifStatement/ifWithoutThen.java
Vendored
+8
View File
@@ -0,0 +1,8 @@
public class A {
public void aVoid() {
int i = 0;
if (i > 10);
System.out.println("Done");
}
}
j2k/testData/fileOrElement/ifStatement/ifWithoutThen.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
class A {
fun aVoid() {
val i = 0
if (i > 10);
println("Done")
}
}
j2k/testData/fileOrElement/whileStatement/whileWithoutBody.java
Vendored
+8
View File
@@ -0,0 +1,8 @@
public class A {
public void aVoid() {
int i = 0;
while(i++ < 10);
System.out.println("Done");
}
}
j2k/testData/fileOrElement/whileStatement/whileWithoutBody.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
class A {
fun aVoid() {
var i = 0
while (i++ < 10);
println("Done")
}
}
j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java
+24
View File
@@ -2288,6 +2288,12 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo
doTest(fileName);
}
@TestMetadata("forWithoutBody.java")
public void testForWithoutBody() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithoutBody.java");
doTest(fileName);
}
@TestMetadata("indicesReversed.java")
public void testIndicesReversed() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/indicesReversed.java");
@@ -2399,6 +2405,12 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo
doTest(fileName);
}
@TestMetadata("foreachWithoutBody.java")
public void testForeachWithoutBody() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/foreachWithoutBody.java");
doTest(fileName);
}
@TestMetadata("nullableIterable.java")
public void testNullableIterable() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/nullableIterable.java");
@@ -2723,6 +2735,12 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo
doTest(fileName);
}
@TestMetadata("ifWithoutThen.java")
public void testIfWithoutThen() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/ifWithoutThen.java");
doTest(fileName);
}
@TestMetadata("multiLine.java")
public void testMultiLine() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/multiLine.java");
@@ -5095,5 +5113,11 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/whileStatement/whileWithReturn.java");
doTest(fileName);
}
@TestMetadata("whileWithoutBody.java")
public void testWhileWithoutBody() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/whileStatement/whileWithoutBody.java");
doTest(fileName);
}
}
}
j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java
+24
View File
@@ -2288,6 +2288,12 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo
doTest(fileName);
}
@TestMetadata("forWithoutBody.java")
public void testForWithoutBody() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithoutBody.java");
doTest(fileName);
}
@TestMetadata("indicesReversed.java")
public void testIndicesReversed() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/indicesReversed.java");
@@ -2399,6 +2405,12 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo
doTest(fileName);
}
@TestMetadata("foreachWithoutBody.java")
public void testForeachWithoutBody() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/foreachWithoutBody.java");
doTest(fileName);
}
@TestMetadata("nullableIterable.java")
public void testNullableIterable() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/nullableIterable.java");
@@ -2723,6 +2735,12 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo
doTest(fileName);
}
@TestMetadata("ifWithoutThen.java")
public void testIfWithoutThen() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/ifWithoutThen.java");
doTest(fileName);
}
@TestMetadata("multiLine.java")
public void testMultiLine() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/multiLine.java");
@@ -5095,5 +5113,11 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/whileStatement/whileWithReturn.java");
doTest(fileName);
}
@TestMetadata("whileWithoutBody.java")
public void testWhileWithoutBody() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/whileStatement/whileWithoutBody.java");
doTest(fileName);
}
}
}