From 8a0cc1bef766adaee9eed463bf46b1dca519f2e8 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Tue, 23 Mar 2021 10:11:07 -0700 Subject: [PATCH] Make launguage_version in flutter_tool null safe (#78843) --- packages/flutter_tools/lib/src/dart/language_version.dart | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/flutter_tools/lib/src/dart/language_version.dart b/packages/flutter_tools/lib/src/dart/language_version.dart index ef3b3cabd8e..763ce5ba8b4 100644 --- a/packages/flutter_tools/lib/src/dart/language_version.dart +++ b/packages/flutter_tools/lib/src/dart/language_version.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:file/file.dart'; import 'package:package_config/package_config.dart'; @@ -62,10 +60,10 @@ LanguageVersion determineLanguageVersion(File file, Package package) { continue; } // Check for a match with the language version. - final Match match = _languageVersion.matchAsPrefix(trimmedLine); + final Match? match = _languageVersion.matchAsPrefix(trimmedLine); if (match != null) { - final String rawMajor = match.group(1); - final String rawMinor = match.group(2); + final String rawMajor = match.group(1) ?? ''; + final String rawMinor = match.group(2) ?? ''; try { final int major = int.parse(rawMajor); final int minor = int.parse(rawMinor);