mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
FindFirstMigration: use ifPresent when stream element type is primitive and the final statement is an assignment
This case is possible only if we have no non-final locals updated in the loop, so the assignment updates field or array element. Using common assignment scenario may not work as primitive optionals lack map/filter operations Fixes IDEA-200209 "Replace with findFirst" produces incompilable code
This commit is contained in:
+3
-1
@@ -42,7 +42,9 @@ class FindFirstMigration extends BaseStreamApiMigration {
|
||||
PsiStatement[] statements = tb.getStatements();
|
||||
if (statements.length != 2) return null;
|
||||
PsiAssignmentExpression assignment = ExpressionUtils.getAssignment(statements[0]);
|
||||
if (assignment == null) {
|
||||
if (assignment == null || tb.getVariable().getType() instanceof PsiPrimitiveType) {
|
||||
// if we found an assignment with primitive stream variable, then we are not assigning to local variable
|
||||
// (see StreamApiMigrationInspection#findMigrationForBreak), thus it could be handled via ifPresent()
|
||||
if(!(statements[0] instanceof PsiExpressionStatement)) return null;
|
||||
PsiExpression expression = ((PsiExpressionStatement)statements[0]).getExpression();
|
||||
return ct.replaceAndRestoreComments(
|
||||
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
// "Replace with findFirst()" "true"
|
||||
|
||||
import java.util.stream.IntStream;
|
||||
|
||||
class Lookup {
|
||||
boolean matches(char[] lookup) {}
|
||||
}
|
||||
|
||||
// IDEA-200209
|
||||
class C {
|
||||
private Lookup[] lookbehindFormats;
|
||||
private char[] lookupChars;
|
||||
private Lookup lookbehindFormat;
|
||||
|
||||
{
|
||||
IntStream.range(0, lookbehindFormats.length).filter(i -> lookbehindFormats[i].matches(lookupChars)).findFirst().ifPresent(i -> lookbehindFormat = lookbehindFormats[i]);
|
||||
|
||||
}
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
// "Replace with findFirst()" "true"
|
||||
|
||||
class Lookup {
|
||||
boolean matches(char[] lookup) {}
|
||||
}
|
||||
|
||||
// IDEA-200209
|
||||
class C {
|
||||
private Lookup[] lookbehindFormats;
|
||||
private char[] lookupChars;
|
||||
private Lookup lookbehindFormat;
|
||||
|
||||
{
|
||||
for (int i = 0; i < lookbehin<caret>dFormats.length; i++) {
|
||||
if (lookbehindFormats[i].matches(lookupChars)) {
|
||||
lookbehindFormat = lookbehindFormats[i];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user