diff --git a/app/lib/search/dart_sdk_mem_index.dart b/app/lib/search/dart_sdk_mem_index.dart index 690eaae4b..06bbc9c0e 100644 --- a/app/lib/search/dart_sdk_mem_index.dart +++ b/app/lib/search/dart_sdk_mem_index.dart @@ -10,13 +10,6 @@ import 'sdk_mem_index.dart'; final _logger = Logger('search.dart_sdk_mem_index'); -/// Results from these libraries are ranked with lower score and -/// will be displayed only if the query has the library name, or -/// there are not other results that could match the query. -const dartSdkLibraryWeights = { - 'dart:html': 0.7, -}; - /// Sets the Dart SDK in-memory index. void registerDartSdkMemIndex(SdkMemIndex? index) { if (index != null) { diff --git a/app/lib/search/flutter_sdk_mem_index.dart b/app/lib/search/flutter_sdk_mem_index.dart index 1089938e4..7f0e405ed 100644 --- a/app/lib/search/flutter_sdk_mem_index.dart +++ b/app/lib/search/flutter_sdk_mem_index.dart @@ -32,11 +32,6 @@ const flutterSdkAllowedLibraries = { 'flutter_web_plugins', }; -const flutterApiPageDirWeights = { - 'cupertino/CupertinoIcons': 0.25, - 'material/Icons': 0.25, -}; - final _logger = Logger('search.flutter_sdk_mem_index'); /// Sets the Flutter SDK in-memory index. diff --git a/app/lib/search/sdk_mem_index.dart b/app/lib/search/sdk_mem_index.dart index baa3f0cf0..b27e0c7ff 100644 --- a/app/lib/search/sdk_mem_index.dart +++ b/app/lib/search/sdk_mem_index.dart @@ -8,7 +8,6 @@ import 'package:meta/meta.dart'; // ignore: implementation_imports import 'package:pana/src/dartdoc/dartdoc_index.dart'; import 'package:path/path.dart' as p; -import 'package:pub_dev/search/dart_sdk_mem_index.dart'; import 'package:pub_dev/search/flutter_sdk_mem_index.dart'; import '../shared/versions.dart'; @@ -17,6 +16,21 @@ import 'token_index.dart'; export 'package:pana/src/dartdoc/dartdoc_index.dart'; +/// Results from these libraries are ranked with lower score and +/// will be displayed only if the query has the library name, or +/// there are not other results that could match the query. +const _libraryWeights = { + 'dart:html': 0.7, +}; + +/// Results from these API pages are ranked with lower score and +/// will be displayed only if the query has the library and the page +/// name, or there are not other results that could match the query. +const _defaultApiPageDirWeights = { + 'cupertino/CupertinoIcons': 0.25, + 'material/Icons': 0.25, +}; + /// In-memory index for SDK library search queries. class SdkMemIndex { final String _sdk; @@ -25,7 +39,6 @@ class SdkMemIndex { final _tokensPerLibrary = >{}; final _baseUriPerLibrary = {}; final _descriptionPerLibrary = {}; - final Map _libraryWeights; final Map _apiPageDirWeights; SdkMemIndex({ @@ -34,13 +47,11 @@ class SdkMemIndex { required Uri baseUri, required DartdocIndex index, Set? allowedLibraries, - Map? libraryWeights, Map? apiPageDirWeights, }) : _sdk = sdk, _version = version, _baseUri = baseUri, - _libraryWeights = libraryWeights ?? const {}, - _apiPageDirWeights = apiPageDirWeights ?? const {} { + _apiPageDirWeights = apiPageDirWeights ?? _defaultApiPageDirWeights { _addDartdocIndex(index, allowedLibraries); } @@ -50,7 +61,6 @@ class SdkMemIndex { version: runtimeSdkVersion, baseUri: Uri.parse('https://api.dart.dev/stable/latest/'), index: index, - libraryWeights: dartSdkLibraryWeights, ); } @@ -61,7 +71,6 @@ class SdkMemIndex { baseUri: Uri.parse('https://api.flutter.dev/flutter/'), index: index, allowedLibraries: flutterSdkAllowedLibraries, - apiPageDirWeights: flutterApiPageDirWeights, ); } diff --git a/app/test/search/sdk_mem_index_test.dart b/app/test/search/sdk_mem_index_test.dart index 2c4f546af..7182b508c 100644 --- a/app/test/search/sdk_mem_index_test.dart +++ b/app/test/search/sdk_mem_index_test.dart @@ -4,7 +4,6 @@ import 'dart:convert'; -import 'package:pub_dev/search/dart_sdk_mem_index.dart'; import 'package:pub_dev/search/sdk_mem_index.dart'; import 'package:test/test.dart'; @@ -17,10 +16,6 @@ void main() { sdk: 'dart', version: '', baseUri: Uri.parse('https://api.dart.dev/x/'), - libraryWeights: dartSdkLibraryWeights, - apiPageDirWeights: { - 'dart:html/FakeIcons': 0.7, - }, index: DartdocIndex.fromJsonList([ { 'name': 'dart:async',