From 628de3a3855c4c9c286751dedf516aac81c7138c Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 5 Sep 2023 20:37:43 +0000 Subject: [PATCH 1/2] make version extraction more robust --- bundled/tool/lsp_server.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bundled/tool/lsp_server.py b/bundled/tool/lsp_server.py index 517a32a..5b08246 100644 --- a/bundled/tool/lsp_server.py +++ b/bundled/tool/lsp_server.py @@ -8,6 +8,7 @@ import json import os import pathlib +import re import sys import traceback from typing import Any, Dict, List, Optional, Sequence, Union @@ -238,7 +239,7 @@ def _log_version_info() -> None: # This is text we get from running `black --version` # black, 22.3.0 (compiled: yes) <--- This is the version we want. first_line = result.stdout.splitlines(keepends=False)[0] - parts = [v for v in first_line.split(" ") if "." in v] + parts = [v for v in first_line.split(" ") if re.match("\d+\.\d+\..*", v)] if len(parts) == 1: actual_version = parts[0] else: From 15f993db2d14946265aa87eedb4e9b3c22eba079 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 5 Sep 2023 20:47:09 +0000 Subject: [PATCH 2/2] udpated regex --- bundled/tool/lsp_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundled/tool/lsp_server.py b/bundled/tool/lsp_server.py index 5b08246..15f15a1 100644 --- a/bundled/tool/lsp_server.py +++ b/bundled/tool/lsp_server.py @@ -239,7 +239,7 @@ def _log_version_info() -> None: # This is text we get from running `black --version` # black, 22.3.0 (compiled: yes) <--- This is the version we want. first_line = result.stdout.splitlines(keepends=False)[0] - parts = [v for v in first_line.split(" ") if re.match("\d+\.\d+\..*", v)] + parts = [v for v in first_line.split(" ") if re.match("\d+\.\d+\S*", v)] if len(parts) == 1: actual_version = parts[0] else: