tmp

Author: rsteube

action.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 	"regexp"
-	"runtime"
 	"strings"
 	"time"
 
@@ -34,9 +33,8 @@ type CompletionCallback func(c Context) Action
 func (a Action) Cache(timeout time.Duration, keys ...key.Key) Action {
 	if a.callback != nil { // only relevant for callback actions
 		cachedCallback := a.callback
-		_, file, line, _ := runtime.Caller(1) // generate uid from wherever Cache() was called
 		a.callback = func(c Context) Action {
-			cacheFile, err := cache.File(file, line, keys...)
+			cacheFile, err := cache.File(2, keys...)
 			if err != nil {
 				return cachedCallback(c)
 			}
@@ -47,7 +45,7 @@ func (a Action) Cache(timeout time.Duration, keys ...key.Key) Action {
 
 			invokedAction := (Action{callback: cachedCallback}).Invoke(c)
 			if invokedAction.action.meta.Messages.IsEmpty() {
-				if cacheFile, err := cache.File(file, line, keys...); err == nil { // regenerate as cache keys might have changed due to invocation
+				if cacheFile, err := cache.File(2, keys...); err == nil { // regenerate as cache keys might have changed due to invocation
 					_ = cache.WriteE(cacheFile, invokedAction.export())
 				}
 			}

internal/cache/cache.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"runtime"
 	"strconv"
 	"strings"
 	"time"
@@ -70,7 +71,8 @@ func CacheDir(name string) (dir string, err error) {
 
 // File returns the cache filename for given values
 // TODO cleanup
-func File(callerFile string, callerLine int, keys ...key.Key) (file string, err error) {
+func File(skip int, keys ...key.Key) (file string, err error) {
+	_, callerFile, callerLine, _ := runtime.Caller(skip) // generate uid from wherever Cache() was called
 	uid := uidKeys(callerFile, strconv.Itoa(callerLine))
 	ids := make([]string, 0)
 	for _, key := range keys {

pkg/cache/cache.go

@@ -1,7 +1,6 @@
 package cache
 
 import (
-	"runtime"
 	"time"
 
 	"github.com/rsteube/carapace/internal/cache"
@@ -11,8 +10,7 @@ import (
 // Cache caches a function for given duration and keys.
 func Cache(timeout time.Duration, keys ...key.Key) func(f func() ([]byte, error)) ([]byte, error) {
 	return func(f func() ([]byte, error)) ([]byte, error) {
-		_, file, line, _ := runtime.Caller(1) // generate uid from wherever Cache() was called
-		cacheFile, err := cache.File(file, line, keys...)
+		cacheFile, err := cache.File(2, keys...)
 		if err != nil {
 			return nil, err
 		}