From b2ffd9ff2086f3dda688ce369fbbdafd83fb3ba7 Mon Sep 17 00:00:00 2001 From: "Roman.Ivanov" Date: Mon, 4 Mar 2019 12:26:10 +0700 Subject: [PATCH] minor cleanup --- .../SimplifyOptionalCallChainsInspection.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInspection/SimplifyOptionalCallChainsInspection.java b/java/java-impl/src/com/intellij/codeInspection/SimplifyOptionalCallChainsInspection.java index 91836a3add11..a049bc7137cb 100644 --- a/java/java-impl/src/com/intellij/codeInspection/SimplifyOptionalCallChainsInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/SimplifyOptionalCallChainsInspection.java @@ -44,7 +44,7 @@ public class SimplifyOptionalCallChainsInspection extends AbstractBaseJavaLocalI private static final CallMatcher OPTIONAL_OR_ELSE_OR_ELSE_GET = CallMatcher.anyOf( OPTIONAL_OR_ELSE, OPTIONAL_OR_ELSE_GET - ); + ); private static final CallMatcher OPTIONAL_MAP = CallMatcher.instanceCall(JAVA_UTIL_OPTIONAL, "map").parameterCount(1); private static final CallMatcher OPTIONAL_OF_NULLABLE = @@ -78,6 +78,8 @@ public class SimplifyOptionalCallChainsInspection extends AbstractBaseJavaLocalI static { List> cases = Arrays.asList( + new IfPresentFoldedCase(), + new MapUnwrappingCase(), new OrElseNonNullCase(OrElseType.OrElse), new OrElseNonNullCase(OrElseType.OrElseGet), new FlipPresentOrEmptyCase(true), @@ -87,13 +89,12 @@ public class SimplifyOptionalCallChainsInspection extends AbstractBaseJavaLocalI new RewrappingCase(RewrappingCase.Type.OptionalGet), new RewrappingCase(RewrappingCase.Type.OrElseNull), new MapOrElseCase(OrElseType.OrElseGet), - new MapOrElseCase(OrElseType.OrElse), - new IfPresentFoldedCase(), - new MapUnwrappingCase() + new MapOrElseCase(OrElseType.OrElse) ); ourMapper = new CallMapper<>(); - for (CallSimplificationCase inspection : cases) { - ourMapper.register(CallHandler.of(inspection.getMatcher(), call -> getFix(call, inspection))); + for (CallSimplificationCase theCase : cases) { + CallHandler handler = CallHandler.of(theCase.getMatcher(), call -> getFix(call, theCase)); + ourMapper.register(handler); } }