Specify relevant document path when retrieving some plugin settings (#…

…845)
palantir · Oct 25, 2020 · 6c9aca4 · 6c9aca4
1 parent e0f8b3d
commit 6c9aca4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/pyls/plugins/autopep8_format.py b/pyls/plugins/autopep8_format.py
@@ -28,7 +28,7 @@ def pyls_format_range(config, document, range):  # pylint: disable=redefined-bui
 
 
 def _format(config, document, line_range=None):
-    options = _autopep8_config(config)
+    options = _autopep8_config(config, document)
     if line_range:
         options['line_range'] = list(line_range)
 
@@ -57,9 +57,10 @@ def _format(config, document, line_range=None):
     }]
 
 
-def _autopep8_config(config):
+def _autopep8_config(config, document=None):
     # We user pycodestyle settings to avoid redefining things
-    settings = config.plugin_settings('pycodestyle')
+    path = document.path if document is not None else None
+    settings = config.plugin_settings('pycodestyle', document_path=path)
     options = {
         'exclude': settings.get('exclude'),
         'hang_closing': settings.get('hangClosing'),

diff --git a/pyls/plugins/flake8_lint.py b/pyls/plugins/flake8_lint.py
@@ -19,7 +19,7 @@ def pyls_settings():
 @hookimpl
 def pyls_lint(workspace, document):
     config = workspace._config
-    settings = config.plugin_settings('flake8')
+    settings = config.plugin_settings('flake8', document_path=document.path)
     log.debug("Got flake8 settings: %s", settings)
 
     opts = {

diff --git a/pyls/plugins/mccabe_lint.py b/pyls/plugins/mccabe_lint.py
@@ -12,7 +12,7 @@
 
 @hookimpl
 def pyls_lint(config, document):
-    threshold = config.plugin_settings('mccabe').get(THRESHOLD, DEFAULT_THRESHOLD)
+    threshold = config.plugin_settings('mccabe', document_path=document.path).get(THRESHOLD, DEFAULT_THRESHOLD)
     log.debug("Running mccabe lint with threshold: %s", threshold)
 
     try:

diff --git a/pyls/plugins/pycodestyle_lint.py b/pyls/plugins/pycodestyle_lint.py
@@ -21,7 +21,7 @@
 @hookimpl
 def pyls_lint(workspace, document):
     config = workspace._config
-    settings = config.plugin_settings('pycodestyle')
+    settings = config.plugin_settings('pycodestyle', document_path=document.path)
     log.debug("Got pycodestyle settings: %s", settings)
 
     opts = {

diff --git a/pyls/plugins/pydocstyle_lint.py b/pyls/plugins/pydocstyle_lint.py
@@ -26,7 +26,7 @@ def pyls_settings():
 
 @hookimpl
 def pyls_lint(config, document):
-    settings = config.plugin_settings('pydocstyle')
+    settings = config.plugin_settings('pydocstyle', document_path=document.path)
     log.debug("Got pydocstyle settings: %s", settings)
 
     # Explicitly passing a path to pydocstyle means it doesn't respect the --match flag, so do it ourselves