Merge pull request #849 from BradLewis/fix/enum-variadic-args

Completions for variadic args

3 files changed, 45 insertions, 1 deletions

diff --git a/src/server/completion.odin b/src/server/completion.odin
index 9430235..d1a630a 100644
--- a/src/server/completion.odin
+++ b/src/server/completion.odin
@@ -107,7 +107,11 @@ get_completion_list :: proc(
 					completion_type = .Selector
 				}
 			}
-		} else {
+		} else if _, ok := position_context.selector.derived.(^ast.Implicit_Selector_Expr); !ok {
+			// variadic args seem to work by setting it as an implicit selector expr, in that case
+			// we want an identifier (eg. foo :: proc(args: ..{*}))
+
+			// Otherwise it's a selector
 			completion_type = .Selector
 		}
 	}
diff --git a/src/server/symbol.odin b/src/server/symbol.odin
index 77c4cb0..cf2c4ed 100644
--- a/src/server/symbol.odin
+++ b/src/server/symbol.odin
@@ -557,6 +557,10 @@ get_proc_arg_count :: proc(v: SymbolProcedureValue) -> int {
 get_proc_arg_type_from_index :: proc(value: SymbolProcedureValue, parameter_index: int) -> (^ast.Field, bool) {
 	index := 0
 	for arg in value.arg_types {
+		// We're in a variadic arg, so return true
+		if _, ok := arg.type.derived.(^ast.Ellipsis); ok {
+			return arg, true
+		}
 		for name in arg.names {
 			if index == parameter_index {
 				return arg, true
diff --git a/tests/completions_test.odin b/tests/completions_test.odin
index 58e5c11..675002e 100644
--- a/tests/completions_test.odin
+++ b/tests/completions_test.odin
@@ -4287,3 +4287,39 @@ ast_completion_proc_field_names :: proc(t: ^testing.T) {
 	}
 	test.expect_completion_docs( t, &source, "", {"test.bar: string"})
 }
+
+@(test)
+ast_completion_enum_variadiac_args :: proc(t: ^testing.T) {
+	source := test.Source {
+		main     = `package test
+		Foo :: enum {
+			A,
+			B,
+			C,
+		}
+
+		foo :: proc(foos: ..Foo) {}
+
+		main :: proc() {
+			foo(.A, .{*})
+		}
+		`,
+	}
+	test.expect_completion_docs( t, &source, "", {"A", "B", "C"})
+}
+
+@(test)
+ast_completion_proc_variadiac_arg :: proc(t: ^testing.T) {
+	source := test.Source {
+		main     = `package test
+		Foo :: enum {
+			A,
+			B,
+			C,
+		}
+
+		foo :: proc(foos: ..{*}) {}
+		`,
+	}
+	test.expect_completion_docs( t, &source, "", {"test.Foo: enum {..}"})
+}