Code cleanup, redundant if statements Java inspection

flutter-idea/src/io/flutter/FlutterUtils.java

@@ -252,9 +252,7 @@ private static boolean isInTestOrSourceRoot(@Nullable Module module, @NotNull Da
     }
     if (foundSourceRoot) {
       // The file is in a sources root but not marked as tests.
-      if (file.getName().endsWith(("_test.dart")) && FlutterSettings.getInstance().isAllowTestsInSourcesRoot()) {
-        return true;
-      }
+      return file.getName().endsWith(("_test.dart")) && FlutterSettings.getInstance().isAllowTestsInSourcesRoot();
     }
     return false;
   }

flutter-idea/src/io/flutter/editor/WidgetIndentsHighlightingPass.java

@@ -248,10 +248,7 @@ public void paint(@NotNull Editor editor, @NotNull RangeHighlighter highlighter,
       final Point end = editor.visualPositionToXY(endPosition);
       double splitY = -1;
       int maxY = end.y;
-      boolean includeLastLine = false;
-      if (endPosition.line == editor.offsetToVisualPosition(doc.getTextLength()).line) {
-        includeLastLine = true;
-      }
+      boolean includeLastLine = endPosition.line == editor.offsetToVisualPosition(doc.getTextLength()).line;
 
       int endLine = doc.getLineNumber(endOffset);
       if (childLines != null && !childLines.isEmpty()) {

flutter-idea/src/io/flutter/run/test/FlutterTestEventsConverter.java

@@ -64,7 +64,7 @@ protected boolean process(@NotNull JsonArray array) {
           final JsonElement params = getValue(element, "params");
           if (params != null) {
             final JsonElement uri = getValue(params, "observatoryUri");
-            if (uri != null) return true;
+            return uri != null;
           }
         }
       }

flutter-idea/src/io/flutter/sdk/FlutterSettingsConfigurable.java

@@ -267,11 +267,7 @@ public boolean isModified() {
       return true;
     }
 
-    if (settings.isEnableJcefBrowser() != myEnableJcefBrowserCheckBox.isSelected()) {
-      return true;
-    }
-
-    return false;
+    return settings.isEnableJcefBrowser() != myEnableJcefBrowserCheckBox.isSelected();
   }
 
   @Override

flutter-idea/src/io/flutter/vmService/VMServiceManager.java

@@ -587,12 +587,7 @@ public void onError(RPCError error) {
 
         @Override
         public void received(JsonObject object) {
-          if (object == null) {
-            ret.complete(null);
-          }
-          else {
-            ret.complete(object);
-          }
+          ret.complete(object);
         }
       }
     );

flutter-idea/src/org/dartlang/analysis/server/protocol/ExtractWidgetFeedback.java

@@ -36,11 +36,8 @@ public ExtractWidgetFeedback() {
 
   @Override
   public boolean equals(Object obj) {
-    if (obj instanceof ExtractWidgetFeedback other) {
-      return
-        true;
-    }
-    return false;
+    return
+      obj instanceof ExtractWidgetFeedback other;
   }
 
   public static ExtractWidgetFeedback fromJson(JsonObject jsonObject) {