Tidying up more code

No functional changes here, or at lest not intentionally so 😅

Just making code a bit more short and to the point where possible.
Some things to disagree with maybe, and let me know if so as I'm
open to suggestions.

Signed-off-by: Anders Eknert <anders@styra.com>

Author: anderseknert

cmd/fix.go

@@ -196,9 +196,7 @@ func fix(args []string, params *fixParams) (err error) {
 		return fmt.Errorf("could not find potential roots: %w", err)
 	}
 
-	f := fixer.NewFixer()
-	f.RegisterRoots(roots...)
-	f.RegisterFixes(fixes.NewDefaultFixes()...)
+	f := fixer.NewFixer().RegisterRoots(roots...).RegisterFixes(fixes.NewDefaultFixes()...)
 
 	if userConfigFile != nil {
 		versionsMap, err := config.AllRegoVersions(filepath.Dir(userConfigFile.Name()), &userConfig)

internal/lsp/eval.go

@@ -13,7 +13,6 @@ import (
 
 	rbundle "github.com/styrainc/regal/bundle"
 	"github.com/styrainc/regal/internal/lsp/log"
-	"github.com/styrainc/regal/internal/lsp/uri"
 	"github.com/styrainc/regal/pkg/builtins"
 	"github.com/styrainc/regal/pkg/config"
 	"github.com/styrainc/regal/pkg/roast/transform"
@@ -43,12 +42,7 @@ func (l *LanguageServer) Eval(
 	var hasCustomRules bool
 
 	for fileURI, module := range modules {
-		moduleFiles = append(moduleFiles, bundle.ModuleFile{
-			URL:    fileURI,
-			Parsed: module,
-			Path:   uri.ToPath(l.clientIdentifier, fileURI),
-		})
-
+		moduleFiles = append(moduleFiles, bundle.ModuleFile{URL: fileURI, Parsed: module, Path: l.toPath(fileURI)})
 		hasCustomRules = hasCustomRules || strings.Contains(module.Package.Path.String(), "custom.regal.rules")
 	}