github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jonah Williams 2020-10-26 15:59:00 -07:00 committed by GitHub
parent 7a10b46ee0
commit e7b66ac7ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/flutter_tools/lib/src/doctor.dart
View File

@ -74,7 +74,8 @@ class _DefaultDoctorValidatorsProvider implements DoctorValidatorsProvider {
} }
final List<DoctorValidator> ideValidators = <DoctorValidator>[ final List<DoctorValidator> ideValidators = <DoctorValidator>[
...AndroidStudioValidator.allValidators(globals.config, globals.platform, globals.fs, globals.userMessages), if (androidWorkflow.appliesToHostPlatform)
...AndroidStudioValidator.allValidators(globals.config, globals.platform, globals.fs, globals.userMessages),
...IntelliJValidator.installedValidators( ...IntelliJValidator.installedValidators(
fileSystem: globals.fs, fileSystem: globals.fs,
platform: globals.platform, platform: globals.platform,

8
packages/flutter_tools/test/commands.shard/hermetic/doctor_test.dart
View File

@ -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() {
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 {