Skip to content

[TypeScript][Angular] Fixed spacing in model.mustache #6788

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.

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 6 commits into from
Oct 24, 2017

Conversation

kenisteward
Copy link
Contributor

@kenisteward kenisteward commented Oct 23, 2017

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh and ./bin/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\.
  • Filed the PR against the correct branch: 3.0.0 branch for changes related to OpenAPI spec 3.0. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming langauge.

Description of the PR

@sebastianhaas @wing328

An extra line was being added in models. See any an example in the PR here #6757

Also amended typscript-angular2-all.bat and .sh to include angular 4 and angular 4.3 generation.

@kenisteward
Copy link
Contributor Author

Note @wing328 I see we have run-all-petstore.cmd that's run by appveyor but they are multiple *-all.bat files. This means tests are taking longer than needed due to double generating templates. Should we just include *-all.bat and update the appveyor script or should we in the appveyor script just exclude once that have -all in them?

@@ -10,7 +10,6 @@ export interface {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
*/
{{/description}}
{{name}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like this

}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But do you know where these two lines come from? Why two?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dangit.... I think I accidentally added another one after the simple eol. I can go back and change that lol

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

turns out it wasn't me. It was there incorrectly from the enum generator

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kenisteward ah I see. I'll create a PR to get rid of them eventually, unless anybody sees any value in having two empty lines at the end.

@wing328
Copy link
Contributor

wing328 commented Oct 24, 2017

Should we just include *-all.bat and update the appveyor script or should we in the appveyor script just exclude once that have -all in them?

@kenisteward maybe better to exclude *-all.bat

@wing328
Copy link
Contributor

wing328 commented Oct 24, 2017

@kenisteward the PR looks good

cc @TiFu @taxpon @sebastianhaas @Vrolijkx

@wing328 wing328 merged commit f7471ad into swagger-api:master Oct 24, 2017
@wing328 wing328 changed the title Fixed spacing in model.mustache [TypeScript][Angular] Fixed spacing in model.mustache Oct 24, 2017
@kenisteward
Copy link
Contributor Author

kenisteward commented Oct 24, 2017 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants