Format with Dart 2.14

This commit is contained in:
Simon Binder
2021-09-09 17:07:41 +02:00
parent 16bc11540b
commit cc6d553fa6
26 changed files with 151 additions and 50 deletions
@@ -113,7 +113,9 @@ class _AggregateExpression<D> extends Expression<D> {
@override
void writeInto(GenerationContext context) {
context.buffer..write(functionName)..write('(');
context.buffer
..write(functionName)
..write('(');
if (distinct) {
context.buffer.write('DISTINCT ');
@@ -426,7 +426,9 @@ class FunctionCallExpression<R> extends Expression<R> {
@override
void writeInto(GenerationContext context) {
context.buffer..write(functionName)..write('(');
context.buffer
..write(functionName)
..write('(');
_writeCommaSeparated(context, arguments);
context.buffer.write(')');
}
@@ -201,7 +201,9 @@ class _CollateOperator extends Expression<String> {
@override
void writeInto(GenerationContext context) {
writeInner(context, inner);
context.buffer..write(' COLLATE ')..write(_operatorNames[collate]);
context.buffer
..write(' COLLATE ')
..write(_operatorNames[collate]);
}
@override
@@ -270,7 +270,9 @@ class Migrator {
final constraints = dslTable.customConstraints;
for (var i = 0; i < constraints.length; i++) {
context.buffer..write(', ')..write(constraints[i]);
context.buffer
..write(', ')
..write(constraints[i]);
}
context.buffer.write(')');
@@ -113,17 +113,23 @@ class GeneratedColumn<T> extends Column<T> {
// these custom constraints refer to builtin constraints from moor
if (_defaultConstraints != null) {
into.buffer..write(' ')..write(_defaultConstraints);
into.buffer
..write(' ')
..write(_defaultConstraints);
}
} else if ($customConstraints?.isNotEmpty == true) {
into.buffer..write(' ')..write($customConstraints);
into.buffer
..write(' ')
..write($customConstraints);
}
}
@override
void writeInto(GenerationContext context, {bool ignoreEscape = false}) {
if (context.hasMultipleTables) {
context.buffer..write(tableName)..write('.');
context.buffer
..write(tableName)
..write('.');
}
context.buffer.write(ignoreEscape ? $name : escapedName);
}
@@ -74,7 +74,9 @@ class JoinedSelectStatement<FirstT extends HasResultSet, FirstD>
0, _queriedTables(true).expand((t) => t.$columns).cast<Expression>());
ctx.hasMultipleTables = true;
ctx.buffer..write(_beginOfSelect(distinct))..write(' ');
ctx.buffer
..write(_beginOfSelect(distinct))
..write(' ');
for (var i = 0; i < _selectedColumns.length; i++) {
if (i != 0) {
@@ -91,7 +93,10 @@ class JoinedSelectStatement<FirstT extends HasResultSet, FirstD>
_columnAliases[column] = chosenAlias;
column.writeInto(ctx);
ctx.buffer..write(' AS "')..write(chosenAlias)..write('"');
ctx.buffer
..write(' AS "')
..write(chosenAlias)
..write('"');
}
ctx.buffer.write(' FROM ${table.tableWithAlias}');
@@ -23,7 +23,9 @@ class UpdateStatement<T extends Table, D> extends Query<T, D>
first = false;
}
ctx.buffer..write(escapeIfNeeded(columnName))..write(' = ');
ctx.buffer
..write(escapeIfNeeded(columnName))
..write(' = ');
variable.writeInto(ctx);
});
+3 -1
View File
@@ -1192,7 +1192,9 @@ class PureDefault extends DataClass implements Insertable<PureDefault> {
);
@override
String toString() {
return (StringBuffer('PureDefault(')..write('txt: $txt')..write(')'))
return (StringBuffer('PureDefault(')
..write('txt: $txt')
..write(')'))
.toString();
}
+2 -2
View File
@@ -180,8 +180,8 @@ void main() {
final query = db
.select(todos)
.join([innerJoin(categories, todos.category.equalsExp(categories.id))])
..where(todos.id.isSmallerThanValue(5))
..where(categories.id.isBiggerOrEqualValue(10));
..where(todos.id.isSmallerThanValue(5))
..where(categories.id.isBiggerOrEqualValue(10));
await query.get();
+10 -2
View File
@@ -10,7 +10,11 @@ void main() {
expectLater(stream, emitsInOrder([1, 2, 3, 4]));
controller..add([1])..add([2])..add([3])..add([4]);
controller
..add([1])
..add([2])
..add([3])
..add([4]);
controller.close();
});
@@ -21,7 +25,11 @@ void main() {
expectLater(stream,
emitsInOrder([1, emitsError(anything), 2, emitsError(anything)]));
controller..add([1])..add([2, 3])..add([2])..add([]);
controller
..add([1])
..add([2, 3])
..add([2])
..add([]);
controller.close();
});
@@ -139,7 +139,7 @@ class SqlAnalyzer extends BaseAnalyzer {
final handled = QueryHandler(query, context, mapper,
requiredVariables: requiredVariables)
.handle()
..declaredInMoorFile = declaredInMoor;
..declaredInMoorFile = declaredInMoor;
foundQueries.add(handled);
} catch (e, s) {
// todo remove dependency on build package here
@@ -108,7 +108,9 @@ class _OutlineVisitor extends RecursiveVisitor<void, void> {
if (resolved != null) {
final parameterBuilder = StringBuffer('(');
final vars = resolved.elements.map((e) => e.dartTypeCode()).join(', ');
parameterBuilder..write(vars)..write(')');
parameterBuilder
..write(vars)
..write(')');
element.parameters = parameterBuilder.toString();
}
+8 -2
View File
@@ -12,10 +12,16 @@ void setupLogging({bool verbose = false, bool useAnsi}) {
final level = rec.level;
final msgBuffer = StringBuffer();
msgBuffer..write(rec.level.name)..write(': ')..write(rec.message);
msgBuffer
..write(rec.level.name)
..write(': ')
..write(rec.message);
if (rec.error != null) {
msgBuffer..write(rec.error)..write('\n')..write(rec.stackTrace);
msgBuffer
..write(rec.error)
..write('\n')
..write(rec.stackTrace);
}
if (level <= log.Level.CONFIG) {
@@ -211,7 +211,9 @@ class QueryWriter {
'Future<List<${_select.resultTypeCode(scope.generationOptions)}>>';
_buffer.write('$returnType ${query.name}(');
_writeParameters();
_buffer..write(') {\n')..write('return ${_nameOfCreationMethod()}(');
_buffer
..write(') {\n')
..write('return ${_nameOfCreationMethod()}(');
_writeUseParameters();
_buffer.write(').get();\n}\n');
}
@@ -232,7 +234,9 @@ class QueryWriter {
'Stream<List<${_select.resultTypeCode(scope.generationOptions)}>>';
_buffer.write('$returnType $methodName(');
_writeParameters();
_buffer..write(') {\n')..write('return ${_nameOfCreationMethod()}(');
_buffer
..write(') {\n')
..write('return ${_nameOfCreationMethod()}(');
_writeUseParameters();
_buffer.write(').watch();\n}\n');
}
@@ -359,10 +363,16 @@ class QueryWriter {
for (final arg in optional.availableResultSets) {
if (i != 0) buffer.write(', ');
buffer..write(arg.argumentType)..write(' ')..write('_' * (i + 1));
buffer
..write(arg.argumentType)
..write(' ')
..write('_' * (i + 1));
i++;
}
buffer..write(') => ')..write(defaultCode)..write(';');
buffer
..write(') => ')
..write(defaultCode)
..write(';');
// With the function being written, the default code is just a tear-
// off of that function
@@ -383,12 +393,16 @@ class QueryWriter {
(!isNullable || isMarkedAsRequired) && defaultCode == null ||
options.namedParametersAlwaysRequired;
if (isRequired) {
_buffer..write(scope.required)..write(' ');
_buffer
..write(scope.required)
..write(' ');
}
_buffer.write('$type ${optional.dartParameterName}');
if (defaultCode != null && !isRequired) {
_buffer..write(' = ')..write(defaultCode);
_buffer
..write(' = ')
..write(defaultCode);
}
}
@@ -451,7 +465,10 @@ class QueryWriter {
void _increaseIndexCounter(String by) {
if (needsIndexCounter) {
_buffer..write('$highestAssignedIndexVar += ')..write(by)..write(';\n');
_buffer
..write('$highestAssignedIndexVar += ')
..write(by)
..write(';\n');
}
}
@@ -516,7 +533,9 @@ class QueryWriter {
..write(useExpression())
..write(');\n');
} else {
_buffer..write(r'$write(')..write(useExpression());
_buffer
..write(r'$write(')
..write(useExpression());
if (query.hasMultipleTables) {
_buffer.write(', hasMultipleTables: true');
}
@@ -608,7 +627,7 @@ class QueryWriter {
node is DartPlaceholder ||
node is NestedStarResultColumn)
.toList()
..sort(_compareNodes);
..sort(_compareNodes);
final buffer = StringBuffer("'");
@@ -700,7 +719,10 @@ class QueryWriter {
void _writeUpdates() {
final from = _update.updates.map((t) => t.table.dbGetterName).join(', ');
_buffer..write('updates: {')..write(from)..write('}');
_buffer
..write('updates: {')
..write(from)
..write('}');
}
void _writeUpdateKind() {
@@ -61,7 +61,9 @@ class ResultSetWriter {
for (final column in fieldNames) {
if (nonNullableFields.contains(column)) {
into..write(scope.required)..write(' ');
into
..write(scope.required)
..write(' ');
}
into.write('this.$column,');
}
@@ -262,7 +262,9 @@ class DataClassWriter {
for (final column in table.columns) {
final dartName = column.dartGetterName;
_buffer..write(dartName)..write(': ');
_buffer
..write(dartName)
..write(': ');
final needsNullCheck = column.nullable || !scope.generationOptions.nnbd;
if (needsNullCheck) {
@@ -272,7 +274,10 @@ class DataClassWriter {
// We'll write the non-null case afterwards
}
_buffer..write('Value (')..write(dartName)..write('),');
_buffer
..write('Value (')
..write(dartName)
..write('),');
}
_buffer.writeln(');\n}');
@@ -331,7 +336,9 @@ class RowMappingWriter {
buffer.write('(');
for (final column in positional) {
buffer..write(readAndMap(column))..write(', ');
buffer
..write(readAndMap(column))
..write(', ');
}
named.forEach((column, parameterName) {
@@ -91,7 +91,10 @@ abstract class TableOrViewWriter {
first = false;
}
expressionBuffer..write(name)..write(': ')..write(value);
expressionBuffer
..write(name)
..write(': ')
..write(value);
});
expressionBuffer.write(')');
@@ -169,9 +172,13 @@ abstract class TableOrViewWriter {
final classElement = info.targetClass;
final ctor = info.constructor;
buffer..write('return ')..write(classElement.name);
buffer
..write('return ')
..write(classElement.name);
if (ctor.name.isNotEmpty) {
buffer..write('.')..write(ctor.name);
buffer
..write('.')
..write(ctor.name);
}
writer.writeArguments(buffer);
@@ -400,7 +407,9 @@ class TableWriter extends TableOrViewWriter {
void _overrideFieldsIfNeeded() {
if (table.overrideWithoutRowId != null) {
final value = table.overrideWithoutRowId! ? 'true' : 'false';
buffer..write('@override\n')..write('bool get withoutRowId => $value;\n');
buffer
..write('@override\n')
..write('bool get withoutRowId => $value;\n');
}
if (table.overrideTableConstraints != null) {
@@ -119,7 +119,9 @@ class UpdateCompanionWriter {
_buffer.write('$type ${column.dartGetterName}, \n');
}
_buffer..write('}) {\n')..write('return RawValuesInsertable({');
_buffer
..write('}) {\n')
..write('return RawValuesInsertable({');
for (final column in table.columns) {
_buffer
@@ -32,5 +32,7 @@ void overrideToString(
into.write("')");
}
into..write("..write(')')).toString();")..write('\}\n');
into
..write("..write(')')).toString();")
..write('\}\n');
}
@@ -48,7 +48,9 @@ void main() {
final a = MoorTable(sqlName: 'a', dartTypeName: 'a');
final b = MoorTable(sqlName: 'b', dartTypeName: 'b');
a.references..add(a)..add(b);
a.references
..add(a)
..add(b);
final sorted = sortEntitiesTopologically([a, b]);
expect(sorted, [b, a]);
@@ -44,10 +44,14 @@ class Reference extends Expression with ReferenceOwner {
final result = StringBuffer();
if (schemaName != null) {
result..write(schemaName)..write('.');
result
..write(schemaName)
..write('.');
}
if (entityName != null) {
result..write(entityName)..write('.');
result
..write(entityName)
..write('.');
}
result.write(columnName);
@@ -586,7 +586,9 @@ class NumericToken extends Token {
String toString() {
final buffer = StringBuffer();
if (hexDigits != null) {
buffer..write('0x')..write(hexDigits);
buffer
..write('0x')
..write(hexDigits);
} else {
if (digitsBeforeDecimal != null) {
buffer.write(digitsBeforeDecimal);
@@ -599,7 +601,9 @@ class NumericToken extends Token {
}
if (exponent != null) {
buffer..write('E')..write(exponent);
buffer
..write('E')
..write(exponent);
}
}
@@ -135,12 +135,14 @@ INSERT INTO demo VALUES (?, ?)
test('handles update statement with from clause', () {
// Example from here: https://www.sqlite.org/lang_update.html#upfrom
engine..registerTableFromSql('''
engine
..registerTableFromSql('''
CREATE TABLE inventory (
itemId INTEGER PRIMARY KEY,
quantity INTEGER NOT NULL DEFAULT 0,
);
''')..registerTableFromSql('''
''')
..registerTableFromSql('''
CREATE TABLE sales (
itemId INTEGER NOT NULL,
quantity INTEGER NOT NULL,
@@ -208,11 +208,13 @@ SELECT row_number() OVER wnd FROM demo
});
group('nullability for references from outer join', () {
final engine = SqlEngine()..registerTableFromSql('''
final engine = SqlEngine()
..registerTableFromSql('''
CREATE TABLE users (
id INTEGER NOT NULL PRIMARY KEY
);
''')..registerTableFromSql('''
''')
..registerTableFromSql('''
CREATE TABLE messages (
sender INTEGER NOT NULL
);
@@ -45,7 +45,9 @@ const Map<String, ResolvedType?> _types = {
};
SqlEngine _spawnEngine() {
return SqlEngine()..registerTable(demoTable)..registerTable(anotherTable);
return SqlEngine()
..registerTable(demoTable)
..registerTable(anotherTable);
}
void main() {
@@ -40,7 +40,9 @@ ComputedSuggestions _compute(String moorFile) {
}
void _setupEngine(SqlEngine engine) {
engine..registerTable(demoTable)..registerTable(anotherTable);
engine
..registerTable(demoTable)
..registerTable(anotherTable);
}
Matcher get suggestsTables => suggestsAll(['demo', 'tbl', 'sqlite_master']);