From 948c577205a3228b323bf601184500983602bcae Mon Sep 17 00:00:00 2001 From: Tarry Singh Date: Mon, 4 Nov 2024 13:57:59 +0000 Subject: [PATCH] Make ZLS runner target explicit in workspace BUILD files and update the zls.sh script accordingly. --- BUILD.bazel | 6 ++++++ third_party/zls/BUILD.bazel | 7 +------ tools/zls.sh | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 145cb3c..63540f5 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,4 +1,10 @@ load("@rules_zig//zig:defs.bzl", "zls_completion") +load("@zml//third_party/zls:zls.bzl", "zls_runner") + +zls_runner( + name = "zls", + target = ":completion", +) zls_completion( name = "completion", diff --git a/third_party/zls/BUILD.bazel b/third_party/zls/BUILD.bazel index 6a73658..c00511f 100644 --- a/third_party/zls/BUILD.bazel +++ b/third_party/zls/BUILD.bazel @@ -1,10 +1,5 @@ -load(":zls.bzl", "targets", "zls_runner") +load(":zls.bzl", "targets") toolchain_type(name = "toolchain_type") targets() - -zls_runner( - name = "zls", - target = "//:completion", -) diff --git a/tools/zls.sh b/tools/zls.sh index 59d08aa..86827c8 100755 --- a/tools/zls.sh +++ b/tools/zls.sh @@ -1,4 +1,4 @@ #!/bin/bash cd "$(dirname "${BASH_SOURCE[0]}")" cd "$(bazel info workspace)" -exec bazel run -- @zml//third_party/zls:zls "${@}" +exec bazel run -- @zml//:zls "${@}"