diff --git a/packages/devtools_app/lib/src/shared/diagnostics/inspector_service.dart b/packages/devtools_app/lib/src/shared/diagnostics/inspector_service.dart index c92f525937d..47a8f34d8d1 100644 --- a/packages/devtools_app/lib/src/shared/diagnostics/inspector_service.dart +++ b/packages/devtools_app/lib/src/shared/diagnostics/inspector_service.dart @@ -203,10 +203,6 @@ class InspectorService extends InspectorServiceBase { final ValueNotifier> _rootDirectories = ValueNotifier([]); - @visibleForTesting - Set get rootPackages => _rootPackages; - late Set _rootPackages; - @visibleForTesting List get rootPackagePrefixes => _rootPackagePrefixes; late List _rootPackagePrefixes; @@ -326,9 +322,8 @@ class InspectorService extends InspectorServiceBase { return false; } - Future _onRootDirectoriesChanged(List directories) async { + void _onRootDirectoriesChanged(List directories) { _rootDirectories.value = directories; - _rootPackages = {}; _rootPackagePrefixes = []; for (var directory in directories) { // TODO(jacobr): add an API to DDS to provide the actual mapping to and @@ -356,68 +351,19 @@ class InspectorService extends InspectorServiceBase { packageParts = packageParts.sublist(2); } final google3PackageName = packageParts.join('.'); - _rootPackages.add(google3PackageName); _rootPackagePrefixes.add('$google3PackageName.'); - } else { - _rootPackages.add(path.last); - } - } - - await _updateLocalClasses(); - } - - Future _updateLocalClasses() { - return Future.value(); - // TODO(https://github.com/flutter/devtools/issues/4393) - // localClasses.clear(); - // if (_rootDirectories.value.isNotEmpty) { - // final isolate = inspectorLibrary.isolate!; - // for (var libraryRef in isolate.libraries!) { - // if (isLocalUri(libraryRef.uri!)) { - // try { - // final Library library = await inspectorLibrary.service - // .getObject(isolate.id!, libraryRef.id!) as Library; - // for (var classRef in library.classes!) { - // localClasses[classRef.name!] = classRef; - // } - // } catch (e) { - // // Workaround until https://github.com/flutter/devtools/issues/3110 - // // is fixed. - // assert(serviceManager.manager.connectedApp!.isDartWebAppNow!); - // } - // } - // } - // } - } - - @visibleForTesting - bool isLocalUri(String rawUri) { - final uri = Uri.parse(rawUri); - if (uri.scheme != 'file' && uri.scheme != 'dart') { - // package scheme or some other dart specific scheme. - final packageName = uri.pathSegments.first; - if (_rootPackages.contains(packageName)) return true; - - // This attempts to gracefully handle the bazel package case. - return _rootPackagePrefixes - .any((prefix) => packageName.startsWith(prefix)); - } - for (var root in _rootDirectories.value) { - if (root.endsWith(rawUri)) { - return true; } } - return false; } Future addPubRootDirectories(List rootDirectories) async { await _addPubRootDirectories(rootDirectories); - await _onRootDirectoriesChanged(rootDirectories); + _onRootDirectoriesChanged(rootDirectories); } Future removePubRootDirectories(List rootDirectories) async { await _removePubRootDirectories(rootDirectories); - await _onRootDirectoriesChanged(rootDirectories); + _onRootDirectoriesChanged(rootDirectories); } Future _addPubRootDirectories(List pubDirectories) { diff --git a/packages/devtools_app/test/inspector/inspector_service_test.dart b/packages/devtools_app/test/inspector/inspector_service_test.dart index 84b6b605aea..bf481d012e6 100644 --- a/packages/devtools_app/test/inspector/inspector_service_test.dart +++ b/packages/devtools_app/test/inspector/inspector_service_test.dart @@ -169,10 +169,6 @@ void main() { ), ); - expect( - inspectorServiceLocal.rootPackages.toList(), - equals(['flutter_app']), - ); expect( inspectorServiceLocal.rootPackagePrefixes.toList(), isEmpty, @@ -181,50 +177,10 @@ void main() { await inspectorServiceLocal.addPubRootDirectories( ['/usr/jacobr/foo/lib', '/usr/jacobr/bar/lib/bla'], ); - expect( - inspectorServiceLocal.rootPackages.toList(), - equals(['foo', 'bar']), - ); expect( inspectorServiceLocal.rootPackagePrefixes.toList(), isEmpty, ); - - expect( - inspectorServiceLocal.isLocalUri('package:foo/src/bar.dart'), - isTrue, - ); - expect( - inspectorServiceLocal - .isLocalUri('package:foo.bla/src/bar.dart'), - isFalse, - ); - expect( - inspectorServiceLocal.isLocalUri('package:foos/src/bar.dart'), - isFalse, - ); - expect( - inspectorServiceLocal.isLocalUri('package:bar/src/bar.dart'), - isTrue, - ); - expect( - inspectorServiceLocal.isLocalUri( - 'package:bar.core/src/bar.dart', - ), - isFalse, - ); - expect( - inspectorServiceLocal.isLocalUri( - 'package:bar.core.bla/src/bar.dart', - ), - isFalse, - ); - expect( - inspectorServiceLocal.isLocalUri( - 'package:bar.cores/src/bar.dart', - ), - isFalse, - ); } finally { // Restore. await inspectorServiceLocal @@ -250,10 +206,6 @@ void main() { await inspectorServiceLocal.addPubRootDirectories( ['/usr/me/clients/google3/foo/bar/baz/lib/src/bla'], ); - expect( - inspectorServiceLocal.rootPackages.toList(), - equals(['foo.bar.baz']), - ); expect( inspectorServiceLocal.rootPackagePrefixes.toList(), equals(['foo.bar.baz.']), @@ -263,12 +215,6 @@ void main() { '/usr/me/clients/google3/foo/bar/baz/lib/src/bla', '/usr/me/clients/google3/foo/core/lib', ]); - expect( - inspectorServiceLocal.rootPackages.toList(), - equals( - ['foo.bar.baz', 'foo.core'], - ), - ); expect( inspectorServiceLocal.rootPackagePrefixes.toList(), equals( @@ -281,12 +227,6 @@ void main() { '/usr/me/clients/google3/foo/bar/baz', '/usr/me/clients/google3/foo/core/', ]); - expect( - inspectorServiceLocal.rootPackages.toList(), - equals( - ['foo.bar.baz', 'foo.core'], - ), - ); expect( inspectorServiceLocal.rootPackagePrefixes.toList(), equals( @@ -297,56 +237,15 @@ void main() { '/usr/me/clients/google3/third_party/dart/foo/lib/src/bla', '/usr/me/clients/google3/third_party/dart_src/bar/core/lib', ]); - expect( - inspectorServiceLocal.rootPackages.toList(), - equals(['foo', 'bar.core']), - ); expect( inspectorServiceLocal.rootPackagePrefixes.toList(), equals(['foo.', 'bar.core.']), ); - expect( - inspectorServiceLocal.isLocalUri('package:foo/src/bar.dart'), - isTrue, - ); - // Package at subdirectory. - expect( - inspectorServiceLocal.isLocalUri('package:foo.bla/src/bar.dart'), - isTrue, - ); - expect( - inspectorServiceLocal.isLocalUri('package:foos/src/bar.dart'), - isFalse, - ); - expect( - inspectorServiceLocal.isLocalUri('package:bar/src/bar.dart'), - isFalse, - ); - expect( - inspectorServiceLocal.isLocalUri('package:bar.core/src/bar.dart'), - isTrue, - ); - // Package at subdirectory. - expect( - inspectorServiceLocal - .isLocalUri('package:bar.core.bla/src/bar.dart'), - isTrue, - ); - expect( - inspectorServiceLocal - .isLocalUri('package:bar.cores/src/bar.dart'), - isFalse, - ); - await inspectorServiceLocal.addPubRootDirectories([ '/usr/me/clients/google3/third_party/dart/foo', '/usr/me/clients/google3/third_party/dart_src/bar/core', ]); - expect( - inspectorServiceLocal.rootPackages.toList(), - equals(['foo', 'bar.core']), - ); expect( inspectorServiceLocal.rootPackagePrefixes.toList(), equals(['foo.', 'bar.core.']),