better setting names

Author: pfitzseb

src/languageserverinstance.jl

@@ -43,7 +43,9 @@ mutable struct LanguageServerInstance
     lint_missingrefs::Symbol
     lint_disableddirs::Vector{String}
     completion_mode::Symbol
-    inlay_hint_mode::Symbol # :none, :literals, :all
+    inlay_hints::Bool
+    inlay_hints_variable_types::Bool
+    inlay_hints_parameter_names::Symbol
 
     combined_msg_queue::Channel{Any}
 
@@ -84,6 +86,8 @@ mutable struct LanguageServerInstance
             :all,
             LINT_DIABLED_DIRS,
             :qualify, # options: :import or :qualify, anything else turns this off
+            true,
+            true,
             :literals,
             Channel{Any}(Inf),
             err_handler,

src/requests/features.jl

@@ -578,7 +578,7 @@ function get_selection_range_of_expr(x::EXPR)
 end
 
 function textDocument_inlayHint_request(params::InlayHintParams, server::LanguageServerInstance, conn)::Union{Vector{InlayHint},Nothing}
-    if server.inlay_hint_mode === :none
+    if !server.inlay_hints
         return nothing
     end
 
@@ -590,7 +590,6 @@ function textDocument_inlayHint_request(params::InlayHintParams, server::Languag
 end
 
 function collect_inlay_hints(x::EXPR, server::LanguageServerInstance, doc, start, stop, pos=0, hints=InlayHint[])
-    literals_only = server.inlay_hint_mode === :literals
     if x isa EXPR && parentof(x) isa EXPR &&
             CSTParser.iscall(parentof(x)) &&
             !(
@@ -599,7 +598,10 @@ function collect_inlay_hints(x::EXPR, server::LanguageServerInstance, doc, start
             ) &&
             parentof(x).args[1] != x # function calls
 
-        if !literals_only || CSTParser.isliteral(x)
+        if server.inlay_hints_parameter_names === :all || (
+                server.inlay_hints_parameter_names === :literals &&
+                CSTParser.isliteral(x)
+            )
             sigs = collect_signatures(x, doc, server)
             if !isempty(sigs)
                 args = length(parentof(x).args) - 1
@@ -641,21 +643,23 @@ function collect_inlay_hints(x::EXPR, server::LanguageServerInstance, doc, start
             CSTParser.isassignment(parentof(x)) &&
             parentof(x).args[1] == x &&
             StaticLint.hasbinding(x) # assignment
-        typ = _completion_type(StaticLint.bindingof(x))
-        if typ !== missing
-            push!(
-                hints,
-                InlayHint(
-                    Position(get_position_from_offset(doc, pos + x.span)...),
-                    string("::", typ),
-                    InlayHintKinds.Type,
-                    missing,
-                    missing,
-                    missing,
-                    missing,
-                    missing
+        if server.inlay_hints_variable_types
+            typ = _completion_type(StaticLint.bindingof(x))
+            if typ !== missing
+                push!(
+                    hints,
+                    InlayHint(
+                        Position(get_position_from_offset(doc, pos + x.span)...),
+                        string("::", typ),
+                        InlayHintKinds.Type,
+                        missing,
+                        missing,
+                        missing,
+                        missing,
+                        missing
+                    )
                 )
-            )
+            end
         end
     end
     if length(x) > 0

src/requests/workspace.jl

@@ -108,7 +108,9 @@ function request_julia_config(server::LanguageServerInstance, conn)
         ConfigurationItem(missing, "julia.lint.missingrefs"),
         ConfigurationItem(missing, "julia.lint.disabledDirs"),
         ConfigurationItem(missing, "julia.completionmode"),
-        ConfigurationItem(missing, "julia.inlayHints"),
+        ConfigurationItem(missing, "julia.inlayHints.static.enabled"),
+        ConfigurationItem(missing, "julia.inlayHints.static.variableTypes.enabled"),
+        ConfigurationItem(missing, "julia.inlayHints.static.parameterNames.enabled"),
     ]))
 
     new_runlinter = something(response[11], true)
@@ -117,7 +119,9 @@ function request_julia_config(server::LanguageServerInstance, conn)
     new_lint_missingrefs = Symbol(something(response[12], :all))
     new_lint_disableddirs = something(response[13], LINT_DIABLED_DIRS)
     new_completion_mode = Symbol(something(response[14], :import))
-    inlayHints = Symbol(something(response[15], :literals))
+    inlayHints = something(response[15], true)
+    inlayHintsVariableTypes = something(response[16], true)
+    inlayHintsParameterNames = Symbol(something(response[17], :literals))
 
     rerun_lint = begin
         any(getproperty(server.lint_options, opt) != getproperty(new_SL_opts, opt) for opt in fieldnames(StaticLint.LintOptions)) ||
@@ -131,7 +135,9 @@ function request_julia_config(server::LanguageServerInstance, conn)
     server.lint_missingrefs = new_lint_missingrefs
     server.lint_disableddirs = new_lint_disableddirs
     server.completion_mode = new_completion_mode
-    server.inlay_hint_mode = inlayHints
+    server.inlay_hints = inlayHints
+    server.inlay_hints_variable_types = inlayHintsVariableTypes
+    server.inlay_hints_parameter_names = inlayHintsParameterNames
 
     if rerun_lint
         relintserver(server)