From 2727821a9f27053c2e040ebe4c7b17a45c544ae2 Mon Sep 17 00:00:00 2001 From: Stefan Heule Date: Tue, 10 Sep 2024 09:27:47 -0700 Subject: [PATCH 01/15] Update versions --- Cargo.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c07498147..7fc775030 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ doctest = false cc = "1.0.73" [dependencies] -tree-sitter = "0.20.6" +tree-sitter = "0.21.0" tree-sitter-traversal = "0.1.2" json = "0.12.4" toml = "0.8.8" @@ -48,12 +48,12 @@ ctrlc = "3.4" # TODO: Update if we upgrade tree-sitter to >=0.21 tree-sitter-kotlin = "=0.3.5" -tree-sitter-java = "0.20.2" -# TODO: Update after: https://github.com/alex-pinkus/tree-sitter-swift/issues/278 resolves -tree-sitter-swift = { git = "https://github.com/satyam1749/tree-sitter-swift.git", rev = "08a28993599f1968bc81631a89690503e1db7704" } -tree-sitter-python = "0.20.2" +tree-sitter-java = "0.21.0" +# This is https://github.com/alex-pinkus/tree-sitter-swift/tree/0.5.0-with-generated-files +tree-sitter-swift = { git = "https://github.com/alex-pinkus/tree-sitter-swift.git", rev = "57c1c6d6ffa1c44b330182d41717e6fe37430704" } +tree-sitter-python = "0.21.0" tree-sitter-ruby = "0.20.1" -tree-sitter-typescript = "0.20.1" +tree-sitter-typescript = "0.21.0" # TODO: Update after https://github.com/tree-sitter/tree-sitter-go/pull/103 lands tree-sitter-go = { git = "https://github.com/uber/tree-sitter-go.git", rev = "f8cffd0af7baaf7bf6062e403efe7c0d06319c41" } tree-sitter-thrift = "0.5.0" From d0173a0af205b9963ce262037c1dd34b666fb7f0 Mon Sep 17 00:00:00 2001 From: Stefan Heule Date: Tue, 10 Sep 2024 09:29:27 -0700 Subject: [PATCH 02/15] Update version+changelog --- CHANGELOG.md | 6 ++++++ Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed16d1796..69afdf62f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Version 0.3.28 +------------- + +Update tree-sitter and grammar versions. + + Version 0.3.27 ------------- diff --git a/Cargo.toml b/Cargo.toml index 7fc775030..9ce810bf8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Uber Technologies Inc."] name = "piranha" description = "Polyglot Piranha is a library for performing structural find and replace with deep cleanup." -version = "0.3.27" +version = "0.3.28" edition = "2021" include = ["pyproject.toml", "src/"] exclude = ["legacy"] From e57400f7872df2128c76df7017d2205bc4df27f0 Mon Sep 17 00:00:00 2001 From: Stefan Heule Date: Tue, 10 Sep 2024 09:50:36 -0700 Subject: [PATCH 03/15] fix git dep --- Cargo.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9ce810bf8..8aeeb50ae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,8 +49,7 @@ ctrlc = "3.4" # TODO: Update if we upgrade tree-sitter to >=0.21 tree-sitter-kotlin = "=0.3.5" tree-sitter-java = "0.21.0" -# This is https://github.com/alex-pinkus/tree-sitter-swift/tree/0.5.0-with-generated-files -tree-sitter-swift = { git = "https://github.com/alex-pinkus/tree-sitter-swift.git", rev = "57c1c6d6ffa1c44b330182d41717e6fe37430704" } +tree-sitter-swift = { git = "https://github.com/alex-pinkus/tree-sitter-swift.git", branch = "0.5.0-with-generated-files" } tree-sitter-python = "0.21.0" tree-sitter-ruby = "0.20.1" tree-sitter-typescript = "0.21.0" From 23cd9dad9a1cfb5b714ea1dc092ae46016c4958c Mon Sep 17 00:00:00 2001 From: Stefan Heule Date: Tue, 10 Sep 2024 09:53:35 -0700 Subject: [PATCH 04/15] fix git dep --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 8aeeb50ae..7aa2ce645 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ ctrlc = "3.4" # TODO: Update if we upgrade tree-sitter to >=0.21 tree-sitter-kotlin = "=0.3.5" tree-sitter-java = "0.21.0" -tree-sitter-swift = { git = "https://github.com/alex-pinkus/tree-sitter-swift.git", branch = "0.5.0-with-generated-files" } +tree-sitter-swift = { git = "https://github.com/alex-pinkus/tree-sitter-swift.git", tag = "0.5.0-with-generated-files" } tree-sitter-python = "0.21.0" tree-sitter-ruby = "0.20.1" tree-sitter-typescript = "0.21.0" From 6798a967f19ce3f23f6eaadae9c8615f9d8b4511 Mon Sep 17 00:00:00 2001 From: Stefan Heule Date: Tue, 10 Sep 2024 11:03:03 -0700 Subject: [PATCH 05/15] fix git dep --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 7aa2ce645..8d6d4ceed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ ctrlc = "3.4" # TODO: Update if we upgrade tree-sitter to >=0.21 tree-sitter-kotlin = "=0.3.5" tree-sitter-java = "0.21.0" -tree-sitter-swift = { git = "https://github.com/alex-pinkus/tree-sitter-swift.git", tag = "0.5.0-with-generated-files" } +tree-sitter-swift = { git = "https://github.com/alex-pinkus/tree-sitter-swift.git", tag = "0.5.0" } tree-sitter-python = "0.21.0" tree-sitter-ruby = "0.20.1" tree-sitter-typescript = "0.21.0" From 1cf5f2375523f9910dea866f534acf50d8e00fde Mon Sep 17 00:00:00 2001 From: Stefan Heule Date: Tue, 10 Sep 2024 11:40:41 -0700 Subject: [PATCH 06/15] fix git dep --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 8d6d4ceed..18f802f05 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ ctrlc = "3.4" # TODO: Update if we upgrade tree-sitter to >=0.21 tree-sitter-kotlin = "=0.3.5" tree-sitter-java = "0.21.0" -tree-sitter-swift = { git = "https://github.com/alex-pinkus/tree-sitter-swift.git", tag = "0.5.0" } +tree-sitter-swift = { git = "https://github.com/alex-pinkus/tree-sitter-swift.git", tag = "0.4.3-with-generated-files" } tree-sitter-python = "0.21.0" tree-sitter-ruby = "0.20.1" tree-sitter-typescript = "0.21.0" From 486c954464ced0b87dddb4270f69ca6da2c1d70e Mon Sep 17 00:00:00 2001 From: Stefan Heule Date: Tue, 10 Sep 2024 11:44:02 -0700 Subject: [PATCH 07/15] fix git dep --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 18f802f05..693656e99 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ ctrlc = "3.4" # TODO: Update if we upgrade tree-sitter to >=0.21 tree-sitter-kotlin = "=0.3.5" tree-sitter-java = "0.21.0" -tree-sitter-swift = { git = "https://github.com/alex-pinkus/tree-sitter-swift.git", tag = "0.4.3-with-generated-files" } +tree-sitter-swift = { git = "https://github.com/alex-pinkus/tree-sitter-swift.git", tag = "0.4.3" } tree-sitter-python = "0.21.0" tree-sitter-ruby = "0.20.1" tree-sitter-typescript = "0.21.0" From 1ccaee2fce36496584962b0c7653bb0d43293059 Mon Sep 17 00:00:00 2001 From: Stefan Heule Date: Tue, 10 Sep 2024 11:48:39 -0700 Subject: [PATCH 08/15] fix git dep --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 693656e99..18f802f05 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ ctrlc = "3.4" # TODO: Update if we upgrade tree-sitter to >=0.21 tree-sitter-kotlin = "=0.3.5" tree-sitter-java = "0.21.0" -tree-sitter-swift = { git = "https://github.com/alex-pinkus/tree-sitter-swift.git", tag = "0.4.3" } +tree-sitter-swift = { git = "https://github.com/alex-pinkus/tree-sitter-swift.git", tag = "0.4.3-with-generated-files" } tree-sitter-python = "0.21.0" tree-sitter-ruby = "0.20.1" tree-sitter-typescript = "0.21.0" From ecfabd7b8e49b1615b58ded78da24cc6b433fa02 Mon Sep 17 00:00:00 2001 From: Stefan Heule Date: Tue, 10 Sep 2024 11:53:15 -0700 Subject: [PATCH 09/15] fix git dep --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 18f802f05..1b3e4c886 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ ctrlc = "3.4" # TODO: Update if we upgrade tree-sitter to >=0.21 tree-sitter-kotlin = "=0.3.5" tree-sitter-java = "0.21.0" -tree-sitter-swift = { git = "https://github.com/alex-pinkus/tree-sitter-swift.git", tag = "0.4.3-with-generated-files" } +tree-sitter-swift = { git = "https://github.com/alex-pinkus/tree-sitter-swift.git", branch = "0.4.3-with-generated-files" } tree-sitter-python = "0.21.0" tree-sitter-ruby = "0.20.1" tree-sitter-typescript = "0.21.0" From 53fb539812e9f988b8c9799a3d390afbd388cd2c Mon Sep 17 00:00:00 2001 From: Stefan Heule Date: Tue, 10 Sep 2024 12:02:44 -0700 Subject: [PATCH 10/15] fix git dep --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1b3e4c886..772042c75 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ doctest = false cc = "1.0.73" [dependencies] -tree-sitter = "0.21.0" +tree-sitter = "0.21.1" tree-sitter-traversal = "0.1.2" json = "0.12.4" toml = "0.8.8" @@ -49,7 +49,7 @@ ctrlc = "3.4" # TODO: Update if we upgrade tree-sitter to >=0.21 tree-sitter-kotlin = "=0.3.5" tree-sitter-java = "0.21.0" -tree-sitter-swift = { git = "https://github.com/alex-pinkus/tree-sitter-swift.git", branch = "0.4.3-with-generated-files" } +tree-sitter-swift = { git = "https://github.com/alex-pinkus/tree-sitter-swift.git", rev = "7d303df70012edb7385a6a3b3938e0e7b89ecfbd" } tree-sitter-python = "0.21.0" tree-sitter-ruby = "0.20.1" tree-sitter-typescript = "0.21.0" From 1db144a90e05fb8c17b143295a17014c4575bf90 Mon Sep 17 00:00:00 2001 From: Stefan Heule Date: Tue, 10 Sep 2024 12:03:50 -0700 Subject: [PATCH 11/15] fix git dep --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 772042c75..652b67de5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ ctrlc = "3.4" # TODO: Update if we upgrade tree-sitter to >=0.21 tree-sitter-kotlin = "=0.3.5" tree-sitter-java = "0.21.0" -tree-sitter-swift = { git = "https://github.com/alex-pinkus/tree-sitter-swift.git", rev = "7d303df70012edb7385a6a3b3938e0e7b89ecfbd" } +tree-sitter-swift = { git = "https://github.com/alex-pinkus/tree-sitter-swift.git", rev = "caa99d7d3c14aac03b5f16fc86fedf8755570760" } tree-sitter-python = "0.21.0" tree-sitter-ruby = "0.20.1" tree-sitter-typescript = "0.21.0" From 6c51c882b92554ed197fb1056e63e318f3dedf7c Mon Sep 17 00:00:00 2001 From: Stefan Heule Date: Tue, 10 Sep 2024 12:16:24 -0700 Subject: [PATCH 12/15] fix git dep --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 652b67de5..7d0e1e51d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ ctrlc = "3.4" # TODO: Update if we upgrade tree-sitter to >=0.21 tree-sitter-kotlin = "=0.3.5" tree-sitter-java = "0.21.0" -tree-sitter-swift = { git = "https://github.com/alex-pinkus/tree-sitter-swift.git", rev = "caa99d7d3c14aac03b5f16fc86fedf8755570760" } +tree-sitter-swift = { git = "https://github.com/stefanheule/tree-sitter-swift.git", branch = "0.4.3-fixed" } tree-sitter-python = "0.21.0" tree-sitter-ruby = "0.20.1" tree-sitter-typescript = "0.21.0" From fe276b008f27445e01f5663a8dcd37636b92ad93 Mon Sep 17 00:00:00 2001 From: Stefan Heule Date: Tue, 10 Sep 2024 12:16:54 -0700 Subject: [PATCH 13/15] fix git dep --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 7d0e1e51d..594f36c3b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ doctest = false cc = "1.0.73" [dependencies] -tree-sitter = "0.21.1" +tree-sitter = "0.21.0" tree-sitter-traversal = "0.1.2" json = "0.12.4" toml = "0.8.8" From b638988e1f2c58db46f8450598e2c6bb5b55dfa0 Mon Sep 17 00:00:00 2001 From: Stefan Heule Date: Tue, 10 Sep 2024 12:18:51 -0700 Subject: [PATCH 14/15] fix git dep --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 594f36c3b..d2e36f538 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ doctest = false cc = "1.0.73" [dependencies] -tree-sitter = "0.21.0" +tree-sitter = "0.20.4" tree-sitter-traversal = "0.1.2" json = "0.12.4" toml = "0.8.8" From 76cb5bd7c80aefe0526f185a544623b7cba89e2c Mon Sep 17 00:00:00 2001 From: Stefan Heule Date: Tue, 10 Sep 2024 12:21:23 -0700 Subject: [PATCH 15/15] fix git dep --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index d2e36f538..594f36c3b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ doctest = false cc = "1.0.73" [dependencies] -tree-sitter = "0.20.4" +tree-sitter = "0.21.0" tree-sitter-traversal = "0.1.2" json = "0.12.4" toml = "0.8.8"