Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
0cc087c2
Unverified
Commit
0cc087c2
authored
Mar 10, 2021
by
Jonah Williams
Committed by
GitHub
Mar 10, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[flutter_tools] migrate some base libraries to null safety (#77738)
parent
c13a8ca4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
32 deletions
+21
-32
common.dart
packages/flutter_tools/lib/src/base/common.dart
+2
-4
utils.dart
packages/flutter_tools/lib/src/base/utils.dart
+18
-25
convert.dart
packages/flutter_tools/lib/src/convert.dart
+1
-3
No files found.
packages/flutter_tools/lib/src/base/common.dart
View file @
0cc087c2
...
...
@@ -2,13 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// @dart = 2.8
/// Throw a specialized exception for expected situations
/// where the tool should exit with a clear message to the user
/// and no stack trace unless the --verbose option is specified.
/// For example: network errors.
void
throwToolExit
(
String
message
,
{
int
exitCode
})
{
void
throwToolExit
(
String
message
,
{
int
?
exitCode
})
{
throw
ToolExit
(
message
,
exitCode:
exitCode
);
}
...
...
@@ -20,7 +18,7 @@ class ToolExit implements Exception {
ToolExit
(
this
.
message
,
{
this
.
exitCode
});
final
String
message
;
final
int
exitCode
;
final
int
?
exitCode
;
@override
String
toString
()
=>
'Exception:
$message
'
;
...
...
packages/flutter_tools/lib/src/base/utils.dart
View file @
0cc087c2
...
...
@@ -2,16 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// @dart = 2.8
import
'dart:async'
;
import
'dart:math'
as
math
;
import
'package:intl/intl.dart'
;
import
'package:
meta/meta
.dart'
;
import
'package:
file/file
.dart'
;
import
'../convert.dart'
;
import
'file_system.dart'
;
/// Convert `foo_bar` to `fooBar`.
String
camelCase
(
String
str
)
{
...
...
@@ -30,7 +28,7 @@ final RegExp _upperRegex = RegExp(r'[A-Z]');
/// Convert `fooBar` to `foo_bar`.
String
snakeCase
(
String
str
,
[
String
sep
=
'_'
])
{
return
str
.
replaceAllMapped
(
_upperRegex
,
(
Match
m
)
=>
'
${m.start == 0 ? '' : sep}${m[0].toLowerCase()}
'
);
(
Match
m
)
=>
'
${m.start == 0 ? '' : sep}${m[0]
!
.toLowerCase()}
'
);
}
String
toTitleCase
(
String
str
)
{
...
...
@@ -75,13 +73,9 @@ String getSizeAsMB(int bytesLength) {
/// removed, and calculate a diff of changes when a new list of items is
/// available.
class
ItemListNotifier
<
T
>
{
ItemListNotifier
()
{
_items
=
<
T
>{};
}
ItemListNotifier
():
_items
=
<
T
>{};
ItemListNotifier
.
from
(
List
<
T
>
items
)
{
_items
=
Set
<
T
>.
of
(
items
);
}
ItemListNotifier
.
from
(
List
<
T
>
items
)
:
_items
=
Set
<
T
>.
of
(
items
);
Set
<
T
>
_items
;
...
...
@@ -150,8 +144,8 @@ class SettingsFile {
/// Given a data structure which is a Map of String to dynamic values, return
/// the same structure (`Map<String, dynamic>`) with the correct runtime types.
Map
<
String
,
dynamic
>
castStringKeyedMap
(
dynamic
untyped
)
{
final
Map
<
dynamic
,
dynamic
>
map
=
untyped
as
Map
<
dynamic
,
dynamic
>
;
Map
<
String
,
dynamic
>
?
castStringKeyedMap
(
dynamic
untyped
)
{
final
Map
<
dynamic
,
dynamic
>
?
map
=
untyped
as
Map
<
dynamic
,
dynamic
>?
;
return
map
?.
cast
<
String
,
dynamic
>();
}
...
...
@@ -197,10 +191,10 @@ const int kMinColumnWidth = 10;
/// is such that less than [kMinColumnWidth] characters can fit in the
/// [columnWidth], then the indent is truncated to allow the text to fit.
String
wrapText
(
String
text
,
{
@
required
int
columnWidth
,
@
required
bool
shouldWrap
,
int
hangingIndent
,
int
indent
,
required
int
columnWidth
,
required
bool
shouldWrap
,
int
?
hangingIndent
,
int
?
indent
,
})
{
assert
(
columnWidth
>=
0
);
if
(
text
==
null
||
text
.
isEmpty
)
{
...
...
@@ -239,7 +233,7 @@ String wrapText(String text, {
shouldWrap:
shouldWrap
,
);
}
String
hangingIndentString
;
String
?
hangingIndentString
;
final
String
indentString
=
' '
*
indent
;
result
.
addAll
(
notIndented
.
map
<
String
>(
(
String
line
)
{
...
...
@@ -252,7 +246,7 @@ String wrapText(String text, {
truncatedIndent
=
truncatedIndent
.
substring
(
0
,
math
.
max
(
columnWidth
-
kMinColumnWidth
,
0
));
}
final
String
result
=
'
$truncatedIndent$line
'
;
hangingIndentString
??=
' '
*
hangingIndent
;
hangingIndentString
??=
' '
*
hangingIndent
!
;
return
result
;
},
));
...
...
@@ -288,13 +282,12 @@ class _AnsiRun {
/// then it overrides the [outputPreferences.wrapText] setting.
List
<
String
>
_wrapTextAsLines
(
String
text
,
{
int
start
=
0
,
int
columnWidth
,
@
required
bool
shouldWrap
,
required
int
columnWidth
,
required
bool
shouldWrap
,
})
{
if
(
text
==
null
||
text
.
isEmpty
)
{
return
<
String
>[
''
];
}
assert
(
columnWidth
!=
null
);
assert
(
start
>=
0
);
// Splits a string so that the resulting list has the same number of elements
...
...
@@ -308,9 +301,9 @@ List<String> _wrapTextAsLines(String text, {
final
StringBuffer
current
=
StringBuffer
();
for
(
final
Match
match
in
characterOrCode
.
allMatches
(
input
))
{
current
.
write
(
match
[
0
]);
if
(
match
[
0
].
length
<
4
)
{
if
(
match
[
0
]
!
.
length
<
4
)
{
// This is a regular character, write it out.
result
.
add
(
_AnsiRun
(
current
.
toString
(),
match
[
0
]));
result
.
add
(
_AnsiRun
(
current
.
toString
(),
match
[
0
]
!
));
current
.
clear
();
}
}
...
...
@@ -328,7 +321,7 @@ List<String> _wrapTextAsLines(String text, {
return
result
;
}
String
joinRun
(
List
<
_AnsiRun
>
list
,
int
start
,
[
int
end
])
{
String
joinRun
(
List
<
_AnsiRun
>
list
,
int
start
,
[
int
?
end
])
{
return
list
.
sublist
(
start
,
end
).
map
<
String
>((
_AnsiRun
run
)
=>
run
.
original
).
join
().
trim
();
}
...
...
@@ -348,7 +341,7 @@ List<String> _wrapTextAsLines(String text, {
}
int
currentLineStart
=
0
;
int
lastWhitespace
;
int
?
lastWhitespace
;
// Find the start of the current line.
for
(
int
index
=
0
;
index
<
splitLine
.
length
;
++
index
)
{
if
(
splitLine
[
index
].
character
.
isNotEmpty
&&
isWhitespace
(
splitLine
[
index
]))
{
...
...
packages/flutter_tools/lib/src/convert.dart
View file @
0cc087c2
...
...
@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// @dart = 2.8
// Hide the original utf8 [Codec] so that we can export our own implementation
// which adds additional error handling.
import
'dart:convert'
hide
utf8
;
...
...
@@ -48,7 +46,7 @@ class Utf8Decoder extends cnv.Utf8Decoder {
final
bool
reportErrors
;
@override
String
convert
(
List
<
int
>
codeUnits
,
[
int
start
=
0
,
int
end
])
{
String
convert
(
List
<
int
>
codeUnits
,
[
int
start
=
0
,
int
?
end
])
{
final
String
result
=
super
.
convert
(
codeUnits
,
start
,
end
);
// Finding a unicode replacement character indicates that the input
// was malformed.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment