Skip to content

Updated configuration loading during initialization #1547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jmhymas wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated configuration loading during initialization #1547

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0723990
removed dead code
Jul 4, 2026
a12dca0
Updated json parsing path in initialize_request to return an error
Jul 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 15 additions & 21 deletions src/server/requests.odin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,22 +722,15 @@ request_initialize :: proc(
config.enable_checker_workspace_diagnostics = false
config.enable_auto_import = true

read_ols_config :: proc(file: string, config: ^common.Config, uri: common.Uri) -> (ok: bool) {
data, err := os.read_entire_file(file, context.temp_allocator)
if err != nil {
log.warnf("Failed to read/find %v: %v", file, err)
return
}
load_ols_config :: proc(data: []byte, config: ^common.Config, uri: common.Uri) -> (err: json.Unmarshal_Error) {
ols_config: OlsConfig

json_err := json.unmarshal(data, &ols_config, allocator = context.temp_allocator)
if json_err == nil {
read_ols_initialize_options(config, ols_config, uri)
ok = true
} else {
log.errorf("Failed to unmarshal %v: %v", file, json_err)
if json_err != nil {
return json_err
}
return
read_ols_initialize_options(config, ols_config, uri)
return nil
}

project_uri := ""
Expand All @@ -748,20 +741,21 @@ request_initialize :: proc(
project_uri = initialize_params.rootUri
}

// Get the global ols config path.
global_ols_config_path := path.join(
elems = {filepath.dir(os.args[0]), "ols.json"},
allocator = context.temp_allocator,
)

uri, uri_ok := common.parse_uri(project_uri, context.temp_allocator)

global_config_loaded := read_ols_config(global_ols_config_path, config, uri)
read_ols_initialize_options(config, initialize_params.initializationOptions, uri)
if uri_ok {
// Apply ols.json config.
ols_config_path := path.join(elems = {uri.path, "ols.json"}, allocator = context.temp_allocator)
read_ols_config(ols_config_path, config, uri)
data, err := os.read_entire_file(ols_config_path, context.temp_allocator)
if err != nil {
log.warnf("Failed to read/find %v: %v", ols_config_path, err)
} else {
json_err := load_ols_config(data, config, uri)
if json_err != nil{
log.errorf("Failed to unmarshal %v: %v",ols_config_path, json_err)
return .ParseError
}
}
}

for format in initialize_params.capabilities.textDocument.hover.contentFormat {
Expand Down
Loading