@@ -197,9 +197,9 @@ def serve_initialize(self, request: dict):
197
197
)
198
198
self .source_dirs .add (self .root_path )
199
199
200
- self ._load_config_file ()
200
+ config_dict = self ._load_config_file ()
201
201
self ._resolve_globs_in_paths ()
202
- self ._config_logger (request )
202
+ self ._config_logger (request , config_dict )
203
203
self ._load_intrinsics ()
204
204
self ._add_source_dirs ()
205
205
if self ._update_version_pypi ():
@@ -1527,6 +1527,8 @@ def serve_default(self, request: dict):
1527
1527
def _load_config_file (self ) -> None :
1528
1528
"""Loads the configuration file for the Language Server"""
1529
1529
1530
+ config_dict = None
1531
+
1530
1532
# Check for config files
1531
1533
default_conf_files = [self .config , ".fortlsrc" , ".fortls.json" , ".fortls" ]
1532
1534
present_conf_files = [
@@ -1570,6 +1572,8 @@ def _load_config_file(self) -> None:
1570
1572
msg = f'Error: "{ e } " while reading "{ self .config } " Configuration file'
1571
1573
self .post_message (msg )
1572
1574
1575
+ return config_dict
1576
+
1573
1577
def _load_config_file_dirs (self , config_dict : dict ) -> None :
1574
1578
self .excl_paths = set (config_dict .get ("excl_paths" , self .excl_paths ))
1575
1579
self .source_dirs = set (config_dict .get ("source_dirs" , self .source_dirs ))
@@ -1717,7 +1721,7 @@ def _get_source_files(self) -> list[str]:
1717
1721
file_list .append (p )
1718
1722
return file_list
1719
1723
1720
- def _config_logger (self , request ) -> None :
1724
+ def _config_logger (self , request , config_dict ) -> None :
1721
1725
"""Configures the logger to save Language Server requests/responses to a file
1722
1726
the logger will by default output to the main (stderr, stdout) channels.
1723
1727
"""
@@ -1732,6 +1736,13 @@ def _config_logger(self, request) -> None:
1732
1736
consoleHandler = logging .StreamHandler ()
1733
1737
log .addHandler (consoleHandler )
1734
1738
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" )
1735
1746
self .post_messages .append ([Severity .info , "fortls debugging enabled" ])
1736
1747
else :
1737
1748
logging .basicConfig (format = fmt , datefmt = "%H:%M:%S" , level = logging .INFO )
0 commit comments