From 3fcf1d6f132b89ba1bd7bd19de5ed89a6d1ee765 Mon Sep 17 00:00:00 2001 From: Wasim Lorgat Date: Wed, 13 Sep 2023 18:11:31 +0000 Subject: [PATCH] Merged PR posit-dev/positron-python#214: refine immediate startup heuristic Merge pull request #214 from posit-dev/immediate-startup refine immediate startup heuristic -------------------- Commit message for posit-dev/positron-python@2a5a988525a9483764f9c608bb809c48c5163f1c: refine immediate startup heuristic Restrict config files to the workspace root. See this discussion for more: https://github.com/posit-dev/positron/pull/1289#discussion_r1323446393. Also fixes the `.venv` and `.conda` cases which were incorrectly searching for files with those names instead of folders. Relates to https://github.com/posit-dev/positron/issues/1282. Authored-by: Wasim Lorgat Signed-off-by: Wasim Lorgat --- .../src/client/positron/provider.ts | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/extensions/positron-python/src/client/positron/provider.ts b/extensions/positron-python/src/client/positron/provider.ts index 1171da4eac0..caca64981c2 100644 --- a/extensions/positron-python/src/client/positron/provider.ts +++ b/extensions/positron-python/src/client/positron/provider.ts @@ -57,15 +57,18 @@ export async function* pythonRuntimeProvider( // Recommend Python for the workspace if it contains Python-relevant files let recommendedForWorkspace = await hasFiles([ + // Code and notebook files '**/*.py', - '**/pyproject.toml', - '**/Pipfile', - '**/*requirements.txt', - '**/.python-version', - '**/.venv', '**/*.ipynb', - '**/environment.yml', - '**/.conda', + // Virtual environment folders + '.venv/**/*', + '.conda/**/*', + // Config files + 'pyproject.toml', + 'Pipfile', + '*requirements.txt', + '.python-version', + 'environment.yml', ]); traceInfo(`pythonRuntimeProvider: recommended for workspace: ${recommendedForWorkspace}`);