Skip to content

Commit 2c123f8

Browse files
committed
Merge pull request #35 from dart-lang/devoncarew_remove_space
Devoncarew remove space
2 parents df8edc1 + f35cef5 commit 2c123f8

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

lib/src/generator.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,8 +506,8 @@ class HtmlGeneratorHelper extends Helper {
506506
buf.write(', ');
507507
}
508508
if (p.type != null && p.type.name != null) {
509-
buf.write(createLinkedTypeName(p.type));
510-
buf.write(' ');
509+
String typeName = createLinkedTypeName(p.type);
510+
if (typeName.isNotEmpty) buf.write('${typeName} ');
511511
}
512512
buf.write(p.name);
513513
}

lib/src/model.dart

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ abstract class ModelElement {
122122
String retType = generator.createLinkedReturnTypeName(new ElementType(ex.type, library));
123123

124124
return '${generator.createLinkedName(this)}'
125-
'(${generator.printParams(ex.parameters.map((f)=>
125+
'(${generator.printParams(ex.parameters.map((f) =>
126126
new Parameter(f, library)))})'
127127
'${retType.isEmpty ? '' : ': $retType'}';
128128
}
@@ -149,7 +149,7 @@ abstract class ModelElement {
149149
}
150150

151151
buf.write(generator.createLinkedReturnTypeName(new ElementType(e.type, library)));
152-
buf.write(' ${e.name}(${generator.printParams(e.parameters.map((f)=> new Parameter(f, library)).toList())})');
152+
buf.write(' ${e.name}(${generator.printParams(e.parameters.map((f) => new Parameter(f, library)).toList())})');
153153
return buf.toString();
154154
}
155155
if (isPropertyInducer) {
@@ -352,7 +352,7 @@ class ModelFunction extends ModelElement {
352352
String retType = generator.createLinkedReturnTypeName(new ElementType(_func.type, library));
353353

354354
return '${generator.createLinkedName(this)}'
355-
'(${generator.printParams(_func.parameters.map((f)=> new Parameter(f, library)))})'
355+
'(${generator.printParams(_func.parameters.map((f) => new Parameter(f, library)))})'
356356
'${retType.isEmpty ? '' : ': $retType'}';
357357
}
358358

@@ -362,7 +362,7 @@ class ModelFunction extends ModelElement {
362362
buf.write('static ');
363363
}
364364
buf.write(generator.createLinkedReturnTypeName(new ElementType(_func.type, library)));
365-
buf.write(' ${_func.name}(${generator.printParams(_func.parameters.map((f)=> new Parameter(f, library)))})');
365+
buf.write(' ${_func.name}(${generator.printParams(_func.parameters.map((f) => new Parameter(f, library)))})');
366366
return buf.toString();
367367
}
368368
}
@@ -389,7 +389,7 @@ class Typedef extends ModelElement {
389389
}
390390
buf.write('>');
391391
}
392-
buf.write('(${generator.printParams(_typedef.parameters.map((f)=> new Parameter(f, library)))}): ');
392+
buf.write('(${generator.printParams(_typedef.parameters.map((f) => new Parameter(f, library)))}): ');
393393
buf.write(generator.createLinkedReturnTypeName(new ElementType(_typedef.type, library)));
394394
return buf.toString();
395395
}
@@ -409,7 +409,7 @@ class Typedef extends ModelElement {
409409
}
410410
buf.write('>');
411411
}
412-
buf.write('(${generator.printParams(_typedef.parameters.map((f)=> new Parameter(f, library)))}): ');
412+
buf.write('(${generator.printParams(_typedef.parameters.map((f) => new Parameter(f, library)))}): ');
413413
return buf.toString();
414414
}
415415

@@ -451,7 +451,7 @@ class Constructor extends ModelElement {
451451
buf.write('${_constructor.type.returnType.name}${_constructor.name.isEmpty?'':'.'}'
452452
'${_constructor.name}'
453453
'(${generator.printParams(
454-
_constructor.parameters.map((f)=> new Parameter(f, library)))})');
454+
_constructor.parameters.map((f) => new Parameter(f, library)))})');
455455
return buf.toString();
456456
}
457457
}
@@ -495,7 +495,7 @@ class Accessor extends ModelElement {
495495
new ModelElement.from(_accessor.type.element, library))));
496496
} else {
497497
buf.write('${generator.createLinkedName(this)}('
498-
'${generator.printParams(_accessor.parameters.map((f)=>
498+
'${generator.printParams(_accessor.parameters.map((f) =>
499499
new Parameter(f,library)))})');
500500
}
501501
return buf.toString();
@@ -509,7 +509,7 @@ class Accessor extends ModelElement {
509509
if (_accessor.isGetter) {
510510
buf.write('${generator.createLinkedReturnTypeName(new ElementType(_accessor.type, new ModelElement.from(_accessor.type.element, library)))} get ${_accessor.name}');
511511
} else {
512-
buf.write('set ${_accessor.name}(${generator.printParams(_accessor.parameters.map((f)=> new Parameter(f,library)))})');
512+
buf.write('set ${_accessor.name}(${generator.printParams(_accessor.parameters.map((f) => new Parameter(f,library)))})');
513513
}
514514
return buf.toString();
515515
}
@@ -533,10 +533,11 @@ class Parameter extends ModelElement {
533533

534534
Parameter(ParameterElement element, Library library) : super(element, library);
535535

536-
ParameterElement get _parameter => (element as ParameterElement);
536+
ParameterElement get _parameter => element as ParameterElement;
537537

538538
ElementType get type => new ElementType(_parameter.type, library);
539539

540+
String toString() => element.name;
540541
}
541542

542543
class ElementType {

0 commit comments

Comments
 (0)