Fix analysis warnings for new flutter (#6694)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2869a96..c5ec50e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml
@@ -40,30 +40,6 @@ BOT: main run: ./tool/bots.sh - # TODO(https://github.com/dart-lang/sdk/issues/53992): we can remove this - # once this issue is resolved and the `devtools_tool analyze` check is moved - # back into the "main" handler in bots.sh. - analyze: - name: analyze - needs: flutter-prep - runs-on: macos-latest - strategy: - fail-fast: false - steps: - - name: git clone - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac - - name: Load Cached Flutter SDK - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 - with: - path: | - ./flutter-sdk - key: flutter-sdk-${{ runner.os }}-${{ needs.flutter-prep.outputs.latest_flutter_candidate }} - - - name: tool/bots.sh - env: - BOT: analyze - run: ./tool/bots.sh - dcm: name: Dart Code Metrics needs: flutter-prep
diff --git a/packages/devtools_app/lib/src/screens/logging/logging_controller.dart b/packages/devtools_app/lib/src/screens/logging/logging_controller.dart index 9372272..913b84a 100644 --- a/packages/devtools_app/lib/src/screens/logging/logging_controller.dart +++ b/packages/devtools_app/lib/src/screens/logging/logging_controller.dart
@@ -828,8 +828,7 @@ final Map<String, dynamic>? _route; - String? get routeDescription => - _route == null ? null : _route!['description']; + String? get routeDescription => _route == null ? null : _route['description']; } class ServiceExtensionStateChangedInfo {
diff --git a/packages/devtools_test/lib/src/mocks/fake_vm_service_wrapper.dart b/packages/devtools_test/lib/src/mocks/fake_vm_service_wrapper.dart index d44b70b..c249270 100644 --- a/packages/devtools_test/lib/src/mocks/fake_vm_service_wrapper.dart +++ b/packages/devtools_test/lib/src/mocks/fake_vm_service_wrapper.dart
@@ -32,7 +32,7 @@ allocationSamples = allocationSamples ?? _defaultProfile { _reverseResolvedUriMap = <String, String>{}; if (_resolvedUriMap != null) { - for (var e in _resolvedUriMap!.entries) { + for (var e in _resolvedUriMap.entries) { _reverseResolvedUriMap![e.value] = e.key; } } @@ -127,7 +127,7 @@ return Future.value( UriList( uris: _resolvedUriMap != null - ? (uris.map((e) => _resolvedUriMap![e]).toList()) + ? (uris.map((e) => _resolvedUriMap[e]).toList()) : null, ), ); @@ -142,7 +142,7 @@ return Future.value( UriList( uris: _reverseResolvedUriMap != null - ? (uris.map((e) => _reverseResolvedUriMap![e]).toList()) + ? (uris.map((e) => _reverseResolvedUriMap[e]).toList()) : null, ), ); @@ -274,7 +274,7 @@ throw StateError('_memoryData was not provided to FakeServiceManager'); } - final heapSample = _memoryData!.data.first; + final heapSample = _memoryData.data.first; return Future.value( MemoryUsage( externalUsage: heapSample.external,
diff --git a/tool/bots.sh b/tool/bots.sh index a9478fa..a55bb16 100755 --- a/tool/bots.sh +++ b/tool/bots.sh
@@ -79,17 +79,7 @@ pushd $DEVTOOLS_DIR/packages/devtools_app echo `pwd` -# TODO(https://github.com/dart-lang/sdk/issues/53992): we can put this back into -# the "main" bot once this issue is resolved. -if [ "$BOT" = "analyze" ]; then - - # Get packages - devtools_tool pub-get - - # Analyze the code - devtools_tool analyze - -elif [ "$BOT" = "main" ]; then +if [ "$BOT" = "main" ]; then # Verify that dart format has been run. echo "Checking formatting..." @@ -102,6 +92,9 @@ # Get packages devtools_tool pub-get + # Analyze the code + devtools_tool analyze + popd # Test the `devtools_app_shared`, `devtools_shared` and `devtools_extensions` package tests on the