concurrent/map: Nil map is empty

Signed-off-by: Charlie Egan <[email protected]>
StyraInc · Jan 9, 2025 · a47ab6d · a47ab6d
1 parent de996a2
commit a47ab6d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/internal/lsp/server.go b/internal/lsp/server.go
@@ -1117,7 +1117,7 @@ func (l *LanguageServer) determineVersionForFile(fileURI string) ast.RegoVersion
 	var versionedDirs []string
 
 	// if we have no information, then we can return the default
-	if l.loadedConfigAllRegoVersions == nil || l.loadedConfigAllRegoVersions.Len() == 0 {
+	if l.loadedConfigAllRegoVersions.Len() == 0 {
 		return ast.RegoV1
 	}
 

diff --git a/internal/util/concurrent/map.go b/internal/util/concurrent/map.go
@@ -86,6 +86,10 @@ func (cm *Map[K, V]) Values() []V {
 }
 
 func (cm *Map[K, V]) Len() int {
+	if cm == nil {
+		return 0
+	}
+
 	cm.murw.RLock()
 
 	l := len(cm.m)