MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-115070 Remove "exit" as possible @Contract method effect

Browse Source
This commit is contained in:
peter
2013-10-17 21:54:36 +02:00
parent 57b3cfd8e9
commit 50b311621f
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
+3 -7
View File
@@ -1452,9 +1452,6 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
case THROW_EXCEPTION:
returnCheckingFinally();
break;
case SYSTEM_EXIT:
addInstruction(new ReturnInstruction(true));
break;
}
// if contract is false
@@ -1493,7 +1490,7 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
final String className = owner.getQualifiedName();
if ("java.lang.System".equals(className)) {
if ("exit".equals(methodName)) {
return Collections.singletonList(new MethodContract(getAnyArgConstraints(params), ValueConstraint.SYSTEM_EXIT));
return Collections.singletonList(new MethodContract(getAnyArgConstraints(params), ValueConstraint.THROW_EXCEPTION));
}
}
else if ("junit.framework.Assert".equals(className) || "org.junit.Assert".equals(className) ||
@@ -1579,10 +1576,9 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
if ("!null".equals(name)) return ValueConstraint.NOT_NULL_VALUE;
if ("true".equals(name)) return ValueConstraint.TRUE_VALUE;
if ("false".equals(name)) return ValueConstraint.FALSE_VALUE;
if ("exit".equals(name)) return ValueConstraint.SYSTEM_EXIT;
if ("fail".equals(name)) return ValueConstraint.THROW_EXCEPTION;
if ("_".equals(name)) return ValueConstraint.ANY_VALUE;
throw new ParseException("Constraint should be one of: null, !null, true, false, exit, fail, _. Found: " + name);
throw new ParseException("Constraint should be one of: null, !null, true, false, fail, _. Found: " + name);
}
public static class ParseException extends Exception {
@@ -1890,7 +1886,7 @@ class MethodContract {
}
public enum ValueConstraint {
ANY_VALUE, NULL_VALUE, NOT_NULL_VALUE, TRUE_VALUE, FALSE_VALUE, THROW_EXCEPTION, SYSTEM_EXIT
ANY_VALUE, NULL_VALUE, NOT_NULL_VALUE, TRUE_VALUE, FALSE_VALUE, THROW_EXCEPTION
}
}
platform/annotations/src/org/jetbrains/annotations/Contract.java
+2 -3
View File
@@ -27,7 +27,7 @@ import java.lang.annotation.*;
* args ::= ((arg ',')* arg )?<br/>
* arg ::= value-constraint<br/>
* value-constraint ::= 'any' | 'null' | '!null' | 'false' | 'true'<br/>
* effect ::= value-constraint | 'fail' | 'exit'<p/>
* effect ::= value-constraint | 'fail' <p/>
*
* The constraints denote the following:<br/>
* <ul>
@@ -36,8 +36,7 @@ import java.lang.annotation.*;
* <li> !null - a value statically proved to be not-null
* <li> true - true boolean value
* <li> false - false boolean value
* <li> fail - the method throws exception, if the arguments satisfy argument constraints
* <li> exit - the method terminates the current process, if the arguments satisfy argument constraints
* <li> fail - the method throws an exception, if the arguments satisfy argument constraints
* </ul>
* Examples:<p/>
* <code>@Contract("_, null -> null")</code> - method returns null if its second argument is null<br/>