Commit c14470e0 authored by Devon Carew's avatar Devon Carew Committed by GitHub

dont' validate against webstorm (#10828)

parent 40941426
...@@ -251,11 +251,9 @@ abstract class IntelliJValidator extends DoctorValidator { ...@@ -251,11 +251,9 @@ abstract class IntelliJValidator extends DoctorValidator {
static final Map<String, String> _idToTitle = <String, String>{ static final Map<String, String> _idToTitle = <String, String>{
'IntelliJIdea' : 'IntelliJ IDEA Ultimate Edition', 'IntelliJIdea' : 'IntelliJ IDEA Ultimate Edition',
'IdeaIC' : 'IntelliJ IDEA Community Edition', 'IdeaIC' : 'IntelliJ IDEA Community Edition',
'WebStorm': 'WebStorm',
}; };
static final Version kMinIdeaVersion = new Version(2017, 1, 0); static final Version kMinIdeaVersion = new Version(2017, 1, 0);
static final Version kMinWebStormVersion = new Version(2017, 1, 0);
static final Version kMinFlutterPluginVersion = new Version(14, 0, 0); static final Version kMinFlutterPluginVersion = new Version(14, 0, 0);
static Iterable<DoctorValidator> get installedValidators { static Iterable<DoctorValidator> get installedValidators {
...@@ -272,11 +270,7 @@ abstract class IntelliJValidator extends DoctorValidator { ...@@ -272,11 +270,7 @@ abstract class IntelliJValidator extends DoctorValidator {
_validatePackage(messages, 'flutter-intellij.jar', 'Flutter', _validatePackage(messages, 'flutter-intellij.jar', 'Flutter',
minVersion: kMinFlutterPluginVersion); minVersion: kMinFlutterPluginVersion);
_validatePackage(messages, 'Dart', 'Dart');
// Dart is bundled with WebStorm.
if (!isWebStorm) {
_validatePackage(messages, 'Dart', 'Dart');
}
if (_hasIssues(messages)) { if (_hasIssues(messages)) {
messages.add(new ValidationMessage( messages.add(new ValidationMessage(
...@@ -285,7 +279,7 @@ abstract class IntelliJValidator extends DoctorValidator { ...@@ -285,7 +279,7 @@ abstract class IntelliJValidator extends DoctorValidator {
)); ));
} }
_validateIntelliJVersion(messages, isWebStorm ? kMinWebStormVersion : kMinIdeaVersion); _validateIntelliJVersion(messages, kMinIdeaVersion);
return new ValidationResult( return new ValidationResult(
_hasIssues(messages) ? ValidationType.partial : ValidationType.installed, _hasIssues(messages) ? ValidationType.partial : ValidationType.installed,
...@@ -298,8 +292,6 @@ abstract class IntelliJValidator extends DoctorValidator { ...@@ -298,8 +292,6 @@ abstract class IntelliJValidator extends DoctorValidator {
return messages.any((ValidationMessage message) => message.isError); return messages.any((ValidationMessage message) => message.isError);
} }
bool get isWebStorm => title == 'WebStorm';
void _validateIntelliJVersion(List<ValidationMessage> messages, Version minVersion) { void _validateIntelliJVersion(List<ValidationMessage> messages, Version minVersion) {
// Ignore unknown versions. // Ignore unknown versions.
if (minVersion == Version.unknown) if (minVersion == Version.unknown)
...@@ -429,7 +421,6 @@ class IntelliJValidatorOnMac extends IntelliJValidator { ...@@ -429,7 +421,6 @@ class IntelliJValidatorOnMac extends IntelliJValidator {
'IntelliJ IDEA.app' : 'IntelliJIdea', 'IntelliJ IDEA.app' : 'IntelliJIdea',
'IntelliJ IDEA Ultimate.app' : 'IntelliJIdea', 'IntelliJ IDEA Ultimate.app' : 'IntelliJIdea',
'IntelliJ IDEA CE.app' : 'IdeaIC', 'IntelliJ IDEA CE.app' : 'IdeaIC',
'WebStorm.app': 'WebStorm',
}; };
static Iterable<DoctorValidator> get installed { static Iterable<DoctorValidator> get installed {
......
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