Skip to content

Commit e6514d4

Browse files
committed
fix fortran-lang#348: more debug details
1 parent 3386073 commit e6514d4

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

fortls/langserver.py

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,9 @@ def serve_initialize(self, request: dict):
197197
)
198198
self.source_dirs.add(self.root_path)
199199

200-
self._load_config_file()
200+
config_dict = self._load_config_file()
201201
self._resolve_globs_in_paths()
202-
self._config_logger(request)
202+
self._config_logger(request, config_dict)
203203
self._load_intrinsics()
204204
self._add_source_dirs()
205205
if self._update_version_pypi():
@@ -1527,6 +1527,8 @@ def serve_default(self, request: dict):
15271527
def _load_config_file(self) -> None:
15281528
"""Loads the configuration file for the Language Server"""
15291529

1530+
config_dict = None
1531+
15301532
# Check for config files
15311533
default_conf_files = [self.config, ".fortlsrc", ".fortls.json", ".fortls"]
15321534
present_conf_files = [
@@ -1570,6 +1572,8 @@ def _load_config_file(self) -> None:
15701572
msg = f'Error: "{e}" while reading "{self.config}" Configuration file'
15711573
self.post_message(msg)
15721574

1575+
return config_dict
1576+
15731577
def _load_config_file_dirs(self, config_dict: dict) -> None:
15741578
self.excl_paths = set(config_dict.get("excl_paths", self.excl_paths))
15751579
self.source_dirs = set(config_dict.get("source_dirs", self.source_dirs))
@@ -1717,7 +1721,7 @@ def _get_source_files(self) -> list[str]:
17171721
file_list.append(p)
17181722
return file_list
17191723

1720-
def _config_logger(self, request) -> None:
1724+
def _config_logger(self, request, config_dict) -> None:
17211725
"""Configures the logger to save Language Server requests/responses to a file
17221726
the logger will by default output to the main (stderr, stdout) channels.
17231727
"""
@@ -1732,6 +1736,13 @@ def _config_logger(self, request) -> None:
17321736
consoleHandler = logging.StreamHandler()
17331737
log.addHandler(consoleHandler)
17341738
log.debug("REQUEST %s %s", request.get("id"), request.get("method"))
1739+
for arg in sys.argv[1:]:
1740+
log.debug("Cli Options: %s", arg)
1741+
if config_dict is not None:
1742+
for key, value in config_dict.items():
1743+
log.debug("Config Options: %s,%s", key, value)
1744+
else:
1745+
log.debug("No config file were passed")
17351746
self.post_messages.append([Severity.info, "fortls debugging enabled"])
17361747
else:
17371748
logging.basicConfig(format=fmt, datefmt="%H:%M:%S", level=logging.INFO)

0 commit comments

Comments
 (0)