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

DRAFT: completion/sqlmap: simplify code flow (whitespace) #1962

Merged
merged 2 commits into from
Nov 10, 2024

Conversation

gaelicWizard
Copy link
Contributor

@gaelicWizard gaelicWizard commented Sep 20, 2021

Description

Convert from indented if-block to return then unindented code. This should have basically one line change at the top, one line removed at the bottom, and then all whitespace. And apply shfmt.

Motivation and Context

Just cleaning up.

NOTE: shellcheck is very unhappy with this file, so I haven't done any fixes related to that.

How Has This Been Tested?

Types of changes

  • Bug fix (non-breaking change which fixes an issue)

Checklist:

  • My code follows the code style of this project.
  • If my change requires a change to the documentation, I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • If I have added a new file, I also added it to clean_files.txt and formatted it using lint_clean_files.sh.
  • I have added tests to cover my changes, and all the new and existing tests pass.

@gaelicWizard gaelicWizard marked this pull request as ready for review September 22, 2021 20:56
Copy link
Contributor

@davidpfarrell davidpfarrell left a comment

Choose a reason for hiding this comment

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

Another @tbhaxor file - Let them have a chance to review ...

Q: Shouldn't this PR be adding this to clean_files.txt ?

[edit] I see now you state that you didn't run this through shell-check, so thats likely why no clean_files.txt addition ...

@NoahGorny
Copy link
Member

I think that only fixing the whitespaces without addressing the shellcheck issues is not important enough to merge IMO.
Every file that we fix without adding it to clean_files.txt might be cluttered again in the future by a mistake

@gaelicWizard
Copy link
Contributor Author

I think that only fixing the whitespaces without addressing the shellcheck issues is not important enough to merge IMO.
Every file that we fix without adding it to clean_files.txt might be cluttered again in the future by a mistake

Don't let perfect be the enemy of the good!

I always do whitespace changes in a separate commit so that if it gets fingered in a git blame there is minimal confusion before moving on to the next blame.

Either way, I do expect to circle back to clean up the completion function. Just haven't gotten to it yet!

@gaelicWizard gaelicWizard marked this pull request as draft October 18, 2021 13:55
Convert from indented if-block to return then unindented code. This should have basically one line change at the top, one line removed at the bottom, and then all whitespace.

Apply `shfmt`, but `shellcheck` is an absolute mess, so don't add to `clean_files.txt` yet.
@gaelicWizard gaelicWizard changed the title completion/sqlmap: simplify code flow (whitespace) DRAFT: completion/sqlmap: simplify code flow (whitespace) Feb 20, 2022
Copy link
Contributor

@seefood seefood left a comment

Choose a reason for hiding this comment

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

Looks good.

@seefood seefood marked this pull request as ready for review November 10, 2024 14:41
@seefood seefood merged commit 8afb3a0 into Bash-it:master Nov 10, 2024
4 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants