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

DocBaseClass: Fix java docstyle bug #4530

Merged
merged 1 commit into from Jul 24, 2017

Conversation

4 participants
@damngamerz
Member

damngamerz commented Jul 22, 2017

Bug fix for java docstyles having no trailing
spaces before marker[1] and marker[2]

Fixes #4029

For short term contributors: we understand that getting your commits well
defined like we require is a hard task and takes some learning. If you
look to help without wanting to contribute long term there's no need
for you to learn this. Just drop us a message and we'll take care of brushing
up your stuff for merge!

Checklist

  • I read the commit guidelines and I've followed
    them.
  • I ran coala over my code locally. (All commits have to pass
    individually.
    It is not sufficient to have "fixup commits" on your PR,
    our bot will still report the issues for the previous commit.) You will
    likely receive a lot of bot comments and build failures if coala does not
    pass on every single commit!

After you submit your pull request, DO NOT click the 'Update Branch' button.
When asked for a rebase, consult coala.io/rebase
instead.

Please consider helping us by reviewing other peoples pull requests as well:

The more you review, the more your score will grow at coala.io and we will
review your PRs faster!

@@ -72,7 +72,7 @@ def test_DocBaseClass_extraction_C_2(self):
self.assertEqual(
list(DocBaseClass.extract(data, 'C', 'doxygen')),
[DocumentationComment(' my main description\n continues here',
[DocumentationComment(' my main description\n continues here ',

This comment has been minimized.

@damngamerz

damngamerz Jul 22, 2017

Member

This is so because now we use .strip() splicing.

@@ -33,7 +33,8 @@ int foobar(int x) {
}
/** line 1
* line2 */
* line2
*/

This comment has been minimized.

@damngamerz

damngamerz Jul 22, 2017

Member

same as the case of above. But this file is used for assemble() test. Which adds extra space at the end like

* line2  */

This is only happening in case of C

This comment has been minimized.

@damngamerz

damngamerz Jul 24, 2017

Member

we can investigate this later. For further info.
#4548

@NiklasMM

Looks good, but can we refactor markers into a namedtuple at some point? It's kinda hard to read with all those marker[0] and marker[1]s if you don't know what they are.

* @param side side of square
* @return area of a square
*/
public String sayHello(int side) {

This comment has been minimized.

@NiklasMM

NiklasMM Jul 24, 2017

Contributor

Why does this method return a String this makes no sense! :P just kidding...

This comment has been minimized.

@damngamerz

damngamerz Jul 24, 2017

Member

Just java things xD

DocBaseClass: Fix java docstyle bug
Bug fix for java docstyles having no trailing
spaces before marker[1] and marker[2]

Fixes #4029
@NiklasMM

This comment has been minimized.

Contributor

NiklasMM commented Jul 24, 2017

ack 5805f97

@NiklasMM

This comment has been minimized.

Contributor

NiklasMM commented Jul 24, 2017

@rultor merge

@rultor

This comment has been minimized.

Contributor

rultor commented Jul 24, 2017

@rultor merge

@NiklasMM OK, I'll try to merge now. You can check the progress of the merge here

@rultor rultor merged commit 5805f97 into coala:master Jul 24, 2017

6 of 9 checks passed

ci/circleci CircleCI is running your tests
Details
continuous-integration/appveyor/branch Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/push The Travis CI build is in progress
Details
codecov/project 100% (target 100%)
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
review/gitmate/commit This commit has no issues. :)
Details
review/gitmate/manual This commit was acknowledged.
Details
review/gitmate/pr This PR has no issues. :)
Details
@rultor

This comment has been minimized.

Contributor

rultor commented Jul 24, 2017

@rultor merge

@NiklasMM Done! FYI, the full log is here (took me 2min)

@damngamerz damngamerz deleted the damngamerz:javadoc branch Jul 24, 2017

@damngamerz damngamerz restored the damngamerz:javadoc branch Jul 24, 2017

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