From 4279029d902da240c4fa37c8e3768f2e8315160b Mon Sep 17 00:00:00 2001
From: Parker Lougheed <parlough@gmail.com>
Date: Sun, 13 Aug 2023 15:19:05 -0500
Subject: [PATCH] Update Dart spec reserved words

---
 lib/src/pubspec_parse.dart |  2 +-
 lib/src/utils.dart         | 41 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/lib/src/pubspec_parse.dart b/lib/src/pubspec_parse.dart
index d4d6acb90..d76a049b3 100644
--- a/lib/src/pubspec_parse.dart
+++ b/lib/src/pubspec_parse.dart
@@ -55,7 +55,7 @@ abstract class PubspecBase {
         '"name" field must be a valid Dart identifier.',
         fields.nodes['name']?.span,
       );
-    } else if (reservedWords.contains(name)) {
+    } else if (reservedWords.contains(name.toLowerCase())) {
       throw SourceSpanApplicationException(
         '"name" field may not be a Dart reserved word.',
         fields.nodes['name']?.span,
diff --git a/lib/src/utils.dart b/lib/src/utils.dart
index 246d042ef..866567492 100644
--- a/lib/src/utils.dart
+++ b/lib/src/utils.dart
@@ -29,39 +29,76 @@ final identifierRegExp = RegExp(r'[a-zA-Z_]\w*');
 final onlyIdentifierRegExp = RegExp('^${identifierRegExp.pattern}\$');
 
 /// Dart reserved words, from the Dart spec.
-const reservedWords = [
+const reservedWords = <String>{
+  'abstract',
+  'as',
   'assert',
+  // 'async', // Reserved, but allowed because package:async already exists.
+  'await',
+  // 'base', // Reserved, but allowed because package:base already exists.
   'break',
   'case',
   'catch',
   'class',
   'const',
   'continue',
+  'covariant',
   'default',
+  'deferred',
   'do',
+  // 'dynamic', // Reserved, but allowed because package:dynamic already exists.
   'else',
+  'enum',
+  'export',
   'extends',
+  // 'extension', // Reserved, but allowed because package:extension already exists.
+  'external',
+  // 'factory', // Reserved, but allowed because package:factory already exists.
   'false',
   'final',
   'finally',
   'for',
+  // 'get', // Reserved, but allowed because package:get already exists.
+  'hide',
   'if',
+  'implements',
+  'import',
   'in',
+  'inline',
+  'interface',
   'is',
+  'late',
+  'library',
+  'mixin',
   'new',
   'null',
+  'of',
+  'on',
+  'operator',
+  'part',
+  'required',
+  'rethrow',
   'return',
+  'sealed',
+  'set',
+  // 'show', // Reserved, but allowed because package:show already exists.
+  // 'static', // Reserved, but allowed because package:static already exists.
   'super',
   'switch',
+  // 'sync', // Reserved, but allowed because package:sync already exists.
   'this',
   'throw',
   'true',
   'try',
+  'type',
+  // 'typedef', // Reserved, but allowed because package:typedef already exists.
   'var',
   'void',
+  // 'when', // Reserved, but allowed because package:when already exists.
   'while',
   'with',
-];
+  'yield',
+};
 
 /// An cryptographically secure instance of [math.Random].
 final random = math.Random.secure();