Skip to content

Devoncarew remove space #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 2, 2015
Merged

Devoncarew remove space #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd8b18e
remove an extra space in method params
devoncarew Jan 2, 2015
f35cef5
Merge branch 'master' into devoncarew_remove_space
devoncarew Jan 2, 2015
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
4 changes: 2 additions & 2 deletions lib/src/generator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,8 +506,8 @@ class HtmlGeneratorHelper extends Helper {
buf.write(', ');
}
if (p.type != null && p.type.name != null) {
buf.write(createLinkedTypeName(p.type));
buf.write(' ');
String typeName = createLinkedTypeName(p.type);
if (typeName.isNotEmpty) buf.write('${typeName} ');
}
buf.write(p.name);
}
Expand Down
21 changes: 11 additions & 10 deletions lib/src/model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ abstract class ModelElement {
String retType = generator.createLinkedReturnTypeName(new ElementType(ex.type, library));

return '${generator.createLinkedName(this)}'
'(${generator.printParams(ex.parameters.map((f)=>
'(${generator.printParams(ex.parameters.map((f) =>
new Parameter(f, library)))})'
'${retType.isEmpty ? '' : ': $retType'}';
}
Expand All @@ -149,7 +149,7 @@ abstract class ModelElement {
}

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

return '${generator.createLinkedName(this)}'
'(${generator.printParams(_func.parameters.map((f)=> new Parameter(f, library)))})'
'(${generator.printParams(_func.parameters.map((f) => new Parameter(f, library)))})'
'${retType.isEmpty ? '' : ': $retType'}';
}

Expand All @@ -362,7 +362,7 @@ class ModelFunction extends ModelElement {
buf.write('static ');
}
buf.write(generator.createLinkedReturnTypeName(new ElementType(_func.type, library)));
buf.write(' ${_func.name}(${generator.printParams(_func.parameters.map((f)=> new Parameter(f, library)))})');
buf.write(' ${_func.name}(${generator.printParams(_func.parameters.map((f) => new Parameter(f, library)))})');
return buf.toString();
}
}
Expand All @@ -389,7 +389,7 @@ class Typedef extends ModelElement {
}
buf.write('>');
}
buf.write('(${generator.printParams(_typedef.parameters.map((f)=> new Parameter(f, library)))}): ');
buf.write('(${generator.printParams(_typedef.parameters.map((f) => new Parameter(f, library)))}): ');
buf.write(generator.createLinkedReturnTypeName(new ElementType(_typedef.type, library)));
return buf.toString();
}
Expand All @@ -409,7 +409,7 @@ class Typedef extends ModelElement {
}
buf.write('>');
}
buf.write('(${generator.printParams(_typedef.parameters.map((f)=> new Parameter(f, library)))}): ');
buf.write('(${generator.printParams(_typedef.parameters.map((f) => new Parameter(f, library)))}): ');
return buf.toString();
}

Expand Down Expand Up @@ -451,7 +451,7 @@ class Constructor extends ModelElement {
buf.write('${_constructor.type.returnType.name}${_constructor.name.isEmpty?'':'.'}'
'${_constructor.name}'
'(${generator.printParams(
_constructor.parameters.map((f)=> new Parameter(f, library)))})');
_constructor.parameters.map((f) => new Parameter(f, library)))})');
return buf.toString();
}
}
Expand Down Expand Up @@ -495,7 +495,7 @@ class Accessor extends ModelElement {
new ModelElement.from(_accessor.type.element, library))));
} else {
buf.write('${generator.createLinkedName(this)}('
'${generator.printParams(_accessor.parameters.map((f)=>
'${generator.printParams(_accessor.parameters.map((f) =>
new Parameter(f,library)))})');
}
return buf.toString();
Expand All @@ -509,7 +509,7 @@ class Accessor extends ModelElement {
if (_accessor.isGetter) {
buf.write('${generator.createLinkedReturnTypeName(new ElementType(_accessor.type, new ModelElement.from(_accessor.type.element, library)))} get ${_accessor.name}');
} else {
buf.write('set ${_accessor.name}(${generator.printParams(_accessor.parameters.map((f)=> new Parameter(f,library)))})');
buf.write('set ${_accessor.name}(${generator.printParams(_accessor.parameters.map((f) => new Parameter(f,library)))})');
}
return buf.toString();
}
Expand All @@ -533,10 +533,11 @@ class Parameter extends ModelElement {

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

ParameterElement get _parameter => (element as ParameterElement);
ParameterElement get _parameter => element as ParameterElement;

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

String toString() => element.name;
}

class ElementType {
Expand Down