From 5686a9ba2a2af1be87c47956d80e68617c8048ab Mon Sep 17 00:00:00 2001
From: Douglas Thor <doug.thor@gmail.com>
Date: Sat, 8 Mar 2025 00:44:08 +0000
Subject: [PATCH 01/15] Revert to smacker tree-sitter
---
gazelle/MODULE.bazel | 2 +-
gazelle/deps.bzl | 8 ++++----
gazelle/go.mod | 2 +-
gazelle/go.sum | 9 +++++++--
gazelle/python/BUILD.bazel | 4 ++--
gazelle/python/file_parser.go | 8 ++++----
6 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/gazelle/MODULE.bazel b/gazelle/MODULE.bazel
index 6bbc74bc61..0a553831c3 100644
--- a/gazelle/MODULE.bazel
+++ b/gazelle/MODULE.bazel
@@ -21,9 +21,9 @@ use_repo(
go_deps,
"com_github_bazelbuild_buildtools",
"com_github_bmatcuk_doublestar_v4",
- "com_github_dougthor42_go_tree_sitter",
"com_github_emirpasic_gods",
"com_github_ghodss_yaml",
+ "com_github_smacker_go_tree_sitter",
"com_github_stretchr_testify",
"in_gopkg_yaml_v2",
"org_golang_x_sync",
diff --git a/gazelle/deps.bzl b/gazelle/deps.bzl
index fbb5285a4c..b833748b8c 100644
--- a/gazelle/deps.bzl
+++ b/gazelle/deps.bzl
@@ -183,10 +183,10 @@ def go_deps():
version = "v0.0.0-20190812154241-14fe0d1b01d4",
)
go_repository(
- name = "com_github_dougthor42_go_tree_sitter",
- importpath = "github.com/dougthor42/go-tree-sitter",
- sum = "h1:b9s96BulIARx0konX36sJ5oZhWvAvjQBBntxp1eUukQ=",
- version = "v0.0.0-20241210060307-2737e1d0de6b",
+ name = "com_github_smacker_go_tree_sitter",
+ importpath = "github.com/smacker/go-tree-sitter",
+ sum = "h1:7QZKUmQfnxncZIJGyvX8M8YeMfn8kM10j3J/2KwVTN4=",
+ version = "v0.0.0-20240422154435-0628b34cbf9c",
)
go_repository(
name = "com_github_stretchr_objx",
diff --git a/gazelle/go.mod b/gazelle/go.mod
index 33ee6bb08a..f993458c7a 100644
--- a/gazelle/go.mod
+++ b/gazelle/go.mod
@@ -7,9 +7,9 @@ require (
github.com/bazelbuild/buildtools v0.0.0-20231103205921-433ea8554e82
github.com/bazelbuild/rules_go v0.41.0
github.com/bmatcuk/doublestar/v4 v4.7.1
- github.com/dougthor42/go-tree-sitter v0.0.0-20241210060307-2737e1d0de6b
github.com/emirpasic/gods v1.18.1
github.com/ghodss/yaml v1.0.0
+ github.com/smacker/go-tree-sitter v0.0.0-20240422154435-0628b34cbf9c
github.com/stretchr/testify v1.9.0
golang.org/x/sync v0.2.0
gopkg.in/yaml.v2 v2.4.0
diff --git a/gazelle/go.sum b/gazelle/go.sum
index 5acd4a6db5..6d5b3694d3 100644
--- a/gazelle/go.sum
+++ b/gazelle/go.sum
@@ -17,8 +17,6 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dougthor42/go-tree-sitter v0.0.0-20241210060307-2737e1d0de6b h1:b9s96BulIARx0konX36sJ5oZhWvAvjQBBntxp1eUukQ=
-github.com/dougthor42/go-tree-sitter v0.0.0-20241210060307-2737e1d0de6b/go.mod h1:87UkDyPt18bTH/FvinLc/kj587VNYOdRKZT1la4T8Hg=
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -47,6 +45,12 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/smacker/go-tree-sitter v0.0.0-20240422154435-0628b34cbf9c h1:7QZKUmQfnxncZIJGyvX8M8YeMfn8kM10j3J/2KwVTN4=
+github.com/smacker/go-tree-sitter v0.0.0-20240422154435-0628b34cbf9c/go.mod h1:q99oHDsbP0xRwmn7Vmob8gbSMNyvJ83OauXPSuHQuKE=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.4/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
go.starlark.net v0.0.0-20210223155950-e043a3d3c984/go.mod h1:t3mmBBPzAVvK0L0n1drDmrQsJ8FoIx4INCqVMTr/Zo0=
@@ -102,6 +106,7 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/gazelle/python/BUILD.bazel b/gazelle/python/BUILD.bazel
index 893c82e8e4..627a867c68 100644
--- a/gazelle/python/BUILD.bazel
+++ b/gazelle/python/BUILD.bazel
@@ -39,11 +39,11 @@ go_library(
"@bazel_gazelle//rule:go_default_library",
"@com_github_bazelbuild_buildtools//build:go_default_library",
"@com_github_bmatcuk_doublestar_v4//:doublestar",
- "@com_github_dougthor42_go_tree_sitter//:go-tree-sitter",
- "@com_github_dougthor42_go_tree_sitter//python",
"@com_github_emirpasic_gods//lists/singlylinkedlist",
"@com_github_emirpasic_gods//sets/treeset",
"@com_github_emirpasic_gods//utils",
+ "@com_github_smacker_go_tree_sitter//:go-tree-sitter",
+ "@com_github_smacker_go_tree_sitter//python",
"@org_golang_x_sync//errgroup",
],
)
diff --git a/gazelle/python/file_parser.go b/gazelle/python/file_parser.go
index c147984fc3..a1f47f400c 100644
--- a/gazelle/python/file_parser.go
+++ b/gazelle/python/file_parser.go
@@ -22,8 +22,8 @@ import (
"path/filepath"
"strings"
- sitter "github.com/dougthor42/go-tree-sitter"
- "github.com/dougthor42/go-tree-sitter/python"
+ sitter "github.com/smacker/go-tree-sitter"
+ "github.com/smacker/go-tree-sitter/python"
)
const (
@@ -115,10 +115,10 @@ func (p *FileParser) parseMain(ctx context.Context, node *sitter.Node) bool {
a, b = b, a
}
if a.Type() == sitterNodeTypeIdentifier && a.Content(p.code) == "__name__" &&
- // at github.com/dougthor42/go-tree-sitter@latest (after v0.0.0-20240422154435-0628b34cbf9c we used)
+ // at github.com/smacker/go-tree-sitter@latest (after v0.0.0-20240422154435-0628b34cbf9c we used)
// "__main__" is the second child of b. But now, it isn't.
// we cannot use the latest go-tree-sitter because of the top level reference in scanner.c.
- // https://github.com/dougthor42/go-tree-sitter/blob/04d6b33fe138a98075210f5b770482ded024dc0f/python/scanner.c#L1
+ // https://github.com/smacker/go-tree-sitter/blob/04d6b33fe138a98075210f5b770482ded024dc0f/python/scanner.c#L1
b.Type() == sitterNodeTypeString && string(p.code[b.StartByte()+1:b.EndByte()-1]) == "__main__" {
return true
}
From 86e1f2e532913884f28061b034b1091eecfced85 Mon Sep 17 00:00:00 2001
From: Douglas Thor <doug.thor@gmail.com>
Date: Sat, 8 Mar 2025 01:04:36 +0000
Subject: [PATCH 02/15] bump tree-sitter
---
gazelle/go.mod | 2 +-
gazelle/go.sum | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/gazelle/go.mod b/gazelle/go.mod
index f993458c7a..5a410e53fd 100644
--- a/gazelle/go.mod
+++ b/gazelle/go.mod
@@ -9,7 +9,7 @@ require (
github.com/bmatcuk/doublestar/v4 v4.7.1
github.com/emirpasic/gods v1.18.1
github.com/ghodss/yaml v1.0.0
- github.com/smacker/go-tree-sitter v0.0.0-20240422154435-0628b34cbf9c
+ github.com/smacker/go-tree-sitter v0.0.0-20240827094217-dd81d9e9be82
github.com/stretchr/testify v1.9.0
golang.org/x/sync v0.2.0
gopkg.in/yaml.v2 v2.4.0
diff --git a/gazelle/go.sum b/gazelle/go.sum
index 6d5b3694d3..17941d6906 100644
--- a/gazelle/go.sum
+++ b/gazelle/go.sum
@@ -47,6 +47,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/smacker/go-tree-sitter v0.0.0-20240422154435-0628b34cbf9c h1:7QZKUmQfnxncZIJGyvX8M8YeMfn8kM10j3J/2KwVTN4=
github.com/smacker/go-tree-sitter v0.0.0-20240422154435-0628b34cbf9c/go.mod h1:q99oHDsbP0xRwmn7Vmob8gbSMNyvJ83OauXPSuHQuKE=
+github.com/smacker/go-tree-sitter v0.0.0-20240827094217-dd81d9e9be82 h1:6C8qej6f1bStuePVkLSFxoU22XBS165D3klxlzRg8F4=
+github.com/smacker/go-tree-sitter v0.0.0-20240827094217-dd81d9e9be82/go.mod h1:xe4pgH49k4SsmkQq5OT8abwhWmnzkhpgnXeekbx2efw=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
From ce8c79c225583bf69d7c121fd9b667c471364486 Mon Sep 17 00:00:00 2001
From: Douglas Thor <doug.thor@gmail.com>
Date: Sat, 8 Mar 2025 01:05:22 +0000
Subject: [PATCH 03/15] bump tree-sitter
---
gazelle/deps.bzl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gazelle/deps.bzl b/gazelle/deps.bzl
index b833748b8c..0f5380404a 100644
--- a/gazelle/deps.bzl
+++ b/gazelle/deps.bzl
@@ -185,8 +185,8 @@ def go_deps():
go_repository(
name = "com_github_smacker_go_tree_sitter",
importpath = "github.com/smacker/go-tree-sitter",
- sum = "h1:7QZKUmQfnxncZIJGyvX8M8YeMfn8kM10j3J/2KwVTN4=",
- version = "v0.0.0-20240422154435-0628b34cbf9c",
+ sum = "h1:6C8qej6f1bStuePVkLSFxoU22XBS165D3klxlzRg8F4=",
+ version = "v0.0.0-20240827094217-dd81d9e9be82",
)
go_repository(
name = "com_github_stretchr_objx",
From 9c24f1b894d6ac1f33161a8cc62f41a09909b975 Mon Sep 17 00:00:00 2001
From: Douglas Thor <doug.thor@gmail.com>
Date: Tue, 10 Dec 2024 05:14:51 +0000
Subject: [PATCH 04/15] use mine via replace
---
gazelle/go.mod | 2 ++
1 file changed, 2 insertions(+)
diff --git a/gazelle/go.mod b/gazelle/go.mod
index 5a410e53fd..391c004552 100644
--- a/gazelle/go.mod
+++ b/gazelle/go.mod
@@ -24,3 +24,5 @@ require (
golang.org/x/tools v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
+
+replace github.com/smacker/go-tree-sitter v0.0.0-20240422154435-0628b34cbf9c => github.com/dougthor42/go-tree-sitter v0.0.0-20240422154435-0628b34cbf9c
From 1c0e024c7022babc84ce2e047c9f4f5859e7c9ea Mon Sep 17 00:00:00 2001
From: Douglas Thor <doug.thor@gmail.com>
Date: Tue, 10 Dec 2024 05:19:38 +0000
Subject: [PATCH 05/15] don't set replace version?
---
gazelle/go.mod | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gazelle/go.mod b/gazelle/go.mod
index 391c004552..2462fbb082 100644
--- a/gazelle/go.mod
+++ b/gazelle/go.mod
@@ -25,4 +25,4 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)
-replace github.com/smacker/go-tree-sitter v0.0.0-20240422154435-0628b34cbf9c => github.com/dougthor42/go-tree-sitter v0.0.0-20240422154435-0628b34cbf9c
+replace github.com/smacker/go-tree-sitter => github.com/dougthor42/go-tree-sitter v0.0.0-20240422154435-0628b34cbf9c
From e29c7d000b60e61522b52b5e40d277eac5b4a9bb Mon Sep 17 00:00:00 2001
From: Douglas Thor <doug.thor@gmail.com>
Date: Tue, 11 Mar 2025 03:57:55 +0000
Subject: [PATCH 06/15] Revert "don't set replace version?"
This reverts commit 1c0e024c7022babc84ce2e047c9f4f5859e7c9ea.
---
gazelle/go.mod | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gazelle/go.mod b/gazelle/go.mod
index 2462fbb082..391c004552 100644
--- a/gazelle/go.mod
+++ b/gazelle/go.mod
@@ -25,4 +25,4 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)
-replace github.com/smacker/go-tree-sitter => github.com/dougthor42/go-tree-sitter v0.0.0-20240422154435-0628b34cbf9c
+replace github.com/smacker/go-tree-sitter v0.0.0-20240422154435-0628b34cbf9c => github.com/dougthor42/go-tree-sitter v0.0.0-20240422154435-0628b34cbf9c
From a14dd09dfa12a656468f7491c033d5f840cf82b6 Mon Sep 17 00:00:00 2001
From: Douglas Thor <doug.thor@gmail.com>
Date: Tue, 11 Mar 2025 03:58:06 +0000
Subject: [PATCH 07/15] set remote
---
gazelle/deps.bzl | 1 +
1 file changed, 1 insertion(+)
diff --git a/gazelle/deps.bzl b/gazelle/deps.bzl
index 0f5380404a..7344dd9e81 100644
--- a/gazelle/deps.bzl
+++ b/gazelle/deps.bzl
@@ -187,6 +187,7 @@ def go_deps():
importpath = "github.com/smacker/go-tree-sitter",
sum = "h1:6C8qej6f1bStuePVkLSFxoU22XBS165D3klxlzRg8F4=",
version = "v0.0.0-20240827094217-dd81d9e9be82",
+ remote = "https://github.com/dougthor42/go-tree-sitter",
)
go_repository(
name = "com_github_stretchr_objx",
From 796482e4b94c77dd004bb6409dd7d08a70a9b6f2 Mon Sep 17 00:00:00 2001
From: Douglas Thor <doug.thor@gmail.com>
Date: Tue, 11 Mar 2025 03:58:33 +0000
Subject: [PATCH 08/15] Reapply "don't set replace version?"
This reverts commit e29c7d000b60e61522b52b5e40d277eac5b4a9bb.
---
gazelle/go.mod | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gazelle/go.mod b/gazelle/go.mod
index 391c004552..2462fbb082 100644
--- a/gazelle/go.mod
+++ b/gazelle/go.mod
@@ -25,4 +25,4 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)
-replace github.com/smacker/go-tree-sitter v0.0.0-20240422154435-0628b34cbf9c => github.com/dougthor42/go-tree-sitter v0.0.0-20240422154435-0628b34cbf9c
+replace github.com/smacker/go-tree-sitter => github.com/dougthor42/go-tree-sitter v0.0.0-20240422154435-0628b34cbf9c
From d102fdc3f61141a5571fb3d574a21fd90da5b628 Mon Sep 17 00:00:00 2001
From: Douglas Thor <doug.thor@gmail.com>
Date: Sat, 15 Mar 2025 22:34:37 +0000
Subject: [PATCH 09/15] fix workspace
---
gazelle/deps.bzl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gazelle/deps.bzl b/gazelle/deps.bzl
index 7344dd9e81..3993fc2793 100644
--- a/gazelle/deps.bzl
+++ b/gazelle/deps.bzl
@@ -185,9 +185,9 @@ def go_deps():
go_repository(
name = "com_github_smacker_go_tree_sitter",
importpath = "github.com/smacker/go-tree-sitter",
- sum = "h1:6C8qej6f1bStuePVkLSFxoU22XBS165D3klxlzRg8F4=",
- version = "v0.0.0-20240827094217-dd81d9e9be82",
remote = "https://github.com/dougthor42/go-tree-sitter",
+ commit = "71e8858be7ad43fb866e2daabe83e95e6eff91bd",
+ vcs = "git",
)
go_repository(
name = "com_github_stretchr_objx",
From 036dbabdb63ab5200877d2f4f7118171cdc1f066 Mon Sep 17 00:00:00 2001
From: Douglas Thor <doug.thor@gmail.com>
Date: Sat, 15 Mar 2025 22:35:08 +0000
Subject: [PATCH 10/15] correct replace
---
gazelle/go.mod | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gazelle/go.mod b/gazelle/go.mod
index 2462fbb082..0fcf7adb56 100644
--- a/gazelle/go.mod
+++ b/gazelle/go.mod
@@ -25,4 +25,4 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)
-replace github.com/smacker/go-tree-sitter => github.com/dougthor42/go-tree-sitter v0.0.0-20240422154435-0628b34cbf9c
+replace github.com/smacker/go-tree-sitter => github.com/dougthor42/go-tree-sitter v0.0.0-20250311040318-71e8858be7ad
From b9d56e89345bdce13f6035f9ae1b7614e5ba3c22 Mon Sep 17 00:00:00 2001
From: Douglas Thor <doug.thor@gmail.com>
Date: Sat, 15 Mar 2025 22:37:37 +0000
Subject: [PATCH 11/15] go.sum
---
gazelle/go.sum | 2 ++
1 file changed, 2 insertions(+)
diff --git a/gazelle/go.sum b/gazelle/go.sum
index 17941d6906..0007381be2 100644
--- a/gazelle/go.sum
+++ b/gazelle/go.sum
@@ -17,6 +17,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dougthor42/go-tree-sitter v0.0.0-20250311040318-71e8858be7ad h1:IwRobcK7dpOliiJ/oqBkMIULmY9iYeqgAJNRbSreG7Q=
+github.com/dougthor42/go-tree-sitter v0.0.0-20250311040318-71e8858be7ad/go.mod h1:87UkDyPt18bTH/FvinLc/kj587VNYOdRKZT1la4T8Hg=
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
From 8a9f167fee31e6fd7a58069b315348e6e9209ade Mon Sep 17 00:00:00 2001
From: Douglas Thor <doug.thor@gmail.com>
Date: Sat, 15 Mar 2025 22:46:24 +0000
Subject: [PATCH 12/15] update changelog
---
CHANGELOG.md | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e59d225189..3383529d41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,7 +59,7 @@ Unreleased changes template.
{#v0-0-0-fixed}
### Fixed
* (pypi) The `ppc64le` is now pointing to the right target in the `platforms` package.
-* (gazelle) No longer incorrectly merge `py_binary` targets during partial updates in
+* (gazelle) No longer incorrectly merge `py_binary` targets during partial updates in
`file` generation mode. Fixed in [#2619](https://github.com/bazelbuild/rules_python/pull/2619).
* (bzlmod) Running as root is no longer an error. `ignore_root_user_error=True`
is now the default. Note that running as root may still cause spurious
@@ -71,6 +71,9 @@ Unreleased changes template.
evaluation contexts will invoke Python interpreter with `-B` to avoid
creating `.pyc` files.
* (deps) doublestar 4.7.1 (required for recent Gazelle versions)
+* (gazelle) The forked version of `go-tree-sitter` is now used in the correct way - via `go mod`'s
+ `repalce` directive, fixing [#2630](https://github.com/bazelbuild/rules_python/issues/2630).
+ ([#2667](https://github.com/bazelbuild/rules_python/pull/2667))
{#v0-0-0-added}
### Added
From 58c54d20b7a4ae3feeb8ccac6b4807c44ce95a4a Mon Sep 17 00:00:00 2001
From: Douglas Thor <doug.thor@gmail.com>
Date: Sat, 15 Mar 2025 22:47:44 +0000
Subject: [PATCH 13/15] sort
---
gazelle/deps.bzl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gazelle/deps.bzl b/gazelle/deps.bzl
index 3993fc2793..9872a4d806 100644
--- a/gazelle/deps.bzl
+++ b/gazelle/deps.bzl
@@ -184,9 +184,9 @@ def go_deps():
)
go_repository(
name = "com_github_smacker_go_tree_sitter",
+ commit = "71e8858be7ad43fb866e2daabe83e95e6eff91bd",
importpath = "github.com/smacker/go-tree-sitter",
remote = "https://github.com/dougthor42/go-tree-sitter",
- commit = "71e8858be7ad43fb866e2daabe83e95e6eff91bd",
vcs = "git",
)
go_repository(
From d484ad7fe82092813c5d2903789654b09fbe9126 Mon Sep 17 00:00:00 2001
From: Douglas Thor <doug.thor@gmail.com>
Date: Sat, 15 Mar 2025 22:48:30 +0000
Subject: [PATCH 14/15] spelling
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3383529d41..e36eefff72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,7 +72,7 @@ Unreleased changes template.
creating `.pyc` files.
* (deps) doublestar 4.7.1 (required for recent Gazelle versions)
* (gazelle) The forked version of `go-tree-sitter` is now used in the correct way - via `go mod`'s
- `repalce` directive, fixing [#2630](https://github.com/bazelbuild/rules_python/issues/2630).
+ `replace` directive, fixing [#2630](https://github.com/bazelbuild/rules_python/issues/2630).
([#2667](https://github.com/bazelbuild/rules_python/pull/2667))
{#v0-0-0-added}
From 8c4b50ac42b3c72b520a526f6f49bdc2ce76ae37 Mon Sep 17 00:00:00 2001
From: Douglas Thor <doug.thor@gmail.com>
Date: Sun, 16 Mar 2025 04:22:04 +0000
Subject: [PATCH 15/15] empty commit; seeing if CI is a flake