Skip to content

Commit 0f52484

Browse files
committed
fix module_dir bug
Signed-off-by: Jade Abraham <[email protected]>
1 parent f98c242 commit 0f52484

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

tools/chpl-language-server/src/chpl-language-server.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import re
4343
import sys
4444
import importlib.util
45+
import copy
4546

4647
import chapel
4748
from chapel.lsp import location_to_range, error_to_diagnostic
@@ -693,8 +694,8 @@ def __init__(
693694
self.module_paths = file_config["module_dirs"]
694695
self.file_paths = file_config["files"]
695696

696-
self.std_module_root = self.cls_config.args.get("std_module_root", "")
697-
self.module_paths.extend(self.cls_config.args.get("module_dirs", []))
697+
self.std_module_root = self.cls_config.get("std_module_root")
698+
self.module_paths.extend(self.cls_config.get("module_dir"))
698699

699700
self.context._set_module_paths(
700701
self.std_module_root, self.module_paths, self.file_paths
@@ -1411,7 +1412,7 @@ def add_bool_flag(name: str, dest: str, default: bool):
14111412
"--std-module-root", default="", help=configargparse.SUPPRESS
14121413
)
14131414
self.parser.add_argument(
1414-
"-M", "--module-dir", action="append", default=[]
1415+
"--module-dir", "-M", action="append", default=[]
14151416
)
14161417
add_bool_flag("type-inlays", "type_inlays", True)
14171418
add_bool_flag("param-inlays", "param_inlays", True)
@@ -1453,7 +1454,7 @@ def _validate_end_markers(self):
14531454
)
14541455

14551456
def parse_args(self):
1456-
self.args = vars(self.parser.parse_args())
1457+
self.args = copy.deepcopy(vars(self.parser.parse_args()))
14571458
self._parse_end_markers()
14581459
self._validate_end_markers()
14591460

0 commit comments

Comments
 (0)