Completions: don't suggest loop vars as locals on same line (StyraInc…

…#1135)

Fixes StyraInc#1124

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

bundle/regal/lsp/completion/providers/locals/locals.rego

@@ -22,13 +22,12 @@ items contains item if {
 	word := location.word_at(line, input.regal.context.location.col)
 	parsed_current_file := data.workspace.parsed[input.regal.file.uri]
 
-	some local in location.find_locals(
-		parsed_current_file.rules,
-		input.regal.context.location,
-	)
+	some local in location.find_locals(parsed_current_file.rules, input.regal.context.location)
 
 	startswith(local, word.text)
 
+	not local in _same_line_loop_vars(line)
+
 	item := {
 		"label": local,
 		"kind": kind.variable,
@@ -49,3 +48,17 @@ _function_args_position(text) if {
 	contains(text, "(")
 	not contains(text, "=")
 }
+
+default _same_line_loop_vars(_) := []
+
+_same_line_loop_vars(line) := d if {
+	expr := trim_space(line)
+
+	strings.any_prefix_match(expr, {"some", "every"})
+
+	# ---------------------------------------------------> "some k, v in coll"
+	a := substring(expr, 0, indexof(expr, " in")) # -----> "some k, v"
+	b := trim_prefix(trim_prefix(a, "some"), "every") # -> "k, v"
+	c := replace(b, " ", "") # --------------------------> "k,v"
+	d := split(c, ",") # --------------------------------> [k, v] or [v]
+}

bundle/regal/lsp/completion/providers/locals/locals_test.rego

@@ -2,6 +2,8 @@ package regal.lsp.completion.providers.locals_test
 
 import rego.v1
 
+import data.regal.util
+
 import data.regal.lsp.completion.providers.locals as provider
 import data.regal.lsp.completion.providers.test_utils as utils
 
@@ -149,6 +151,33 @@ function() if {
 	count(items) == 0
 }
 
+test_no_some_in_vars_suggested_on_same_line if {
+	workspace := {"file:///p.rego": `package policy
+
+import rego.v1
+
+allow if {
+	xyz := 1
+	some xxx, yyy in x
+}
+`}
+
+	regal_module := {"regal": {
+		"file": {
+			"name": "p.rego",
+			"uri": "file:///p.rego",
+			"lines": split(workspace["file:///p.rego"], "\n"),
+		},
+		"context": {"location": {
+			"row": 7,
+			"col": 19,
+		}},
+	}}
+	items := provider.items with input as regal_module with data.workspace.parsed as utils.parsed_modules(workspace)
+
+	util.single_set_item(items).label == "xyz"
+}
+
 _expect_item(items, label, range) if {
 	expected := {"detail": "local variable", "kind": 6}