From cfbd61e913ec8f886937929124e7732e9f318331 Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Tue, 1 Jul 2025 10:33:45 +0200 Subject: [PATCH 1/3] Fix lints and tests. --- lib/src/model/canonicalization.dart | 2 +- lib/src/model/model_element.dart | 9 +++++---- test/end2end/dartdoc_test.dart | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/src/model/canonicalization.dart b/lib/src/model/canonicalization.dart index 28bbe93cfe..0556a02aa4 100644 --- a/lib/src/model/canonicalization.dart +++ b/lib/src/model/canonicalization.dart @@ -89,7 +89,7 @@ final class _Canonicalization { Element2? ancestor = element; while (ancestor != null) { if (ancestor is LibraryElement2) { - components.insert(0, ancestor.identifier); + components.insert(0, ancestor.uri.toString()); } else { components.insert(0, ancestor.name3!); } diff --git a/lib/src/model/model_element.dart b/lib/src/model/model_element.dart index c49e9fd48f..485ef28ece 100644 --- a/lib/src/model/model_element.dart +++ b/lib/src/model/model_element.dart @@ -412,11 +412,12 @@ abstract class ModelElement return false; } - if (element case LibraryElement2(:var identifier, :var firstFragment)) { + if (element case LibraryElement2(:var uri, :var firstFragment)) { + final url = uri.toString(); // Private Dart SDK libraries are not public. - if (identifier.startsWith('dart:_') || - identifier.startsWith('dart:nativewrappers/') || - 'dart:nativewrappers' == identifier) { + if (url.startsWith('dart:_') || + url.startsWith('dart:nativewrappers/') || + url == 'dart:nativewrappers') { return false; } // Package-private libraries are not public. diff --git a/test/end2end/dartdoc_test.dart b/test/end2end/dartdoc_test.dart index 1ec3cf0667..7da80918a4 100644 --- a/test/end2end/dartdoc_test.dart +++ b/test/end2end/dartdoc_test.dart @@ -110,7 +110,7 @@ void main() { expect( useSomethingInAnotherPackage.modelType.linkedName, matches( - r'Required')); + r'Required\?')); var link = RegExp('/dart-core/String-class.html">String'); expect(useSomethingInTheSdk.modelType.linkedName, contains(link)); }); From 02d7345cc086fced9b203f40b61e59988fb8413c Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Tue, 1 Jul 2025 10:45:41 +0200 Subject: [PATCH 2/3] also cover old versions --- test/end2end/dartdoc_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/end2end/dartdoc_test.dart b/test/end2end/dartdoc_test.dart index 7da80918a4..d9572e4942 100644 --- a/test/end2end/dartdoc_test.dart +++ b/test/end2end/dartdoc_test.dart @@ -110,7 +110,7 @@ void main() { expect( useSomethingInAnotherPackage.modelType.linkedName, matches( - r'Required\?')); + r'Required(\?)?')); var link = RegExp('/dart-core/String-class.html">String'); expect(useSomethingInTheSdk.modelType.linkedName, contains(link)); }); From 53db31251ca81c179c2798ef904b130e17330eb2 Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Tue, 1 Jul 2025 15:50:45 +0200 Subject: [PATCH 3/3] Update CI SDK + simpler match --- .github/workflows/test.yaml | 6 +++--- test/end2end/dartdoc_test.dart | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 3860b17a07..fc409e503e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -22,7 +22,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - sdk: [3.7.0, dev] + sdk: [3.8.0, dev] job: [main, flutter, packages, sdk-docs] include: - os: macos-latest @@ -35,9 +35,9 @@ jobs: # Do not try to run flutter against the "stable" sdk, # it is unlikely to work and produces uninteresting # results. - - sdk: 3.7.0 + - sdk: 3.8.0 job: flutter - - sdk: 3.7.0 + - sdk: 3.8.0 job: sdk-docs steps: diff --git a/test/end2end/dartdoc_test.dart b/test/end2end/dartdoc_test.dart index d9572e4942..6f0f14b8b5 100644 --- a/test/end2end/dartdoc_test.dart +++ b/test/end2end/dartdoc_test.dart @@ -110,7 +110,7 @@ void main() { expect( useSomethingInAnotherPackage.modelType.linkedName, matches( - r'Required(\?)?')); + r'Required\?')); var link = RegExp('/dart-core/String-class.html">String'); expect(useSomethingInTheSdk.modelType.linkedName, contains(link)); });