[flutter_tools] remove globals from utils (#63831)

packages/flutter_tools/lib/src/base/utils.dart

@@ -9,7 +9,6 @@ import 'package:intl/intl.dart';
 import 'package:meta/meta.dart';
 
 import '../convert.dart';
-import '../globals.dart' as globals;
 import 'file_system.dart';
 
 /// Convert `foo_bar` to `fooBar`.
@@ -206,12 +205,16 @@ const int kMinColumnWidth = 10;
 ///
 /// The [indent] and [hangingIndent] must be smaller than [columnWidth] when
 /// added together.
-String wrapText(String text, { int columnWidth, int hangingIndent, int indent, bool shouldWrap }) {
+String wrapText(String text, {
+  @required int columnWidth,
+  @required bool shouldWrap,
+  int hangingIndent,
+  int indent,
+}) {
   if (text == null || text.isEmpty) {
     return '';
   }
   indent ??= 0;
-  columnWidth ??= globals.outputPreferences.wrapColumn;
   columnWidth -= indent;
   assert(columnWidth >= 0);
 
@@ -287,34 +290,17 @@ class _AnsiRun {
 /// If [outputPreferences.wrapText] is false, then the text will be returned
 /// simply split at the newlines, but not wrapped. If [shouldWrap] is specified,
 /// then it overrides the [outputPreferences.wrapText] setting.
-List<String> _wrapTextAsLines(String text, { int start = 0, int columnWidth, @required bool shouldWrap }) {
+List<String> _wrapTextAsLines(String text, {
+  int start = 0,
+  int columnWidth,
+  @required bool shouldWrap,
+}) {
   if (text == null || text.isEmpty) {
     return <String>[''];
   }
   assert(columnWidth != null);
   assert(columnWidth >= 0);
   assert(start >= 0);
-  shouldWrap ??= globals.outputPreferences.wrapText;
-
-  /// Returns true if the code unit at [index] in [text] is a whitespace
-  /// character.
-  ///
-  /// Based on: https://en.wikipedia.org/wiki/Whitespace_character#Unicode
-  bool isWhitespace(_AnsiRun run) {
-    final int rune = run.character.isNotEmpty ? run.character.codeUnitAt(0) : 0x0;
-    return rune >= 0x0009 && rune <= 0x000D ||
-        rune == 0x0020 ||
-        rune == 0x0085 ||
-        rune == 0x1680 ||
-        rune == 0x180E ||
-        rune >= 0x2000 && rune <= 0x200A ||
-        rune == 0x2028 ||
-        rune == 0x2029 ||
-        rune == 0x202F ||
-        rune == 0x205F ||
-        rune == 0x3000 ||
-        rune == 0xFEFF;
-  }
 
   // Splits a string so that the resulting list has the same number of elements
   // as there are visible characters in the string, but elements may include one
@@ -396,3 +382,23 @@ List<String> _wrapTextAsLines(String text, { int start = 0, int columnWidth, @re
   }
   return result;
 }
+
+/// Returns true if the code unit at [index] in [text] is a whitespace
+/// character.
+///
+/// Based on: https://en.wikipedia.org/wiki/Whitespace_character#Unicode
+bool isWhitespace(_AnsiRun run) {
+  final int rune = run.character.isNotEmpty ? run.character.codeUnitAt(0) : 0x0;
+  return rune >= 0x0009 && rune <= 0x000D ||
+      rune == 0x0020 ||
+      rune == 0x0085 ||
+      rune == 0x1680 ||
+      rune == 0x180E ||
+      rune >= 0x2000 && rune <= 0x200A ||
+      rune == 0x2028 ||
+      rune == 0x2029 ||
+      rune == 0x202F ||
+      rune == 0x205F ||
+      rune == 0x3000 ||
+      rune == 0xFEFF;
+}

packages/flutter_tools/test/general.shard/utils_test.dart

@@ -2,17 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:flutter_tools/src/base/io.dart';
 import 'package:flutter_tools/src/base/utils.dart';
 import 'package:flutter_tools/src/base/version.dart';
 import 'package:flutter_tools/src/base/terminal.dart';
 
 import '../src/common.dart';
-import '../src/context.dart';
 
 void main() {
   group('SettingsFile', () {
-    test('parse', () {
+    testWithoutContext('parse', () {
       final SettingsFile file = SettingsFile.parse('''
 # ignore comment
 foo=bar
@@ -25,7 +23,7 @@ baz=qux
   });
 
   group('Version', () {
-    test('can parse and compare', () {
+    testWithoutContext('can parse and compare', () {
       expect(Version.unknown.toString(), equals('unknown'));
       expect(Version(null, null, null).toString(), equals('0'));
 
@@ -60,7 +58,7 @@ baz=qux
   });
 
   group('Misc', () {
-    test('snakeCase', () async {
+    testWithoutContext('snakeCase', () async {
       expect(snakeCase('abc'), equals('abc'));
       expect(snakeCase('abC'), equals('ab_c'));
       expect(snakeCase('aBc'), equals('a_bc'));
@@ -90,63 +88,53 @@ baz=qux
     const String _shortLine = 'Short line.';
     const String _indentedLongLine = '    This is an indented long line that needs to be '
         'wrapped and indentation preserved.';
-    final FakeStdio fakeStdio = FakeStdio();
-
-    void testWrap(String description, dynamic Function() body) {
-      testUsingContext(description, body, overrides: <Type, Generator>{
-        OutputPreferences: () => OutputPreferences(wrapText: true, wrapColumn: _lineLength),
-      });
-    }
-
-    void testNoWrap(String description, dynamic Function() body) {
-      testUsingContext(description, body, overrides: <Type, Generator>{
-        OutputPreferences: () => OutputPreferences(wrapText: false),
-      });
-    }
-
-    test('does not wrap by default in tests', () {
-      expect(wrapText(_longLine), equals(_longLine));
+    testWithoutContext('does not wrap by default in tests', () {
+      expect(wrapText(_longLine, columnWidth: 80, shouldWrap: true), equals(_longLine));
     });
-    testNoWrap('can override wrap preference if preference is off', () {
+
+    testWithoutContext('can override wrap preference if preference is off', () {
       expect(wrapText(_longLine, columnWidth: _lineLength, shouldWrap: true), equals('''
 This is a long line that needs to be
 wrapped.'''));
     });
-    testWrap('can override wrap preference if preference is on', () {
-      expect(wrapText(_longLine, shouldWrap: false), equals(_longLine));
+
+    testWithoutContext('can override wrap preference if preference is on', () {
+      expect(wrapText(_longLine, shouldWrap: false, columnWidth: 80), equals(_longLine));
     });
-    testNoWrap('does not wrap at all if not told to wrap', () {
-      expect(wrapText(_longLine), equals(_longLine));
+
+    testWithoutContext('does not wrap at all if not told to wrap', () {
+      expect(wrapText(_longLine, columnWidth: 80, shouldWrap: false), equals(_longLine));
     });
-    testWrap('does not wrap short lines.', () {
-      expect(wrapText(_shortLine, columnWidth: _lineLength), equals(_shortLine));
+
+    testWithoutContext('does not wrap short lines.', () {
+      expect(wrapText(_shortLine, columnWidth: _lineLength, shouldWrap: true), equals(_shortLine));
     });
-    testWrap('able to wrap long lines', () {
-      expect(wrapText(_longLine, columnWidth: _lineLength), equals('''
+
+    testWithoutContext('able to wrap long lines', () {
+      expect(wrapText(_longLine, columnWidth: _lineLength, shouldWrap: true), equals('''
 This is a long line that needs to be
 wrapped.'''));
     });
-    testUsingContext('able to handle dynamically changing terminal column size', () {
-      fakeStdio.currentColumnSize = 20;
-      expect(wrapText(_longLine), equals('''
+
+    testWithoutContext('able to handle dynamically changing terminal column size', () {
+      expect(wrapText(_longLine, columnWidth: 20, shouldWrap: true), equals('''
 This is a long line
 that needs to be
 wrapped.'''));
-      fakeStdio.currentColumnSize = _lineLength;
-      expect(wrapText(_longLine), equals('''
+
+      expect(wrapText(_longLine, columnWidth: _lineLength, shouldWrap: true), equals('''
 This is a long line that needs to be
 wrapped.'''));
-    }, overrides: <Type, Generator>{
-      OutputPreferences: () => OutputPreferences(wrapText: true),
-      Stdio: () => fakeStdio,
     });
-    testWrap('wrap long lines with no whitespace', () {
-      expect(wrapText('0123456789' * 5, columnWidth: _lineLength), equals('''
+
+    testWithoutContext('wrap long lines with no whitespace', () {
+      expect(wrapText('0123456789' * 5, columnWidth: _lineLength, shouldWrap: true), equals('''
 0123456789012345678901234567890123456789
 0123456789'''));
     });
-    testWrap('refuses to wrap to a column smaller than 10 characters', () {
-      expect(wrapText('$_longLine ' + '0123456789' * 4, columnWidth: 1), equals('''
+
+    testWithoutContext('refuses to wrap to a column smaller than 10 characters', () {
+      expect(wrapText('$_longLine ' + '0123456789' * 4, columnWidth: 1, shouldWrap: true), equals('''
 This is a
 long line
 that needs
@@ -157,40 +145,45 @@ wrapped.
 0123456789
 0123456789'''));
     });
-    testWrap('preserves indentation', () {
-      expect(wrapText(_indentedLongLine, columnWidth: _lineLength), equals('''
+    testWithoutContext('preserves indentation', () {
+      expect(wrapText(_indentedLongLine, columnWidth: _lineLength, shouldWrap: true), equals('''
     This is an indented long line that
     needs to be wrapped and indentation
     preserved.'''));
     });
-    testWrap('preserves indentation and stripping trailing whitespace', () {
-      expect(wrapText('$_indentedLongLine   ', columnWidth: _lineLength), equals('''
+
+    testWithoutContext('preserves indentation and stripping trailing whitespace', () {
+      expect(wrapText('$_indentedLongLine   ', columnWidth: _lineLength, shouldWrap: true), equals('''
     This is an indented long line that
     needs to be wrapped and indentation
     preserved.'''));
     });
-    testWrap('wraps text with newlines', () {
-      expect(wrapText(_longLineWithNewlines, columnWidth: _lineLength), equals('''
+
+    testWithoutContext('wraps text with newlines', () {
+      expect(wrapText(_longLineWithNewlines, columnWidth: _lineLength, shouldWrap: true), equals('''
 This is a long line with newlines that
 needs to be wrapped.
 
 0123456789012345678901234567890123456789
 0123456789'''));
     });
-    testWrap('wraps text with ANSI sequences embedded', () {
-      expect(wrapText(_longAnsiLineWithNewlines, columnWidth: _lineLength), equals('''
+
+    testWithoutContext('wraps text with ANSI sequences embedded', () {
+      expect(wrapText(_longAnsiLineWithNewlines, columnWidth: _lineLength, shouldWrap: true), equals('''
 ${AnsiTerminal.red}This${AnsiTerminal.resetAll} is a long line with newlines that
 needs to be wrapped.
 
 ${AnsiTerminal.green}0123456789${AnsiTerminal.resetAll}012345678901234567890123456789
 ${AnsiTerminal.green}0123456789${AnsiTerminal.resetAll}'''));
     });
-    testWrap('wraps text with only ANSI sequences', () {
-      expect(wrapText(_onlyAnsiSequences, columnWidth: _lineLength),
+
+    testWithoutContext('wraps text with only ANSI sequences', () {
+      expect(wrapText(_onlyAnsiSequences, columnWidth: _lineLength, shouldWrap: true),
           equals('${AnsiTerminal.red}${AnsiTerminal.resetAll}'));
     });
-    testWrap('preserves indentation in the presence of newlines', () {
-      expect(wrapText(_indentedLongLineWithNewlines, columnWidth: _lineLength), equals('''
+
+    testWithoutContext('preserves indentation in the presence of newlines', () {
+      expect(wrapText(_indentedLongLineWithNewlines, columnWidth: _lineLength, shouldWrap: true), equals('''
     This is an indented long line with
     newlines that
 needs to be wrapped.
@@ -199,46 +192,54 @@ needs to be wrapped.
   01234567890123456789012345678901234567
   890123456789'''));
     });
-    testWrap('removes trailing whitespace when wrapping', () {
-      expect(wrapText('$_longLine     \t', columnWidth: _lineLength), equals('''
+
+    testWithoutContext('removes trailing whitespace when wrapping', () {
+      expect(wrapText('$_longLine     \t', columnWidth: _lineLength, shouldWrap: true), equals('''
 This is a long line that needs to be
 wrapped.'''));
     });
-    testWrap('honors hangingIndent parameter', () {
-      expect(wrapText(_longLine, columnWidth: _lineLength, hangingIndent: 6), equals('''
+
+    testWithoutContext('honors hangingIndent parameter', () {
+      expect(wrapText(_longLine, columnWidth: _lineLength, hangingIndent: 6, shouldWrap: true), equals('''
 This is a long line that needs to be
       wrapped.'''));
     });
-    testWrap('handles hangingIndent with a single unwrapped line.', () {
-      expect(wrapText(_shortLine, columnWidth: _lineLength, hangingIndent: 6), equals('''
+
+    testWithoutContext('handles hangingIndent with a single unwrapped line.', () {
+      expect(wrapText(_shortLine, columnWidth: _lineLength, hangingIndent: 6, shouldWrap: true), equals('''
 Short line.'''));
     });
-    testWrap('handles hangingIndent with two unwrapped lines and the second is empty.', () {
-      expect(wrapText('$_shortLine\n', columnWidth: _lineLength, hangingIndent: 6), equals('''
+
+    testWithoutContext('handles hangingIndent with two unwrapped lines and the second is empty.', () {
+      expect(wrapText('$_shortLine\n', columnWidth: _lineLength, hangingIndent: 6, shouldWrap: true), equals('''
 Short line.
 '''));
     });
-    testWrap('honors hangingIndent parameter on already indented line.', () {
-      expect(wrapText(_indentedLongLine, columnWidth: _lineLength, hangingIndent: 6), equals('''
+
+    testWithoutContext('honors hangingIndent parameter on already indented line.', () {
+      expect(wrapText(_indentedLongLine, columnWidth: _lineLength, hangingIndent: 6, shouldWrap: true), equals('''
     This is an indented long line that
           needs to be wrapped and
           indentation preserved.'''));
     });
-    testWrap('honors hangingIndent and indent parameters at the same time.', () {
-      expect(wrapText(_indentedLongLine, columnWidth: _lineLength, indent: 6, hangingIndent: 6), equals('''
+
+    testWithoutContext('honors hangingIndent and indent parameters at the same time.', () {
+      expect(wrapText(_indentedLongLine, columnWidth: _lineLength, indent: 6, hangingIndent: 6, shouldWrap: true), equals('''
           This is an indented long line
                 that needs to be wrapped
                 and indentation
                 preserved.'''));
     });
-    testWrap('honors indent parameter on already indented line.', () {
-      expect(wrapText(_indentedLongLine, columnWidth: _lineLength, indent: 6), equals('''
+
+    testWithoutContext('honors indent parameter on already indented line.', () {
+      expect(wrapText(_indentedLongLine, columnWidth: _lineLength, indent: 6, shouldWrap: true), equals('''
           This is an indented long line
           that needs to be wrapped and
           indentation preserved.'''));
     });
-    testWrap('honors hangingIndent parameter on already indented line.', () {
-      expect(wrapText(_indentedLongLineWithNewlines, columnWidth: _lineLength, hangingIndent: 6), equals('''
+
+    testWithoutContext('honors hangingIndent parameter on already indented line.', () {
+      expect(wrapText(_indentedLongLineWithNewlines, columnWidth: _lineLength, hangingIndent: 6, shouldWrap: true), equals('''
     This is an indented long line with
           newlines that
 needs to be wrapped.
@@ -249,12 +250,3 @@ needs to be wrapped.
     });
   });
 }
-
-class FakeStdio extends Stdio {
-  FakeStdio();
-
-  int currentColumnSize = 20;
-
-  @override
-  int get terminalColumns => currentColumnSize;
-}