Unverified Commit e7b66ac7 authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

[flutter_tools] do not include AS validator if android is not enabled (#69047)

parent 7a10b46e
...@@ -74,6 +74,7 @@ class _DefaultDoctorValidatorsProvider implements DoctorValidatorsProvider { ...@@ -74,6 +74,7 @@ class _DefaultDoctorValidatorsProvider implements DoctorValidatorsProvider {
} }
final List<DoctorValidator> ideValidators = <DoctorValidator>[ final List<DoctorValidator> ideValidators = <DoctorValidator>[
if (androidWorkflow.appliesToHostPlatform)
...AndroidStudioValidator.allValidators(globals.config, globals.platform, globals.fs, globals.userMessages), ...AndroidStudioValidator.allValidators(globals.config, globals.platform, globals.fs, globals.userMessages),
...IntelliJValidator.installedValidators( ...IntelliJValidator.installedValidators(
fileSystem: globals.fs, fileSystem: globals.fs,
......
...@@ -6,6 +6,7 @@ import 'dart:async'; ...@@ -6,6 +6,7 @@ import 'dart:async';
import 'package:args/command_runner.dart'; import 'package:args/command_runner.dart';
import 'package:file/memory.dart'; import 'package:file/memory.dart';
import 'package:flutter_tools/src/android/android_studio_validator.dart';
import 'package:flutter_tools/src/base/common.dart'; import 'package:flutter_tools/src/base/common.dart';
import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/file_system.dart';
import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/logger.dart';
...@@ -673,6 +674,13 @@ void main() { ...@@ -673,6 +674,13 @@ void main() {
FlutterVersion: () => mockFlutterVersion, FlutterVersion: () => mockFlutterVersion,
Doctor: () => NoOpDoctor(), Doctor: () => NoOpDoctor(),
}, initializeFlutterRoot: false); }, initializeFlutterRoot: false);
testUsingContext('If android workflow is disabled, AndroidStudio validator is not included', () {
expect(DoctorValidatorsProvider.defaultInstance.validators, isNot(contains(isA<AndroidStudioValidator>())));
expect(DoctorValidatorsProvider.defaultInstance.validators, isNot(contains(isA<NoAndroidStudioValidator>())));
}, overrides: <Type, Generator>{
FeatureFlags: () => TestFeatureFlags(isAndroidEnabled: false),
});
} }
class NoOpDoctor implements Doctor { class NoOpDoctor implements Doctor {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment