Skip to content

Commit

Permalink
[analyzer] Fix runtime error when creating SDK manager
Browse files Browse the repository at this point in the history
Caused by a ternary operator with differently typed branches.

Change-Id: I5f9cfc28c274c125db0a999237f81dc3523896cc
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/104240
Reviewed-by: Paul Berry <paulberry@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Nicholas Shahan <nshahan@google.com>
  • Loading branch information
nshahan authored and commit-bot@chromium.org committed Jun 5, 2019
1 parent 9a06144 commit 9cfe9bd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pkg/analyzer/lib/src/command_line/arguments.dart
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ DartSdkManager createDartSdkManager(
return !context.isWithin(sdkPath, sourcePath);
});
return new DartSdkManager(
sdkPath ?? FolderBasedDartSdk.defaultSdkDirectory(resourceProvider),
sdkPath ?? FolderBasedDartSdk.defaultSdkDirectory(resourceProvider)?.path,
canUseSummaries);
}

Expand Down
5 changes: 3 additions & 2 deletions pkg/analyzer/test/src/command_line/arguments_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class ArgumentsTest with ResourceProviderMixin {
createDartSdkManager(resourceProvider, false, result);
expect(manager, isNotNull);
expect(manager.defaultSdkDirectory,
FolderBasedDartSdk.defaultSdkDirectory(resourceProvider));
FolderBasedDartSdk.defaultSdkDirectory(resourceProvider)?.path);
expect(manager.canUseSummaries, false);
}

Expand All @@ -96,8 +96,9 @@ class ArgumentsTest with ResourceProviderMixin {
DartSdkManager manager =
createDartSdkManager(resourceProvider, true, result);
expect(manager, isNotNull);

expect(manager.defaultSdkDirectory,
FolderBasedDartSdk.defaultSdkDirectory(resourceProvider));
FolderBasedDartSdk.defaultSdkDirectory(resourceProvider)?.path);
expect(manager.canUseSummaries, true);
}

Expand Down

0 comments on commit 9cfe9bd

Please sign in to comment.