Skip to content

Fix broken simplification of prerelease constraints #3078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 30, 2021
Merged

Fix broken simplification of prerelease constraints #3078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/src/package_name.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,7 @@ class PackageRange extends PackageName {
if (!range.includeMin) return this;
if (range.includeMax) return this;
if (range.min == null) return this;
if (range.max == range.min.nextBreaking.firstPreRelease ||
(range.min.isPreRelease && range.max == range.min.nextBreaking)) {
if (range.max == range.min.nextBreaking.firstPreRelease) {
return withConstraint(VersionConstraint.compatibleWith(range.min));
} else {
return this;
Expand Down
38 changes: 38 additions & 0 deletions test/version_solver_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1759,6 +1759,44 @@ void prerelease() {
'c': '1.0.0',
});
});

test('https://github.com/dart-lang/pub/issues/3057 regression', () async {
// This used to cause an infinite loop.
await servePackages((builder) {
builder.serve('a', '0.12.0', deps: {});
builder.serve('b', '0.1.0', deps: {'c': '2.0.0'});
builder.serve('b', '0.9.0-1', deps: {'c': '^1.6.0'});
builder.serve('b', '0.10.0', deps: {'a': '1.0.0'});
builder.serve('b', '0.17.0', deps: {'a': '1.0.0'});
builder.serve('c', '2.0.1', deps: {});
});

await d.appDir(
{
'a': '0.12.0',
'b': 'any',
},
).create();
await expectResolves(
error: contains(
'So, because myapp depends on both a 0.12.0 and b any, version solving failed.'),
tries: 2);
});

test('https://github.com/dart-lang/pub/pull/3038 regression', () async {
await servePackages((builder) {
builder.serve('a', '1.1.0', deps: {'b': '^1.0.0'});
builder.serve('b', '1.0.0', deps: {'c': '^1.0.0'});
builder.serve('c', '0.9.0');
builder.serve('b', '1.1.0-alpha');
builder.serve('a', '1.0.0', deps: {'b': '^1.1.0-alpha'});
});

await d.appDir({
'a': '^1.0.0',
}).create();
await expectResolves(tries: 2);
});
}

void override() {
Expand Down