From 89e95f03874dc7199f0f787667df57593dd1b09b Mon Sep 17 00:00:00 2001 From: masfrost Date: Wed, 8 Dec 2021 20:25:26 -0800 Subject: [PATCH] Prefer YAPF over autopep8 --- pylsp/plugins/autopep8_format.py | 4 ++-- pylsp/plugins/yapf_format.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pylsp/plugins/autopep8_format.py b/pylsp/plugins/autopep8_format.py index f62443f6..192174c8 100644 --- a/pylsp/plugins/autopep8_format.py +++ b/pylsp/plugins/autopep8_format.py @@ -9,13 +9,13 @@ log = logging.getLogger(__name__) -@hookimpl(tryfirst=True) # Prefer autopep8 over YAPF +@hookimpl def pylsp_format_document(config, document): log.info("Formatting document %s with autopep8", document) return _format(config, document) -@hookimpl(tryfirst=True) # Prefer autopep8 over YAPF +@hookimpl def pylsp_format_range(config, document, range): # pylint: disable=redefined-builtin log.info("Formatting document %s in range %s with autopep8", document, range) diff --git a/pylsp/plugins/yapf_format.py b/pylsp/plugins/yapf_format.py index 6728007b..22a9334a 100644 --- a/pylsp/plugins/yapf_format.py +++ b/pylsp/plugins/yapf_format.py @@ -10,12 +10,12 @@ log = logging.getLogger(__name__) -@hookimpl +@hookimpl(tryfirst=True) # Prefer YAPF over autopep8 def pylsp_format_document(document): return _format(document) -@hookimpl +@hookimpl(tryfirst=True) # Prefer YAPF over autopep8 def pylsp_format_range(document, range): # pylint: disable=redefined-builtin # First we 'round' the range up/down to full lines only range['start']['character'] = 0