Skip to content

Commit a99de87

Browse files
bazel-iofmeum
andauthored
[7.4.0] Show "did you mean" suggestion for {override,inject}_repo (#24000)
Fixes #23981 Closes #23982. PiperOrigin-RevId: 686486627 Change-Id: I5f03b63601a535f8d551c005b00bf040846a324d Commit b0f1430 Co-authored-by: Fabian Meumertzheim <[email protected]>
1 parent c118308 commit a99de87

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ java_library(
191191
"//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
192192
"//src/main/java/net/starlark/java/annot",
193193
"//src/main/java/net/starlark/java/eval",
194+
"//src/main/java/net/starlark/java/spelling",
194195
"//src/main/java/net/starlark/java/syntax",
195196
"//src/main/protobuf:failure_details_java_proto",
196197
"//third_party:auto_value",

src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleThreadContext.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import net.starlark.java.eval.EvalException;
3838
import net.starlark.java.eval.Starlark;
3939
import net.starlark.java.eval.StarlarkThread;
40+
import net.starlark.java.spelling.SpellChecker;
4041
import net.starlark.java.syntax.Location;
4142

4243
/** Context object for a Starlark thread evaluating the MODULE.bazel file and files it includes. */
@@ -257,8 +258,11 @@ ModuleExtensionUsage buildUsage() throws EvalException {
257258
if (!context.repoNameUsages.containsKey(overridingRepoName)) {
258259
throw Starlark.errorf(
259260
"The repo exported as '%s' by module extension '%s' is overridden with '%s', but"
260-
+ " no repo is visible under this name",
261-
overriddenRepoName, extensionName, overridingRepoName)
261+
+ " no repo is visible under this name%s",
262+
overriddenRepoName,
263+
extensionName,
264+
overridingRepoName,
265+
SpellChecker.didYouMean(overridingRepoName, context.repoNameUsages.keySet()))
262266
.withCallStack(override.getValue().stack);
263267
}
264268
String importedAs = imports.inverse().get(overriddenRepoName);

0 commit comments

Comments
 (0)