@@ -146,42 +146,33 @@ Future<void> testBenchmarks({required bool useTallStyle}) async {
146146void _testFile (TestFile testFile) {
147147 group (testFile.path, () {
148148 for (var formatTest in testFile.tests) {
149+ Map <Version , TestEntry > testedVersions;
149150 if (testFile.isTall) {
150- Map <Version , TestEntry > testedVersions;
151- switch (formatTest) {
152- case UnversionedFormatTest (: var output):
153- // This output is unversioned, so test at the lowest and highest
154- // supported versions. If it formats the same on those, we assume
155- // it does for all of the intermediate versions too.
156- testedVersions = {
157- _testedTallVersions.first: output,
158- _testedTallVersions.last: output,
159- };
160- case VersionedFormatTest (: var outputs):
161- testedVersions = _versionedTestEntries (outputs);
162- }
163-
164- testedVersions.forEach ((version, output) {
165- _runTestAtVersion (testFile, formatTest, output, version);
166- });
151+ testedVersions = switch (formatTest) {
152+ // This output is unversioned, so test at the lowest and highest
153+ // supported versions. If it formats the same on those, we assume
154+ // it does for all of the intermediate versions too.
155+ UnversionedFormatTest (: var output) => {
156+ _testedTallVersions.first: output,
157+ _testedTallVersions.last: output,
158+ },
159+ VersionedFormatTest (: var outputs) => _versionedTestEntries (outputs),
160+ };
167161 } else {
168- switch (formatTest) {
169- case UnversionedFormatTest (: var output):
170- _runTestAtVersion (
171- testFile,
172- formatTest,
173- output,
174- DartFormatter .latestShortStyleLanguageVersion,
175- );
176- case VersionedFormatTest (: var outputs):
177- // There is only one versioned short style test, for the legacy
178- // switch syntax. If the test is versioned, only run it on those
179- // versions and not anything later.
180- outputs.forEach ((version, output) {
181- _runTestAtVersion (testFile, formatTest, output, version);
182- });
183- }
162+ testedVersions = switch (formatTest) {
163+ UnversionedFormatTest (: var output) => {
164+ DartFormatter .latestShortStyleLanguageVersion: output,
165+ },
166+ // There is only one versioned short style test, for the legacy
167+ // switch syntax. If the test is versioned, only run it on those
168+ // versions and not anything later.
169+ VersionedFormatTest (: var outputs) => outputs,
170+ };
184171 }
172+
173+ testedVersions.forEach ((version, output) {
174+ _runTestAtVersion (testFile, formatTest, output, version);
175+ });
185176 }
186177 });
187178}
0 commit comments