Skip to content
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

Add linting and fix classlib indention #2298

Merged
merged 9 commits into from
Aug 27, 2016

Conversation

gusano
Copy link
Member

@gusano gusano commented Aug 20, 2016

This adds linting (for indention) as well as some indention fixes in the class library only.

Note that SCDocRenderer.sc is excluded as it was the only file which uses spaces there.

Travis runs the lint command and the build (on linux) will eventually fail fast if indention is broken in the class library.
(on travis linting is only run on linux because osx-ci uses bash-3 which does not support ** wildcard)

Re #2094

gusano added 4 commits August 19, 2016 16:45
Signed-off-by: Yvan Volochine <yvan.volochine@gmail.com>
Signed-off-by: Yvan Volochine <yvan.volochine@gmail.com>
Signed-off-by: Yvan Volochine <yvan.volochine@gmail.com>
@crucialfelix
Copy link
Member

Yay ! Thanks for doing this. We should convert scdocrendere too. Is it because of html in the class file ?

@gusano
Copy link
Member Author

gusano commented Aug 20, 2016

We should convert scdocrendere too. Is it because of html in the class file ?

@crucialfelix no, it appears to be the only file using spaces instead of tabs in the class library.
Gonna convert it as well then.

Signed-off-by: Yvan Volochine <yvan.volochine@gmail.com>
@gusano
Copy link
Member Author

gusano commented Aug 20, 2016

@crucialfelix done

@vivid-synth
Copy link
Member

If anyone wants to review the non-whitespace changes, here ya go

@gusano
Copy link
Member Author

gusano commented Aug 22, 2016

@crucialfelix I'd be willing to add linting for CMakeLists.txt files as well but it's a bit messy right now so it might be better in another PR.
At least with that one we have a consistent class library.

gusano added 3 commits August 23, 2016 15:40
Signed-off-by: Yvan Volochine <yvan.volochine@gmail.com>
Signed-off-by: Yvan Volochine <yvan.volochine@gmail.com>
@crucialfelix
Copy link
Member

yeah, let's do that later. and the cpp code too.

shit, this one already has a conflict.

I wanted to wait on it because the PRs that I'm merging now might cause a failure after they merge (and the linter is added).

Signed-off-by: Yvan Volochine <yvan.volochine@gmail.com>
@@ -22,8 +22,8 @@ TGrains : MultiOutUGen {
*ar { arg numChannels, trigger=0, bufnum=0, rate=1, centerPos=0,
dur=0.1, pan=0, amp=0.1, interp=4;
if (numChannels < 2) {
"TGrains needs at least two channels.".error;
^nil
"TGrains needs at least two channels.".error;
Copy link
Member

Choose a reason for hiding this comment

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

this is the conflict. I just merged a pr that removes this if check

@gusano
Copy link
Member Author

gusano commented Aug 23, 2016

@crucialfelix I fixed the conflict and now travis build is gonna fail fast (on linux) if there are any linting errors.

@crucialfelix crucialfelix added this to the 3.8 milestone Aug 25, 2016
@crucialfelix
Copy link
Member

crucialfelix commented Aug 25, 2016

I guess we should do this now.

The only reason I was thinking to wait was because of other PR that will still be merged that might re-introduce spaces. If one does get through then master errors and we have to just jump in and fix up the spaces. No big deal.

I will merge tomorrow if nobody speaks against it.

@crucialfelix crucialfelix merged commit 901dcda into supercollider:master Aug 27, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
comp: build CMake build system comp: class library SC class library
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants