commit 8546a3a448904b5749b3d1ad271bfab4f2419ec1
author Johnni Winther <johnniwinther@google.com> Wed Nov 14 15:48:10 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Wed Nov 14 15:48:10 2018 +0000
tree e31e4a04b772109d369f0a0d17001d0b396d539f
parent 1ade3b624fd08c43200fe8556d4491c1ea7e649a

Revert accidental change to analyzer

Revert the change accidentally included in https://dart-review.googlesource.com/c/sdk/+/84001

Change-Id: I207253eecbe4024b30a1331901db07b596d617c0
Reviewed-on: https://dart-review.googlesource.com/c/84411
Auto-Submit: Johnni Winther <johnniwinther@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Reviewed-by: Paul Berry <paulberry@google.com>
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Paul Berry <paulberry@google.com>

pkg/analyzer/lib/src/generated/static_type_analyzer.dart

diff --git a/pkg/analyzer/lib/src/generated/static_type_analyzer.dart b/pkg/analyzer/lib/src/generated/static_type_analyzer.dart
index 127ec63..dfc94e4 100644
--- a/pkg/analyzer/lib/src/generated/static_type_analyzer.dart
+++ b/pkg/analyzer/lib/src/generated/static_type_analyzer.dart
@@ -1609,7 +1609,7 @@
       DartType returnType = null;
       if (typeStr == '-dynamic') {
         returnType = _typeProvider.bottomType;
-      } else if (typeStr != null) {
+      } else {
         var components = typeStr.split('|');
         if (components.remove('Null')) {
           typeStr = components.join('|');