Merge branch 'master' into rename

3 files changed, 121 insertions, 43 deletions

diff --git a/src/server/inlay_hints.odin b/src/server/inlay_hints.odin
index 8085baa..86d1bf5 100644
--- a/src/server/inlay_hints.odin
+++ b/src/server/inlay_hints.odin
@@ -9,6 +9,7 @@ import "src:common"
 get_inlay_hints :: proc(
 	document: ^Document,
 	symbols: map[uintptr]SymbolAndNode,
+	config: ^common.Config,
 ) -> (
 	[]InlayHint,
 	bool,
@@ -58,9 +59,12 @@ get_inlay_hints :: proc(
 	loop: for node_call in &data.calls {
 		symbol_arg_count := 0
 		is_selector_call := false
+		is_ellipsis := false
+		has_added_default := false
 
 		call := node_call.derived.(^ast.Call_Expr)
 
+		// TODO: support this (inlay hints in calls that use named args, e.g. `foobar(foo=bar)`
 		for arg in call.args {
 			if _, ok := arg.derived.(^ast.Field_Value); ok {
 				continue loop
@@ -81,17 +85,13 @@ get_inlay_hints :: proc(
 					}
 
 					for name in arg.names {
-						if symbol_arg_count >= len(call.args) {
-							continue loop
-						}
-
 						label := ""
-						is_ellipsis := false
+						is_current_ellipsis := false
 
 						if arg.type != nil {
 							if ellipsis, ok := arg.type.derived.(^ast.Ellipsis);
 							   ok {
-								is_ellipsis = true
+								is_current_ellipsis = true
 							}
 						}
 
@@ -108,24 +108,92 @@ get_inlay_hints :: proc(
 							continue loop
 						}
 
-						range := common.get_token_range(
-							call.args[symbol_arg_count],
-							string(document.text),
-						)
-						hint := InlayHint {
-							kind     = .Parameter,
-							label    = fmt.tprintf("%v = ", label),
-							position = range.start,
-						}
-						append(&hints, hint)
+						if is_ellipsis || symbol_arg_count >= len(call.args) {
+							if arg.default_value == nil {
+								continue loop
+							}
 
-						symbol_arg_count += 1
+							if !config.enable_inlay_hints_default_params {
+								continue loop
+							}
 
-						if is_ellipsis {
-							continue loop
+							value := common.node_to_string(arg.default_value)
+
+							call_range := common.get_token_range(
+								call,
+								string(document.text),
+							)
+
+							position: common.Position
+							position = call_range.end
+							position.character -= 1
+
+							has_trailing_comma: bool;{
+								if !has_added_default {
+									till_end := string(
+										document.text[:call.close.offset],
+									)
+									trailing_loop: #reverse for ch in till_end {
+										switch ch {
+										case ' ', '\t', '\n':
+										case ',':
+											has_trailing_comma = true
+											break trailing_loop
+										case:
+											break trailing_loop
+										}
+									}
+								}
+							}
+
+							hint := InlayHint {
+								kind     = .Parameter,
+								label    = fmt.tprintf(
+									"%s %v := %v",
+									has_trailing_comma ? "" : ",",
+									label,
+									value,
+								),
+								position = position,
+							}
+							append(&hints, hint)
+
+							has_added_default = true
+						} else if config.enable_inlay_hints_params {
+
+							// if the arg name and param name are the same, don't add it.
+							same_name: bool
+							#partial switch v in
+								call.args[symbol_arg_count].derived_expr {
+							case ^ast.Ident:
+								same_name = label == v.name
+							case ^ast.Poly_Type:
+								if ident, ok := v.type.derived.(^ast.Ident);
+								   ok {
+									same_name = label == ident.name
+								}
+							}
+
+							if !same_name {
+								range := common.get_token_range(
+									call.args[symbol_arg_count],
+									string(document.text),
+								)
+								hint := InlayHint {
+									kind     = .Parameter,
+									label    = fmt.tprintf("%v = ", label),
+									position = range.start,
+								}
+								append(&hints, hint)
+							}
+						}
+
+						if is_current_ellipsis {
+							is_ellipsis = true
 						}
-					}
 
+						symbol_arg_count += 1
+					}
 				}
 			}
 		}
diff --git a/src/server/requests.odin b/src/server/requests.odin
index b47c4a0..dfab097 100644
--- a/src/server/requests.odin
+++ b/src/server/requests.odin
@@ -496,6 +496,11 @@ read_ols_initialize_options :: proc(
 
 	config.enable_inlay_hints =
 		ols_config.enable_inlay_hints.(bool) or_else config.enable_inlay_hints
+	config.enable_inlay_hints_params =
+		ols_config.enable_inlay_hints_params.(bool) or_else config.enable_inlay_hints_params
+	config.enable_inlay_hints_default_params =
+		ols_config.enable_inlay_hints_default_params.(bool) or_else config.enable_inlay_hints_default_params
+
 	config.enable_fake_method =
 		ols_config.enable_fake_methods.(bool) or_else config.enable_fake_method
 
@@ -689,6 +694,10 @@ request_initialize :: proc(
 	config.enable_hover = true
 	config.enable_format = true
 
+	config.enable_inlay_hints = false
+	config.enable_inlay_hints_params = true
+	config.enable_inlay_hints_default_params = true
+
 	config.disable_parser_errors = false
 	config.thread_count = 2
 	config.enable_document_symbols = true
@@ -703,7 +712,6 @@ request_initialize :: proc(
 	config.enable_rename = true
 	config.odin_command = ""
 	config.checker_args = ""
-	config.enable_inlay_hints = false
 	config.enable_fake_method = false
 	config.enable_procedure_snippet = true
 	config.enable_checker_only_saved = false
@@ -1441,7 +1449,7 @@ request_inlay_hint :: proc(
 	resolve_entire_file_cached(document)
 
 	if file, ok := file_resolve_cache.files[document.uri.uri]; ok {
-		hints, ok = get_inlay_hints(document, file.symbols)
+		hints, ok = get_inlay_hints(document, file.symbols, config)
 	}
 
 	if !ok {
diff --git a/src/server/types.odin b/src/server/types.odin
index 5079bf6..7eb3a10 100644
--- a/src/server/types.odin
+++ b/src/server/types.odin
@@ -342,27 +342,29 @@ TextDocumentSyncOptions :: struct {
 }
 
 OlsConfig :: struct {
-	collections:               [dynamic]OlsConfigCollection,
-	thread_pool_count:         Maybe(int),
-	enable_semantic_tokens:    Maybe(bool),
-	enable_document_symbols:   Maybe(bool),
-	enable_format:             Maybe(bool),
-	enable_hover:              Maybe(bool),
-	enable_procedure_context:  Maybe(bool),
-	enable_snippets:           Maybe(bool),
-	enable_inlay_hints:        Maybe(bool),
-	enable_references:         Maybe(bool),
-	enable_fake_methods:       Maybe(bool),
-	enable_procedure_snippet:  Maybe(bool),
-	enable_checker_only_saved: Maybe(bool),
-	disable_parser_errors:     Maybe(bool),
-	verbose:                   Maybe(bool),
-	file_log:                  Maybe(bool),
-	odin_command:              string,
-	checker_args:              string,
-	checker_targets:           []string,
-	profiles:                  [dynamic]common.ConfigProfile,
-	profile:                   string,
+	collections:                       [dynamic]OlsConfigCollection,
+	thread_pool_count:                 Maybe(int),
+	enable_semantic_tokens:            Maybe(bool),
+	enable_document_symbols:           Maybe(bool),
+	enable_format:                     Maybe(bool),
+	enable_hover:                      Maybe(bool),
+	enable_procedure_context:          Maybe(bool),
+	enable_snippets:                   Maybe(bool),
+	enable_inlay_hints:                Maybe(bool),
+	enable_inlay_hints_params:         Maybe(bool),
+	enable_inlay_hints_default_params: Maybe(bool),
+	enable_references:                 Maybe(bool),
+	enable_fake_methods:               Maybe(bool),
+	enable_procedure_snippet:          Maybe(bool),
+	enable_checker_only_saved:         Maybe(bool),
+	disable_parser_errors:             Maybe(bool),
+	verbose:                           Maybe(bool),
+	file_log:                          Maybe(bool),
+	odin_command:                      string,
+	checker_args:                      string,
+	checker_targets:                   []string,
+	profiles:                          [dynamic]common.ConfigProfile,
+	profile:                           string,
 }
 
 OlsConfigCollection :: struct {