avoid error catching in Exists to aid readability

hashicorp · Jul 1, 2022 · 11c70d8 · 11c70d8
1 parent 5d6103c
commit 11c70d8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/internal/state/module.go b/internal/state/module.go
@@ -322,6 +322,10 @@ func (s *ModuleStore) Exists(path string) (bool, error) {
 
 	_, err := moduleByPath(txn, path)
 	if err != nil {
+		if IsModuleNotFound(err) {
+			return false, nil
+		}
+
 		return false, err
 	}
 

diff --git a/internal/walker/walker.go b/internal/walker/walker.go
@@ -11,7 +11,6 @@ import (
 
 	"github.com/hashicorp/terraform-ls/internal/document"
 	"github.com/hashicorp/terraform-ls/internal/job"
-	"github.com/hashicorp/terraform-ls/internal/state"
 	"github.com/hashicorp/terraform-ls/internal/terraform/datadir"
 )
 
@@ -191,14 +190,13 @@ func (w *Walker) walk(ctx context.Context, dir document.DirHandle) error {
 		if info.Name() == datadir.DataDirName {
 			w.logger.Printf("found module %s", dir)
 
-			_, err := w.modStore.Exists(dir)
+			exists, err := w.modStore.Exists(dir)
 			if err != nil {
-				if state.IsModuleNotFound(err) {
-					err := w.modStore.Add(dir)
-					if err != nil {
-						return err
-					}
-				} else {
+				return err
+			}
+			if !exists {
+				err := w.modStore.Add(dir)
+				if err != nil {
 					return err
 				}
 			}