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

made UNREACHABLE_CODE a warning instead of error

Browse Source
This commit is contained in:
svtk
2013-11-19 13:11:03 +04:00
parent c1ec8cbde9
commit 8defeef050
5 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
+1 -1
View File
@@ -424,7 +424,7 @@ public interface Errors {
// Control flow / Data flow // Control flow / Data flow
DiagnosticFactory0<JetElement> UNREACHABLE_CODE = DiagnosticFactory0.create(ERROR); DiagnosticFactory0<JetElement> UNREACHABLE_CODE = DiagnosticFactory0.create(WARNING);
DiagnosticFactory0<JetVariableDeclaration> VARIABLE_WITH_NO_TYPE_NO_INITIALIZER = DiagnosticFactory0.create(ERROR, NAME_IDENTIFIER); DiagnosticFactory0<JetVariableDeclaration> VARIABLE_WITH_NO_TYPE_NO_INITIALIZER = DiagnosticFactory0.create(ERROR, NAME_IDENTIFIER);
idea/testData/checker/FunctionReturnTypes.kt
+2 -2
View File
@@ -48,7 +48,7 @@ fun blockAndAndMismatch1() : Int {
return <error>true && false</error> return <error>true && false</error>
} }
fun blockAndAndMismatch2() : Int { fun blockAndAndMismatch2() : Int {
<error>(return <error>true</error>) && (return <error>false</error>)</error> <warning>(return <error>true</error>) && (return <error>false</error>)</warning>
} }
fun blockAndAndMismatch3() : Int { fun blockAndAndMismatch3() : Int {
@@ -58,7 +58,7 @@ fun blockAndAndMismatch4() : Int {
return <error>true || false</error> return <error>true || false</error>
} }
fun blockAndAndMismatch5() : Int { fun blockAndAndMismatch5() : Int {
<error>(return <error>true</error>) || (return <error>false</error>)</error> <warning>(return <error>true</error>) || (return <error>false</error>)</warning>
} }
fun blockReturnValueTypeMatch1() : Int { fun blockReturnValueTypeMatch1() : Int {
return if (1 > 2) <error>1.0</error> else <error>2.0</error> return if (1 > 2) <error>1.0</error> else <error>2.0</error>
idea/testData/checker/UnreachableCode.kt
+32 -32
View File
@@ -1,79 +1,79 @@
fun t1() : Int{ fun t1() : Int{
return 0 return 0
<error>1</error> <warning>1</warning>
} }
fun t1a() : Int { fun t1a() : Int {
<error>return</error> <error>return</error>
<error>return 1</error> <warning>return 1</warning>
<error>1</error> <warning>1</warning>
} }
fun t1b() : Int { fun t1b() : Int {
return 1 return 1
<error>return 1</error> <warning>return 1</warning>
<error>1</error> <warning>1</warning>
} }
fun t1c() : Int { fun t1c() : Int {
return 1 return 1
<error>return</error> <error>return</error>
<error>1</error> <warning>1</warning>
} }
fun t2() : Int { fun t2() : Int {
if (1 > 2) if (1 > 2)
return 1 return 1
else return 1 else return 1
<error>1</error> <warning>1</warning>
} }
fun t2a() : Int { fun t2a() : Int {
if (1 > 2) { if (1 > 2) {
return 1 return 1
<error>1</error> <warning>1</warning>
} else { return 1 } else { return 1
<error>2</error> <warning>2</warning>
} }
<error>1</error> <warning>1</warning>
} }
fun t3() : Any { fun t3() : Any {
if (1 > 2) if (1 > 2)
return 2 return 2
else return "" else return ""
<error>1</error> <warning>1</warning>
} }
fun t4(<warning>a</warning> : Boolean) : Int { fun t4(<warning>a</warning> : Boolean) : Int {
do { do {
return 1 return 1
} }
while (<error>a</error>) while (<warning>a</warning>)
<error>1</error> <warning>1</warning>
} }
fun t4break(<warning>a</warning> : Boolean) : Int { fun t4break(<warning>a</warning> : Boolean) : Int {
do { do {
break break
} }
while (<error>a</error>) while (<warning>a</warning>)
return 1 return 1
} }
fun t5() : Int { fun t5() : Int {
do { do {
return 1 return 1
<error>2</error> <warning>2</warning>
} }
while (<error>1 > 2</error>) while (<warning>1 > 2</warning>)
<error>return 1</error> <warning>return 1</warning>
} }
fun t6() : Int { fun t6() : Int {
while (1 > 2) { while (1 > 2) {
return 1 return 1
<error>2</error> <warning>2</warning>
} }
return 1 return 1
} }
@@ -81,7 +81,7 @@ fun t6() : Int {
fun t6break() : Int { fun t6break() : Int {
while (1 > 2) { while (1 > 2) {
break break
<error>2</error> <warning>2</warning>
} }
return 1 return 1
} }
@@ -89,7 +89,7 @@ fun t6break() : Int {
fun t7(b : Int) : Int { fun t7(b : Int) : Int {
for (i in 1..b) { for (i in 1..b) {
return 1 return 1
<error>2</error> <warning>2</warning>
} }
return 1 return 1
} }
@@ -97,7 +97,7 @@ fun t7(b : Int) : Int {
fun t7break(b : Int) : Int { fun t7break(b : Int) : Int {
for (i in 1..b) { for (i in 1..b) {
return 1 return 1
<error>2</error> <warning>2</warning>
} }
return 1 return 1
} }
@@ -105,7 +105,7 @@ fun t7break(b : Int) : Int {
fun t7() : Int { fun t7() : Int {
try { try {
return 1 return 1
<error>2</error> <warning>2</warning>
} }
catch (<error>e : Any</error>) { catch (<error>e : Any</error>) {
<warning>2</warning> <warning>2</warning>
@@ -116,36 +116,36 @@ fun t7() : Int {
fun t8() : Int { fun t8() : Int {
try { try {
return 1 return 1
<error>2</error> <warning>2</warning>
} }
catch (<error>e : Any</error>) { catch (<error>e : Any</error>) {
return 1 return 1
<error>2</error> <warning>2</warning>
} }
<error>return 1</error> <warning>return 1</warning>
} }
fun blockAndAndMismatch() : Boolean { fun blockAndAndMismatch() : Boolean {
<error>(return true) || (return false)</error> <warning>(return true) || (return false)</warning>
<error>return true</error> <warning>return true</warning>
} }
fun tf() : Int { fun tf() : Int {
try {<error>return 1</error>} finally{return 1} try {<warning>return 1</warning>} finally{return 1}
<error>return 1</error> <warning>return 1</warning>
} }
fun failtest(<warning>a</warning> : Int) : Int { fun failtest(<warning>a</warning> : Int) : Int {
if (fail() || <error>true</error>) { if (fail() || <warning>true</warning>) {
} }
<error>return 1</error> <warning>return 1</warning>
} }
fun foo(a : Nothing) : Unit { fun foo(a : Nothing) : Unit {
<warning>1</warning> <warning>1</warning>
<warning>a</warning> <warning>a</warning>
<error>2</error> <warning>2</warning>
} }
fun fail() : Nothing { fun fail() : Nothing {
idea/testData/checker/When.kt
+1 -1
View File
@@ -36,7 +36,7 @@ fun test() {
when (z) { when (z) {
<error>else</error> -> 1 <error>else</error> -> 1
<error>1 -> 2</error> <warning>1 -> 2</warning>
} }
when (z) { when (z) {
idea/testData/quickfix/when/beforeTwoElseBranchesInWhen.kt
+2 -2
View File
@@ -1,8 +1,8 @@
// "Move else branch to the end" "false" // "Move else branch to the end" "false"
// ERROR: 'else' entry must be the last one in a when-expression // ERROR: 'else' entry must be the last one in a when-expression
// ERROR: 'else' entry must be the last one in a when-expression // ERROR: 'else' entry must be the last one in a when-expression
// ERROR: Unreachable code // WARNING: Unreachable code
// ERROR: Unreachable code // WARNING: Unreachable code
// ACTION: Disable 'Eliminate Argument of 'when'' // ACTION: Disable 'Eliminate Argument of 'when''
// ACTION: Disable 'Replace 'when' with 'if'' // ACTION: Disable 'Replace 'when' with 'if''
// ACTION: Edit intention settings // ACTION: Edit intention settings