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

Changed highlighting range and attributes of useless elvis operator

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-06-01 22:22:17 +03:00
parent 11290ae9e7
commit aefe0dd192
14 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmCheckerProvider.kt
+1 -1
View File
@@ -268,7 +268,7 @@ public class JavaNullabilityWarningsChecker : AdditionalTypeChecker {
DataFlowValueFactory.createDataFlowValue(baseExpression, baseExpressionType, c),
c
) {
c.trace.report(Errors.USELESS_ELVIS.on(expression.getOperationReference(), baseExpressionType))
c.trace.report(Errors.USELESS_ELVIS.on(expression, baseExpressionType))
}
}
JetTokens.EQEQ,
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
+2 -2
View File
@@ -558,7 +558,7 @@ public interface Errors {
DiagnosticFactory1<PsiElement, JetType> UNNECESSARY_SAFE_CALL = DiagnosticFactory1.create(WARNING);
DiagnosticFactory1<PsiElement, JetType> UNNECESSARY_NOT_NULL_ASSERTION = DiagnosticFactory1.create(WARNING);
DiagnosticFactory1<JetExpression, JetType> USELESS_ELVIS = DiagnosticFactory1.create(WARNING);
DiagnosticFactory1<JetBinaryExpression, JetType> USELESS_ELVIS = DiagnosticFactory1.create(WARNING, PositioningStrategies.USELESS_ELVIS);
// Compile-time values
@@ -688,7 +688,7 @@ public interface Errors {
INVISIBLE_MEMBER, INVISIBLE_MEMBER_FROM_INLINE, INVISIBLE_REFERENCE, INVISIBLE_SETTER);
ImmutableSet<? extends DiagnosticFactory<?>> UNUSED_ELEMENT_DIAGNOSTICS = ImmutableSet.of(
UNUSED_VARIABLE, UNUSED_PARAMETER, ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE, VARIABLE_WITH_REDUNDANT_INITIALIZER,
UNUSED_FUNCTION_LITERAL, USELESS_CAST, UNUSED_VALUE);
UNUSED_FUNCTION_LITERAL, USELESS_CAST, UNUSED_VALUE, USELESS_ELVIS);
ImmutableSet<? extends DiagnosticFactory<?>> TYPE_INFERENCE_ERRORS = ImmutableSet.of(
TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER, TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS, TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH,
TYPE_INFERENCE_UPPER_BOUND_VIOLATED, TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH);
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt
+6
View File
@@ -447,4 +447,10 @@ public object PositioningStrategies {
return listOf(TextRange(element.getLeft()!!.startOffset, element.getOperationReference().endOffset))
}
}
public val USELESS_ELVIS: PositioningStrategy<JetBinaryExpression> = object: PositioningStrategy<JetBinaryExpression>() {
override fun mark(element: JetBinaryExpression): List<TextRange> {
return listOf(TextRange(element.getOperationReference().startOffset, element.endOffset))
}
}
}
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java
+1 -1
View File
@@ -1276,7 +1276,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
assert leftTypeInfo != null : "Left expression was not processed: " + expression;
JetType leftType = leftTypeInfo.getType();
if (leftType != null && isKnownToBeNotNull(left, leftType, context)) {
context.trace.report(USELESS_ELVIS.on(left, leftType));
context.trace.report(USELESS_ELVIS.on(expression, leftType));
}
JetTypeInfo rightTypeInfo = BindingContextUtils.getRecordedTypeInfo(right, context.trace.getBindingContext());
assert rightTypeInfo != null : "Right expression was not processed: " + expression;
compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInBinaryExpressions.kt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ fun testBinary2() {
}
fun testElvis1() {
<!USELESS_ELVIS!>todo()<!> <!UNREACHABLE_CODE!>?: ""<!>
todo() <!USELESS_ELVIS, UNREACHABLE_CODE!>?: ""<!>
}
fun testElvis2(s: String?) {
compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInWhileFromBreak.kt
Vendored
+1 -1
View File
@@ -50,6 +50,6 @@ fun test(arr: Array<Int>) {
}
while (true) {
<!USELESS_ELVIS!>break<!> <!UNREACHABLE_CODE!>?: null<!>
break <!USELESS_ELVIS, UNREACHABLE_CODE!>?: null<!>
}
}
compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Elvis.kt
Vendored
+1 -1
View File
@@ -4,6 +4,6 @@ fun foo() {
val x: Int? = null
bar(x ?: 0)
if (x != null) bar(<!USELESS_ELVIS!>x<!> ?: <!DEBUG_INFO_SMARTCAST!>x<!>)
if (x != null) bar(x <!USELESS_ELVIS!>?: <!DEBUG_INFO_SMARTCAST!>x<!><!>)
bar(<!TYPE_MISMATCH!>x<!>)
}
compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.kt
Vendored
+2 -2
View File
@@ -5,12 +5,12 @@ fun <T: Any?> test1(t: Any?): Any {
}
fun <T: Any> test2(t: Any?): Any {
return <!UNCHECKED_CAST, USELESS_ELVIS!>t as T<!> ?: ""
return <!UNCHECKED_CAST!>t as T<!> <!USELESS_ELVIS!>?: ""<!>
}
fun <T: Any?> test3(t: Any?): Any {
if (t != null) {
return <!USELESS_ELVIS!>t<!> ?: ""
return t <!USELESS_ELVIS!>?: ""<!>
}
return 1
compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.kt
Vendored
+5 -5
View File
@@ -25,21 +25,21 @@ fun test() {
// platform type with no annotation
val platformJ = J.staticJ
val v0 = platformNN <!USELESS_ELVIS!>?:<!> J()
platformNN <!USELESS_ELVIS!>?:<!> J()
val v0 = platformNN <!USELESS_ELVIS!>?: J()<!>
platformNN <!USELESS_ELVIS!>?: J()<!>
platformN ?: J()
platformJ ?: J()
if (platformNN != null) {
<!USELESS_ELVIS!>platformNN<!> ?: J()
platformNN <!USELESS_ELVIS!>?: J()<!>
}
if (platformN != null) {
<!USELESS_ELVIS!>platformN<!> ?: J()
platformN <!USELESS_ELVIS!>?: J()<!>
}
if (platformJ != null) {
<!USELESS_ELVIS!>platformJ<!> ?: J()
platformJ <!USELESS_ELVIS!>?: J()<!>
}
}
compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisInCall.kt
Vendored
+2 -2
View File
@@ -18,10 +18,10 @@ fun test() {
// @NotNull platform type
val platformNN = J.staticNN
foo(platformNN <!USELESS_ELVIS!>?:<!> "")
foo(platformNN <!USELESS_ELVIS!>?: ""<!>)
val bar = Bar()
bar(platformNN <!USELESS_ELVIS!>?:<!> "")
bar(platformNN <!USELESS_ELVIS!>?: ""<!>)
}
fun foo(a: Any) {}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt
+1 -1
View File
@@ -96,7 +96,7 @@ public open class JetPsiChecker : Annotator, HighlightRangeExtension {
assert(diagnostic.getPsiElement() == element)
var textRanges = diagnostic.getTextRanges()
val textRanges = diagnostic.getTextRanges()
val factory = diagnostic.getFactory()
when (diagnostic.getSeverity()) {
Severity.ERROR -> {
idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveRightPartOfBinaryExpressionFix.java
+1 -2
View File
@@ -85,8 +85,7 @@ public class RemoveRightPartOfBinaryExpressionFix<T extends JetExpression> exten
return new JetSingleIntentionActionFactory() {
@Override
public JetIntentionAction<JetBinaryExpression> createAction(Diagnostic diagnostic) {
JetBinaryExpression expression = QuickFixUtil.getParentElementOfType(diagnostic, JetBinaryExpression.class);
if (expression == null) return null;
JetBinaryExpression expression = (JetBinaryExpression) diagnostic.getPsiElement();
return new RemoveRightPartOfBinaryExpressionFix<JetBinaryExpression>(expression, JetBundle.message("remove.elvis.operator"));
}
};
idea/testData/quickfix/expressions/uselessElvis.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// "Remove elvis operator" "true"
fun foo(a: String) {
val b : String = <caret>a ?: "s"
val b : String = a <caret>?: "s"
}
idea/testData/quickfix/expressions/uselessElvis.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// "Remove elvis operator" "true"
fun foo(a: String) {
val b : String = <caret>a
val b : String = a<caret>
}