Macro. Check for valid parts in Code.fromParts(), not just assert().

Bug: #55441 Change-Id: I27fd2cbdd750317a40583788690447d54df6a037 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/362440 Reviewed-by: Johnni Winther <johnniwinther@google.com> Reviewed-by: Jake Macdonald <jakemac@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
dart-lang · Apr 16, 2024 · b08dae5 · b08dae5
1 parent f15bcc9
commit b08dae5
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 16 deletions.
diff --git a/pkg/_macros/CHANGELOG.md b/pkg/_macros/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.3
+
+- Validate parts in `Code.fromParts()`.
+
 ## 0.1.2
 
 - Add caching for `typeDeclarationOf` results.

diff --git a/pkg/_macros/lib/src/api/code.dart b/pkg/_macros/lib/src/api/code.dart
@@ -17,9 +17,18 @@ sealed class Code {
 
   Code.fromString(String code) : parts = [code];
 
-  Code.fromParts(this.parts)
-      : assert(parts.every((element) =>
-            element is String || element is Code || element is Identifier));
+  Code.fromParts(this.parts) {
+    for (final part in parts) {
+      switch (part) {
+        case Code():
+        case Identifier():
+        case String():
+          break; // OK
+        default:
+          throw StateError('Unrecognized code part ${part.runtimeType}');
+      }
+    }
+  }
 }
 
 /// An arbitrary chunk of code, which does not have to be syntactically valid

diff --git a/pkg/_macros/pubspec.yaml b/pkg/_macros/pubspec.yaml
@@ -1,5 +1,5 @@
 name: _macros
-version: 0.1.2
+version: 0.1.3
 description: >-
   This is a private SDK vendored package, which is re-exported by the public
   `macros` package, which is a pub package. Every change to this package is

diff --git a/pkg/front_end/testcases/incremental/macro_change_entry_one.yaml.world.1.expect b/pkg/front_end/testcases/incremental/macro_change_entry_one.yaml.world.1.expect
@@ -49,7 +49,7 @@ holepunch:pkg/_macros/lib/src/api/builders.dart:
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 holepunch:pkg/_macros/lib/src/api/code.dart:
-- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:460:6)
+- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:469:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/macro_change_entry_one.yaml.world.2.expect b/pkg/front_end/testcases/incremental/macro_change_entry_one.yaml.world.2.expect
@@ -36,7 +36,7 @@ holepunch:pkg/_macros/lib/src/api/builders.dart:
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 holepunch:pkg/_macros/lib/src/api/code.dart:
-- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:460:6)
+- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:469:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/macro_change_entry_two.yaml.world.1.expect b/pkg/front_end/testcases/incremental/macro_change_entry_two.yaml.world.1.expect
@@ -49,7 +49,7 @@ holepunch:pkg/_macros/lib/src/api/builders.dart:
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 holepunch:pkg/_macros/lib/src/api/code.dart:
-- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:460:6)
+- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:469:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/macro_change_entry_two.yaml.world.2.expect b/pkg/front_end/testcases/incremental/macro_change_entry_two.yaml.world.2.expect
@@ -45,7 +45,7 @@ holepunch:pkg/_macros/lib/src/api/builders.dart:
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 holepunch:pkg/_macros/lib/src/api/code.dart:
-- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:460:6)
+- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:469:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/macro_change_nestedness.yaml.world.1.expect b/pkg/front_end/testcases/incremental/macro_change_nestedness.yaml.world.1.expect
@@ -69,7 +69,7 @@ holepunch:pkg/_macros/lib/src/api/builders.dart:
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 holepunch:pkg/_macros/lib/src/api/code.dart:
-- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:460:6)
+- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:469:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/macro_change_nestedness.yaml.world.2.expect b/pkg/front_end/testcases/incremental/macro_change_nestedness.yaml.world.2.expect
@@ -84,7 +84,7 @@ holepunch:pkg/_macros/lib/src/api/builders.dart:
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 holepunch:pkg/_macros/lib/src/api/code.dart:
-- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:460:6)
+- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:469:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/macro_recompile.yaml.world.1.expect b/pkg/front_end/testcases/incremental/macro_recompile.yaml.world.1.expect
@@ -69,7 +69,7 @@ holepunch:pkg/_macros/lib/src/api/builders.dart:
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 holepunch:pkg/_macros/lib/src/api/code.dart:
-- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:460:6)
+- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:469:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/macro_recompile.yaml.world.2.expect b/pkg/front_end/testcases/incremental/macro_recompile.yaml.world.2.expect
@@ -66,7 +66,7 @@ holepunch:pkg/_macros/lib/src/api/builders.dart:
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 holepunch:pkg/_macros/lib/src/api/code.dart:
-- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:460:6)
+- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:469:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/macro_reuse_compiled_macro.yaml.world.1.expect b/pkg/front_end/testcases/incremental/macro_reuse_compiled_macro.yaml.world.1.expect
@@ -68,7 +68,7 @@ holepunch:pkg/_macros/lib/src/api/builders.dart:
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 holepunch:pkg/_macros/lib/src/api/code.dart:
-- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:460:6)
+- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:469:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/macro_reuse_compiled_macro.yaml.world.2.expect b/pkg/front_end/testcases/incremental/macro_reuse_compiled_macro.yaml.world.2.expect
@@ -65,7 +65,7 @@ holepunch:pkg/_macros/lib/src/api/builders.dart:
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 holepunch:pkg/_macros/lib/src/api/code.dart:
-- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:460:6)
+- CodeKind. (from holepunch:pkg/_macros/lib/src/api/code.dart:469:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/macros/CHANGELOG.md b/pkg/macros/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.0-main.3
+
+- Validate parts in `Code.fromParts()`.
+
 ## 0.1.0-main.2
 
 - Add caching for `typeDeclarationOf` results.

diff --git a/pkg/macros/pubspec.yaml b/pkg/macros/pubspec.yaml
@@ -1,5 +1,5 @@
 name: macros
-version: 0.1.0-main.2
+version: 0.1.0-main.3
 description: >-
   This package is for macro authors, and exposes the APIs necessary to write
   a macro. It exports the APIs from the private `_macros` SDK vendored package.
@@ -11,4 +11,4 @@ environment:
 dependencies:
   _macros:
     sdk: dart
-    version: 0.1.2
+    version: 0.1.3