From 09685c3472f623a59257069faf637dce7306ec66 Mon Sep 17 00:00:00 2001 From: Daniel Wagner-Hall Date: Fri, 3 May 2024 01:29:04 +0100 Subject: [PATCH] Only call rlocation once (#267) This leads to slightly faster runtime, and slightly less confusing error messages if the file can't be found. --- java/gazelle/private/servermanager/servermanager.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java/gazelle/private/servermanager/servermanager.go b/java/gazelle/private/servermanager/servermanager.go index 7ce1658b..342903ca 100644 --- a/java/gazelle/private/servermanager/servermanager.go +++ b/java/gazelle/private/servermanager/servermanager.go @@ -7,6 +7,7 @@ import ( "os" "os/exec" "path/filepath" + "runtime" "strconv" "sync" "time" @@ -93,11 +94,10 @@ func locateJavaparser() (string, error) { // We want //java/src/com/github/bazel_contrib/contrib_rules_jvm/javaparser/generators:Main javaparserPath := "contrib_rules_jvm/java/src/com/github/bazel_contrib/contrib_rules_jvm/javaparser/generators/Main" - loc, err := rf.Rlocation(javaparserPath) - if err != nil { - loc, err = rf.Rlocation(javaparserPath + ".exe") + if runtime.GOOS == "windows" { + javaparserPath += ".exe" } - + loc, err := rf.Rlocation(javaparserPath) if err != nil { return "", fmt.Errorf("failed to call RLocation: %w", err) }