Skip to content

Commit bf25f51

Browse files
committed
refactor: swap json with json5 package for debugging
1 parent a34428f commit bf25f51

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

fortls/debug.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
from __future__ import annotations
22

3-
import json
43
import os
54
import pprint
65

6+
import json5
7+
78
from .helper_functions import only_dirs, resolve_globs
89
from .jsonrpc import JSONRPC2Connection, ReadWriter, path_from_uri
910
from .langserver import LangServer
@@ -96,7 +97,7 @@ def debug_diagnostics(args, server):
9697

9798
print(" Results:")
9899
if args.debug_full_result:
99-
print(json.dumps(results, indent=2))
100+
print(json5.dumps(results, indent=2))
100101
separator()
101102
return
102103

@@ -127,7 +128,7 @@ def debug_symbols(args, server):
127128

128129
print(" Results:")
129130
if args.debug_full_result:
130-
print(json.dumps(results, indent=2))
131+
print(json5.dumps(results, indent=2))
131132
return
132133

133134
for symbol in results:
@@ -157,7 +158,7 @@ def debug_workspace_symbols(args, server):
157158

158159
print(" Results:")
159160
if args.debug_full_result:
160-
print(json.dumps(results, indent=2))
161+
print(json5.dumps(results, indent=2))
161162
return
162163

163164
for symbol in results:
@@ -195,7 +196,7 @@ def debug_completion(args, server):
195196

196197
print(" Results:")
197198
if args.debug_full_result:
198-
print(json.dumps(results, indent=2))
199+
print(json5.dumps(results, indent=2))
199200
return
200201

201202
for obj in results:
@@ -225,7 +226,7 @@ def debug_hover(args, server):
225226

226227
print(" Result:")
227228
if args.debug_full_result:
228-
print(json.dumps(results, indent=2))
229+
print(json5.dumps(results, indent=2))
229230
return
230231

231232
contents = results["contents"]
@@ -258,7 +259,7 @@ def debug_signature(args, server):
258259

259260
print(" Results:")
260261
if args.debug_full_result:
261-
print(json.dumps(results, indent=2))
262+
print(json5.dumps(results, indent=2))
262263
return
263264

264265
active_param = results.get("activeParameter", 0)
@@ -302,7 +303,7 @@ def debug_definition(args, server):
302303

303304
print(" Results:")
304305
if args.debug_full_result:
305-
print(json.dumps(results, indent=2))
306+
print(json5.dumps(results, indent=2))
306307
return
307308

308309
print(f' URI = "{results["uri"]}"')
@@ -333,7 +334,7 @@ def debug_references(args, server):
333334

334335
print(" Results:")
335336
if args.debug_full_result:
336-
print(json.dumps(results, indent=2))
337+
print(json5.dumps(results, indent=2))
337338
return
338339

339340
for result in results:
@@ -366,7 +367,7 @@ def debug_implementation(args, server):
366367

367368
print(" Results:")
368369
if args.debug_full_result:
369-
print(json.dumps(results, indent=2))
370+
print(json5.dumps(results, indent=2))
370371
return
371372

372373
print(f' URI = "{results["uri"]}"')
@@ -398,7 +399,7 @@ def debug_rename(args, server):
398399

399400
print(" Results:")
400401
if args.debug_full_result:
401-
print(json.dumps(results, indent=2))
402+
print(json5.dumps(results, indent=2))
402403
return
403404

404405
for uri, changes in results["changes"].items():
@@ -464,7 +465,7 @@ def debug_actions(args, server):
464465

465466
print(" Results:")
466467
if args.debug_full_result:
467-
print(json.dumps(results, indent=2))
468+
print(json5.dumps(results, indent=2))
468469
return
469470

470471
for result in results:
@@ -486,7 +487,7 @@ def debug_server_parser(args):
486487
"""
487488

488489
def locate_config(root: str) -> str | None:
489-
default_conf_files = [args.config, ".fortlsrc", ".fortls.json", ".fortls"]
490+
default_conf_files = [args.config, ".fortlsrc", ".fortls.json5", ".fortls"]
490491
present_conf_files = [
491492
os.path.isfile(os.path.join(root, f)) for f in default_conf_files
492493
]
@@ -514,7 +515,7 @@ def read_config(root: str | None):
514515

515516
try:
516517
with open(config_path, encoding="utf-8") as fhandle:
517-
config_dict = json.load(fhandle)
518+
config_dict = json5.load(fhandle)
518519
pp_suffixes = config_dict.get("pp_suffixes", None)
519520
pp_defs = config_dict.get("pp_defs", {})
520521
for path in config_dict.get("include_dirs", set()):

0 commit comments

Comments
 (0)