Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions tool/grind.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ void main(List<String> args) => grind(args);
@Task('Check plugin URLs for live-ness')
void checkUrls() async {
log('checking URLs in FlutterBundle.properties...');
var lines = await File('flutter-idea/src/io/flutter/FlutterBundle.properties')
.readAsLines();
var lines =
await File(
'flutter-idea/src/io/flutter/FlutterBundle.properties',
).readAsLines();
for (var line in lines) {
var split = line.split('=');
if (split.length == 2) {
Expand All @@ -24,8 +26,8 @@ void checkUrls() async {
log('checking: $url...');
if (response.statusCode != 200) {
fail(
'$url GET failed: [${response.statusCode}] ${response
.reasonPhrase}');
'$url GET failed: [${response.statusCode}] ${response.reasonPhrase}',
);
}
}
}
Expand Down Expand Up @@ -55,18 +57,21 @@ void outlineIcons() async {
}
}

void _createPng(File sourceSvg,
String targetName, {
required int? size,
bool forLight = false,
}) {
void _createPng(
File sourceSvg,
String targetName, {
required int? size,
bool forLight = false,
}) {
File targetFile = joinFile(sourceSvg.parent, [targetName]);

String color = forLight ? '#7a7a7a' : '#9e9e9e';

String originalContent = sourceSvg.readAsStringSync();
String newContent =
originalContent.replaceAll('<svg ', '<svg fill="$color" ');
String newContent = originalContent.replaceAll(
'<svg ',
'<svg fill="$color" ',
);

sourceSvg.writeAsStringSync(newContent);

Expand All @@ -80,8 +85,8 @@ void _createPng(File sourceSvg,

if (result.exitCode != 0) {
print(
'Error resizing image with imagemagick: ${result.stdout}\n${result
.stderr}');
'Error resizing image with imagemagick: ${result.stdout}\n${result.stderr}',
);
exit(1);
}
} finally {
Expand Down
28 changes: 14 additions & 14 deletions tool/plugin/lib/build_spec.dart
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,20 @@ class BuildSpec {
String? _changeLog;

BuildSpec.fromJson(Map<String, Object?> json, this.release)
: name = json['name'] as String,
channel = json['channel'] as String,
version = json['version'] as String,
ijVersion = json['ijVersion'] as String?,
ideaProduct = json['ideaProduct'] as String,
ideaVersion = json['ideaVersion'] as String,
baseVersion = (json['baseVersion'] ?? json['ideaVersion']) as String,
androidPluginVersion = json['androidPluginVersion'] as String,
dartPluginVersion = json['dartPluginVersion'] as String,
sinceBuild = json['sinceBuild'] as String,
untilBuild = json['untilBuild'] as String,
filesToSkip = json['filesToSkip'] as List<String>? ?? [],
isUnitTestTarget = json['isUnitTestTarget'] == 'true',
isTestTarget = json['isTestTarget'] == 'true';
: name = json['name'] as String,
channel = json['channel'] as String,
version = json['version'] as String,
ijVersion = json['ijVersion'] as String?,
ideaProduct = json['ideaProduct'] as String,
ideaVersion = json['ideaVersion'] as String,
baseVersion = (json['baseVersion'] ?? json['ideaVersion']) as String,
androidPluginVersion = json['androidPluginVersion'] as String,
dartPluginVersion = json['dartPluginVersion'] as String,
sinceBuild = json['sinceBuild'] as String,
untilBuild = json['untilBuild'] as String,
filesToSkip = json['filesToSkip'] as List<String>? ?? [],
isUnitTestTarget = json['isUnitTestTarget'] == 'true',
isTestTarget = json['isTestTarget'] == 'true';

bool get copyIjVersion => isAndroidStudio && ijVersion != null;

Expand Down
15 changes: 7 additions & 8 deletions tool/plugin/lib/edit.dart
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Future<int> applyEdits(BuildSpec spec, Future<int> Function() compileFn) async {
// Handle skipped files.
for (String file in spec.filesToSkip) {
final entity =
FileSystemEntity.isFileSync(file) ? File(file) : Directory(file);
FileSystemEntity.isFileSync(file) ? File(file) : Directory(file);
if (entity.existsSync()) {
await entity.rename('$file~');
log('renamed $file');
Expand Down Expand Up @@ -82,7 +82,7 @@ Future<int> applyEdits(BuildSpec spec, Future<int> Function() compileFn) async {
for (final file in spec.filesToSkip) {
final name = '$file~';
final entity =
FileSystemEntity.isFileSync(name) ? File(name) : Directory(name);
FileSystemEntity.isFileSync(name) ? File(name) : Directory(name);
if (entity.existsSync()) {
await entity.rename(file);
}
Expand All @@ -97,12 +97,11 @@ class EditCommand {
required List<String> initials,
required List<String> replacements,
this.versions = const [],
})
: assert(initials.length == replacements.length),
assert(initials.isNotEmpty),
assert(versions.isNotEmpty),
initials = initials.map(_platformAdaptiveString).toList(),
replacements = replacements.map(_platformAdaptiveString).toList();
}) : assert(initials.length == replacements.length),
assert(initials.isNotEmpty),
assert(versions.isNotEmpty),
initials = initials.map(_platformAdaptiveString).toList(),
replacements = replacements.map(_platformAdaptiveString).toList();

/// The target file path.
final String path;
Expand Down
20 changes: 8 additions & 12 deletions tool/plugin/lib/lint.dart
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ class LintCommand extends Command<int> {
final result = Process.runSync(
'git',
// Note: extra quotes added so grep doesn't match this file.
['grep', 'import com.jetbrains.' 'lang.dart.'],
[
'grep',
'import com.jetbrains.'
'lang.dart.',
],
);
final String imports = (result.stdout as String).trim();

Expand Down Expand Up @@ -112,10 +116,7 @@ class LintCommand extends Command<int> {
for (var import in proscribedImports) {
print('Checking for import of "$import"...');

final result = Process.runSync(
'git',
['grep', 'import $import'],
);
final result = Process.runSync('git', ['grep', 'import $import']);

final String results = (result.stdout as String).trim();
if (results.isNotEmpty) {
Expand All @@ -127,17 +128,12 @@ class LintCommand extends Command<int> {
}
}

final partialImports = [
'com.sun.',
];
final partialImports = ['com.sun.'];

for (var import in partialImports) {
print('Checking for import of "$import"...');

final result = Process.runSync(
'git',
['grep', 'import $import'],
);
final result = Process.runSync('git', ['grep', 'import $import']);

final String results = (result.stdout as String).trim();
if (results.isNotEmpty) {
Expand Down
Loading