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.

Sign up for GitHub

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

Jump to bottom

Update gazelle version #653

Merged
merged 4 commits into from
Aug 18, 2023
Merged

Update gazelle version #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa45b6a
chore: update gazelle
birunts Aug 16, 2023
4ab193e
chore: update gazelle for `bzlmod`
birunts Aug 16, 2023
094c531
chore: add load statements test
birunts Aug 18, 2023
d3db56c
chore: add map_kind test
birunts Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ print("WARNING: The `bob-build` Bazel module is still highly experimental and su

bazel_dep(name = "bazel_skylib", version = "1.3.0")
bazel_dep(name = "rules_multirun", version = "0.6.0")
bazel_dep(name = "rules_go", version = "0.39.1", repo_name = "io_bazel_rules_go")
bazel_dep(name = "gazelle", version = "0.30.0", repo_name = "bazel_gazelle")
bazel_dep(name = "rules_go", version = "0.41.0", repo_name = "io_bazel_rules_go")
bazel_dep(name = "gazelle", version = "0.32.0", repo_name = "bazel_gazelle")
bazel_dep(name = "rules_python", version = "0.20.0")

go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
Expand Down Expand Up @@ -69,6 +69,8 @@ go_deps.module(
)
use_repo(
go_deps,
"com_github_davecgh_go_spew",
"com_github_stretchr_objx",
"com_github_stretchr_testify",
"in_gopkg_yaml_v3",
)
Expand Down
5 changes: 3 additions & 2 deletions gazelle/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ local_path_override(

bazel_dep(name = "bob-build", version = "0.0.1", repo_name = "bob")
bazel_dep(name = "bazel_skylib", version = "1.3.0")
bazel_dep(name = "rules_go", version = "0.39.1", repo_name = "io_bazel_rules_go")
bazel_dep(name = "gazelle", version = "0.30.0", repo_name = "bazel_gazelle")
bazel_dep(name = "rules_go", version = "0.41.0", repo_name = "io_bazel_rules_go")
bazel_dep(name = "gazelle", version = "0.32.0", repo_name = "bazel_gazelle")

go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")

Expand All @@ -24,6 +24,7 @@ go_sdk.download(
)

go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
go_deps.from_file(go_mod = "//:go.mod")
use_repo(
go_deps,
"com_github_bazelbuild_buildtools",
Expand Down
12 changes: 6 additions & 6 deletions gazelle/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ bazel_skylib_workspace()

http_archive(
name = "io_bazel_rules_go",
sha256 = "56d8c5a5c91e1af73eca71a6fab2ced959b67c86d12ba37feedb0a2dfea441a6",
sha256 = "278b7ff5a826f3dc10f04feaf0b70d48b68748ccd512d7f98bf442077f043fe3",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.37.0/rules_go-v0.37.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.37.0/rules_go-v0.37.0.zip",
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
],
)

http_archive(
name = "bazel_gazelle",
sha256 = "448e37e0dbf61d6fa8f00aaa12d191745e14f07c31cabfa731f0c8e8a4f41b97",
sha256 = "29218f8e0cebe583643cbf93cae6f971be8a2484cdcfa1e45057658df8d54002",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.28.0/bazel-gazelle-v0.28.0.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.27.0/bazel-gazelle-v0.28.0.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.32.0/bazel-gazelle-v0.32.0.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.32.0/bazel-gazelle-v0.32.0.tar.gz",
],
)

Expand Down
4 changes: 3 additions & 1 deletion gazelle/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ module plugin

go 1.18

require github.com/bazelbuild/bazel-gazelle v0.29.0 // indirect
require github.com/bazelbuild/buildtools v0.0.0-20230510134650-37bd1811516d
require github.com/stretchr/testify v1.6.0
require github.com/bazelbuild/bazel-gazelle v0.32.0 // indirect
1 change: 1 addition & 0 deletions gazelle/tests/load_statement/BUILD.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# gazelle:bob_root
60 changes: 60 additions & 0 deletions gazelle/tests/load_statement/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
load("@bazel_skylib//lib:selects.bzl", "selects")

# gazelle:bob_root

bool_flag(
name = "feature_a",
build_setting_default = False,
)

config_setting(
name = "config_feature_a",
flag_values = {
":feature_a": "true",
},
)

bool_flag(
name = "feature_b",
build_setting_default = True,
)

config_setting(
name = "config_feature_b",
flag_values = {
":feature_b": "true",
},
)

# depends on: [//:feature_a && //:feature_b]
bool_flag(
name = "needs_deps",
build_setting_default = False,
)

config_setting(
name = "interim_config_needs_deps",
flag_values = {
":needs_deps": "true",
},
)

# autogenerated for internal use only
selects.config_setting_group(
name = "needs_deps_and_0",
match_all = [
"//:config_feature_a",
"//:config_feature_b",
],
visibility = ["//visibility:private"],
)

selects.config_setting_group(
name = "config_needs_deps",
match_all = [
":interim_config_needs_deps",
":needs_deps_and_0",
],
visibility = [":__subpackages__"],
)
11 changes: 11 additions & 0 deletions gazelle/tests/load_statement/Mconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
config FEATURE_A
bool "Enable Feature A"
default n

config FEATURE_B
bool "Enable Feature B"
default y

config NEEDS_DEPS
bool "need additional dependencies"
depends on FEATURE_A && FEATURE_B
Empty file added gazelle/tests/load_statement/WORKSPACE
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions gazelle/tests/load_statement/build.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// Main build file
13 changes: 13 additions & 0 deletions gazelle/tests/load_statement/expectedStderr.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
gazelle: RegisterFlags() - NOT IMPLEMENTED
gazelle: CheckFlags() - NOT IMPLEMENTED
gazelle: Fix() - NOT IMPLEMENTED
gazelle: Imports() - NOT IMPLEMENTED
gazelle: Imports() - NOT IMPLEMENTED
gazelle: Imports() - NOT IMPLEMENTED
gazelle: Imports() - NOT IMPLEMENTED
gazelle: Imports() - NOT IMPLEMENTED
gazelle: Resolve() - NOT IMPLEMENTED
gazelle: Resolve() - NOT IMPLEMENTED
gazelle: Resolve() - NOT IMPLEMENTED
gazelle: Resolve() - NOT IMPLEMENTED
gazelle: Resolve() - NOT IMPLEMENTED
Empty file added gazelle/tests/load_statement/expectedStdout.txt
View file
Open in desktop
Empty file.
2 changes: 2 additions & 0 deletions gazelle/tests/map_kinds/BUILD.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# gazelle:bob_root
# gazelle:map_kind config_setting my_config_setting //tools/bob:def.bzl
29 changes: 29 additions & 0 deletions gazelle/tests/map_kinds/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
load("//tools/bob:def.bzl", "my_config_setting")

# gazelle:bob_root
# gazelle:map_kind config_setting my_config_setting //tools/bob:def.bzl

bool_flag(
name = "feature_a",
build_setting_default = False,
)

my_config_setting(
name = "config_feature_a",
flag_values = {
":feature_a": "true",
},
)

bool_flag(
name = "feature_b",
build_setting_default = True,
)

my_config_setting(
name = "config_feature_b",
flag_values = {
":feature_b": "true",
},
)
7 changes: 7 additions & 0 deletions gazelle/tests/map_kinds/Mconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
config FEATURE_A
bool "Enable Feature A"
default n

config FEATURE_B
bool "Enable Feature B"
default y
Empty file added gazelle/tests/map_kinds/WORKSPACE
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions gazelle/tests/map_kinds/build.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// Main build file
7 changes: 7 additions & 0 deletions gazelle/tests/map_kinds/expectedStderr.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
gazelle: RegisterFlags() - NOT IMPLEMENTED
gazelle: CheckFlags() - NOT IMPLEMENTED
gazelle: Fix() - NOT IMPLEMENTED
gazelle: Imports() - NOT IMPLEMENTED
gazelle: Imports() - NOT IMPLEMENTED
gazelle: Resolve() - NOT IMPLEMENTED
gazelle: Resolve() - NOT IMPLEMENTED
Empty file added gazelle/tests/map_kinds/expectedStdout.txt
View file
Open in desktop
Empty file.