From 25fb445f2370b517a8a4d4c71e7534a3ac9bed73 Mon Sep 17 00:00:00 2001 From: Steve Phelps Date: Sat, 24 Sep 2022 09:35:44 +0100 Subject: [PATCH 01/10] new hook for scalafix --- pre_commit_hooks/scalafix.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 pre_commit_hooks/scalafix.py diff --git a/pre_commit_hooks/scalafix.py b/pre_commit_hooks/scalafix.py new file mode 100644 index 0000000..6733206 --- /dev/null +++ b/pre_commit_hooks/scalafix.py @@ -0,0 +1,16 @@ +from pre_commit_hooks.runner import run_sbt_command +from colorama import init as colorama_init, Fore + +TASK_SCALAFIX = 'scalafixAll --check' +MISSING_PLUGIN_CHECK_STRING = 'Not a valid key: scalafixAll' +MISSING_PLUGIN_ERROR_MSG = f'{Fore.RED}ERROR: scalafix SBT plugin not present! See {Fore.BLUE}https://scalacenter.github.io/scalafix/docs/users/installation.html{Fore.RED} for installation instructions.' + + +def main(argv=None): + colorama_init() + + return run_sbt_command(f'; clean ; {TASK_SCALAFIX}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) + + +if __name__ == '__main__': + exit(main()) From 2f60b2ea03f9e7aed55a88d2eeea9c35f506b464 Mon Sep 17 00:00:00 2001 From: Steve Phelps Date: Sat, 24 Sep 2022 09:44:12 +0100 Subject: [PATCH 02/10] new hook for scalafix --- .pre-commit-hooks.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.pre-commit-hooks.yaml b/.pre-commit-hooks.yaml index 76146e3..2ef2411 100644 --- a/.pre-commit-hooks.yaml +++ b/.pre-commit-hooks.yaml @@ -30,3 +30,11 @@ pass_filenames: false always_run: true minimum_pre_commit_version: '0.19.0' +- id: sbt-scalafix + name: scalafix linting check + stages: [commit,push] + language: python_venv + entry: scalafix + pass_filenames: false + always_run: true + minimum_pre_commit_version: '0.3.2' From cd1824acf30193b4efb3fd69eebb2b98c9f98327 Mon Sep 17 00:00:00 2001 From: Steve Phelps Date: Sat, 24 Sep 2022 10:10:12 +0100 Subject: [PATCH 03/10] new hook for scalafix --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index 9e198a3..3e320c6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,4 +12,5 @@ python_requires = >=3.6 console_scripts = sbt-wartremover = pre_commit_hooks.sbt_wartremover:main scalafmt = pre_commit_hooks.scalafmt:main + scalafix = pre_commit_hooks.scalafix:main sbt-fatal-warnings = pre_commit_hooks.sbt_fatal_warnings:main From 2daf21ae99d84941f492131fc531e15c54be87a4 Mon Sep 17 00:00:00 2001 From: Steve Phelps Date: Sat, 24 Sep 2022 10:19:25 +0100 Subject: [PATCH 04/10] do not run clean before scalafix or scalafmt --- pre_commit_hooks/scalafix.py | 2 +- pre_commit_hooks/scalafmt.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pre_commit_hooks/scalafix.py b/pre_commit_hooks/scalafix.py index 6733206..2444cc1 100644 --- a/pre_commit_hooks/scalafix.py +++ b/pre_commit_hooks/scalafix.py @@ -9,7 +9,7 @@ def main(argv=None): colorama_init() - return run_sbt_command(f'; clean ; {TASK_SCALAFIX}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) + return run_sbt_command(f'; {TASK_SCALAFIX}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) if __name__ == '__main__': diff --git a/pre_commit_hooks/scalafmt.py b/pre_commit_hooks/scalafmt.py index c0e9e29..c0e577a 100644 --- a/pre_commit_hooks/scalafmt.py +++ b/pre_commit_hooks/scalafmt.py @@ -9,7 +9,7 @@ def main(argv=None): colorama_init() - return run_sbt_command(f'; clean ; {TASK_SCALAFMT}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) + return run_sbt_command(f'; {TASK_SCALAFMT}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) if __name__ == '__main__': From 0c0939606fb07dbea2b23116cf90c58f29f4347c Mon Sep 17 00:00:00 2001 From: Steve Phelps Date: Sat, 24 Sep 2022 10:23:48 +0100 Subject: [PATCH 05/10] Revert "do not run clean before scalafix or scalafmt" This reverts commit 2daf21ae99d84941f492131fc531e15c54be87a4. --- pre_commit_hooks/scalafix.py | 2 +- pre_commit_hooks/scalafmt.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pre_commit_hooks/scalafix.py b/pre_commit_hooks/scalafix.py index 2444cc1..6733206 100644 --- a/pre_commit_hooks/scalafix.py +++ b/pre_commit_hooks/scalafix.py @@ -9,7 +9,7 @@ def main(argv=None): colorama_init() - return run_sbt_command(f'; {TASK_SCALAFIX}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) + return run_sbt_command(f'; clean ; {TASK_SCALAFIX}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) if __name__ == '__main__': diff --git a/pre_commit_hooks/scalafmt.py b/pre_commit_hooks/scalafmt.py index c0e577a..c0e9e29 100644 --- a/pre_commit_hooks/scalafmt.py +++ b/pre_commit_hooks/scalafmt.py @@ -9,7 +9,7 @@ def main(argv=None): colorama_init() - return run_sbt_command(f'; {TASK_SCALAFMT}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) + return run_sbt_command(f'; clean ; {TASK_SCALAFMT}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) if __name__ == '__main__': From ae1dcfd54930f67c568b1668ecc397e9b67af823 Mon Sep 17 00:00:00 2001 From: Steve Phelps Date: Sat, 24 Sep 2022 10:24:42 +0100 Subject: [PATCH 06/10] bump minimum version --- .pre-commit-hooks.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-hooks.yaml b/.pre-commit-hooks.yaml index 2ef2411..d774519 100644 --- a/.pre-commit-hooks.yaml +++ b/.pre-commit-hooks.yaml @@ -37,4 +37,4 @@ entry: scalafix pass_filenames: false always_run: true - minimum_pre_commit_version: '0.3.2' + minimum_pre_commit_version: '0.3.6' From 8009df1198b00633dd4b50091fb3529eda13f2b5 Mon Sep 17 00:00:00 2001 From: Steve Phelps Date: Sun, 25 Sep 2022 12:46:10 +0100 Subject: [PATCH 07/10] do not clean before scalafmt or scalafix --- pre_commit_hooks/scalafix.py | 2 +- pre_commit_hooks/scalafmt.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pre_commit_hooks/scalafix.py b/pre_commit_hooks/scalafix.py index 6733206..2444cc1 100644 --- a/pre_commit_hooks/scalafix.py +++ b/pre_commit_hooks/scalafix.py @@ -9,7 +9,7 @@ def main(argv=None): colorama_init() - return run_sbt_command(f'; clean ; {TASK_SCALAFIX}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) + return run_sbt_command(f'; {TASK_SCALAFIX}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) if __name__ == '__main__': diff --git a/pre_commit_hooks/scalafmt.py b/pre_commit_hooks/scalafmt.py index c0e9e29..c0e577a 100644 --- a/pre_commit_hooks/scalafmt.py +++ b/pre_commit_hooks/scalafmt.py @@ -9,7 +9,7 @@ def main(argv=None): colorama_init() - return run_sbt_command(f'; clean ; {TASK_SCALAFMT}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) + return run_sbt_command(f'; {TASK_SCALAFMT}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) if __name__ == '__main__': From 95428ac4f2ccaa973bee03e431f0d0d1fe22bc28 Mon Sep 17 00:00:00 2001 From: Steve Phelps Date: Mon, 26 Sep 2022 12:11:51 +0100 Subject: [PATCH 08/10] Revert "do not run clean before scalafix or scalafmt" This reverts commit 2daf21ae99d84941f492131fc531e15c54be87a4. --- pre_commit_hooks/scalafix.py | 2 +- pre_commit_hooks/scalafmt.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pre_commit_hooks/scalafix.py b/pre_commit_hooks/scalafix.py index 2444cc1..6733206 100644 --- a/pre_commit_hooks/scalafix.py +++ b/pre_commit_hooks/scalafix.py @@ -9,7 +9,7 @@ def main(argv=None): colorama_init() - return run_sbt_command(f'; {TASK_SCALAFIX}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) + return run_sbt_command(f'; clean ; {TASK_SCALAFIX}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) if __name__ == '__main__': diff --git a/pre_commit_hooks/scalafmt.py b/pre_commit_hooks/scalafmt.py index c0e577a..c0e9e29 100644 --- a/pre_commit_hooks/scalafmt.py +++ b/pre_commit_hooks/scalafmt.py @@ -9,7 +9,7 @@ def main(argv=None): colorama_init() - return run_sbt_command(f'; {TASK_SCALAFMT}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) + return run_sbt_command(f'; clean ; {TASK_SCALAFMT}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) if __name__ == '__main__': From 16f99522ee780ca5581747ee6c5cf1f1cf69662f Mon Sep 17 00:00:00 2001 From: Steve Phelps Date: Mon, 26 Sep 2022 12:16:57 +0100 Subject: [PATCH 09/10] compile after sclafmt or scalafix --- pre_commit_hooks/scalafix.py | 2 +- pre_commit_hooks/scalafmt.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pre_commit_hooks/scalafix.py b/pre_commit_hooks/scalafix.py index 6733206..f4f009a 100644 --- a/pre_commit_hooks/scalafix.py +++ b/pre_commit_hooks/scalafix.py @@ -9,7 +9,7 @@ def main(argv=None): colorama_init() - return run_sbt_command(f'; clean ; {TASK_SCALAFIX}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) + return run_sbt_command(f'; clean; {TASK_SCALAFIX}; compile', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) if __name__ == '__main__': diff --git a/pre_commit_hooks/scalafmt.py b/pre_commit_hooks/scalafmt.py index c0e9e29..a41486e 100644 --- a/pre_commit_hooks/scalafmt.py +++ b/pre_commit_hooks/scalafmt.py @@ -9,7 +9,7 @@ def main(argv=None): colorama_init() - return run_sbt_command(f'; clean ; {TASK_SCALAFMT}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) + return run_sbt_command(f'; clean; {TASK_SCALAFMT}; compile', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) if __name__ == '__main__': From 794e484202ec5bf98af79d7fdb50107a4c4a96dd Mon Sep 17 00:00:00 2001 From: Steve Phelps Date: Mon, 26 Sep 2022 12:33:55 +0100 Subject: [PATCH 10/10] compile after sclafmt or scalafix --- pre_commit_hooks/scalafix.py | 4 +++- pre_commit_hooks/scalafmt.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pre_commit_hooks/scalafix.py b/pre_commit_hooks/scalafix.py index f4f009a..f9b3ba3 100644 --- a/pre_commit_hooks/scalafix.py +++ b/pre_commit_hooks/scalafix.py @@ -9,7 +9,9 @@ def main(argv=None): colorama_init() - return run_sbt_command(f'; clean; {TASK_SCALAFIX}; compile', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) + scala_fix = run_sbt_command(f'; clean; {TASK_SCALAFIX}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) + run_sbt_command("compile") + return scala_fix if __name__ == '__main__': diff --git a/pre_commit_hooks/scalafmt.py b/pre_commit_hooks/scalafmt.py index a41486e..0607f5c 100644 --- a/pre_commit_hooks/scalafmt.py +++ b/pre_commit_hooks/scalafmt.py @@ -9,7 +9,9 @@ def main(argv=None): colorama_init() - return run_sbt_command(f'; clean; {TASK_SCALAFMT}; compile', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) + scala_fmt = run_sbt_command(f'; clean; {TASK_SCALAFMT}', MISSING_PLUGIN_CHECK_STRING, MISSING_PLUGIN_ERROR_MSG) + run_sbt_command('compile') + return scala_fmt if __name__ == '__main__':