Merge pull request #235 from macisamuele/create-pull-request/bump-rel…

…eases [Automated PR] Bump external tools (KTLint, Google Java Formatter, ktfmt, Pantlir)
macisamuele · Jul 14, 2024 · fd08295 · fd08295
2 parents fc0ab1d + 0ba8757
commit fd08295
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 24 deletions.
diff --git a/language_formatters_pre_commit_hooks/ktfmt.version b/language_formatters_pre_commit_hooks/ktfmt.version
@@ -1 +1 @@
-0.47
+0.51
diff --git a/language_formatters_pre_commit_hooks/ktlint.version b/language_formatters_pre_commit_hooks/ktlint.version
@@ -1 +1 @@
-1.2.1
+1.3.1
diff --git a/language_formatters_pre_commit_hooks/pretty_format_kotlin.py b/language_formatters_pre_commit_hooks/pretty_format_kotlin.py
@@ -97,7 +97,7 @@ def pretty_format_kotlin(argv: typing.Optional[typing.List[str]] = None) -> int:
     )
     parser.add_argument(
         "--ktfmt-style",
-        choices=["dropbox", "google", "kotlinlang"],
+        choices=["google", "kotlinlang"],
         dest="ktfmt_style",
         help="Which style to use",
     )

diff --git a/test-data/pretty_format_kotlin/NotPrettyFormattedFixedKtfmtDropbox.kt b/test-data/pretty_format_kotlin/NotPrettyFormattedFixedKtfmtDropbox.kt
diff --git a/tests/pretty_format_kotlin_test.py b/tests/pretty_format_kotlin_test.py
@@ -91,7 +91,6 @@ def test_pretty_format_kotlin_checksum(undecorate_method, checksum, expected_ret
 @pytest.mark.parametrize(
     ("filename", "expected_retval"),
     (
-        ("NotPrettyFormattedFixedKtfmtDropbox.kt", 1),
         ("NotPrettyFormattedFixedKtfmtGoogle.kt", 0),
         ("NotPrettyFormattedFixedKtfmtKotlinlang.kt", 1),
         ("NotPrettyFormatted.kt", 1),
@@ -119,21 +118,6 @@ def test_pretty_format_kotlin_ktfmt_checksum(undecorate_method, checksum, expect
 @pytest.mark.parametrize(
     ("filename", "expected_retval"),
     (
-        ("NotPrettyFormattedFixedKtfmtDropbox.kt", 0),
-        ("NotPrettyFormattedFixedKtfmtGoogle.kt", 1),
-        ("NotPrettyFormattedFixedKtfmtKotlinlang.kt", 0),
-        ("NotPrettyFormatted.kt", 1),
-        ("Invalid.kt", 1),
-    ),
-)
-def test_pretty_format_kotlin_ktfmt_dropbox_style(undecorate_method, filename, expected_retval):
-    assert undecorate_method(["--ktfmt", "--ktfmt-style=dropbox", filename]) == expected_retval
-
-
-@pytest.mark.parametrize(
-    ("filename", "expected_retval"),
-    (
-        ("NotPrettyFormattedFixedKtfmtDropbox.kt", 1),
         ("NotPrettyFormattedFixedKtfmtGoogle.kt", 0),
         ("NotPrettyFormattedFixedKtfmtKotlinlang.kt", 1),
         ("NotPrettyFormatted.kt", 1),
@@ -147,7 +131,6 @@ def test_pretty_format_kotlin_ktfmt_google_style(undecorate_method, filename, ex
 @pytest.mark.parametrize(
     ("filename", "expected_retval"),
     (
-        ("NotPrettyFormattedFixedKtfmtDropbox.kt", 0),
         ("NotPrettyFormattedFixedKtfmtGoogle.kt", 1),
         ("NotPrettyFormattedFixedKtfmtKotlinlang.kt", 0),
         ("NotPrettyFormatted.kt", 1),
@@ -164,7 +147,6 @@ def test_pretty_format_kotlin_ktfmt_kotlinglang_style(undecorate_method, filenam
         ("NotPrettyFormatted.kt", "NotPrettyFormattedFixedKtlint.kt", []),
         ("NotPrettyFormatted.kt", "NotPrettyFormattedFixedKtfmtGoogle.kt", ["--ktfmt"]),
         ("NotPrettyFormatted.kt", "NotPrettyFormattedFixedKtfmtGoogle.kt", ["--ktfmt", "--ktfmt-style=google"]),
-        ("NotPrettyFormatted.kt", "NotPrettyFormattedFixedKtfmtDropbox.kt", ["--ktfmt", "--ktfmt-style=dropbox"]),
         ("NotPrettyFormatted.kt", "NotPrettyFormattedFixedKtfmtKotlinlang.kt", ["--ktfmt", "--ktfmt-style=kotlinlang"]),
     ),
 )