From c985b55488d47e6d68eaf7f3fa72575d8dfe4b4a Mon Sep 17 00:00:00 2001 From: Nok Lam Chan Date: Thu, 19 Sep 2024 17:18:33 +0100 Subject: [PATCH 1/3] Expand pipeline search folders Signed-off-by: Nok Lam Chan --- CHANGELOG.md | 1 + bundled/tool/lsp_server.py | 24 +++++++++++------------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7aa71c..3d3ffa0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Fixed a bug where "Find reference" return too many matches for catalog dataset, it returns only exact matches now. - Fixed a bug where namespace dataset navigation is not working properly - Fixed a bug where navigating on nested parameters should go to the top level key. +- Modify the extension to search pipelines from all /pipelines folder. # 0.1.0 diff --git a/bundled/tool/lsp_server.py b/bundled/tool/lsp_server.py index 8d98eb2..3167b36 100644 --- a/bundled/tool/lsp_server.py +++ b/bundled/tool/lsp_server.py @@ -290,7 +290,9 @@ def _query_parameter(document, word=None): def _query_catalog(document, word=None): if not word: - word = document.word_at_position(params.position, RE_START_WORD, RE_END_WORD) + word = document.word_at_position( + params.position, RE_START_WORD, RE_END_WORD + ) catalog_paths = _get_conf_paths(server, "catalog") log_for_lsp_debug(f"Attempt to search `{word}` from catalog") log_for_lsp_debug(f"{catalog_paths=}") @@ -377,19 +379,15 @@ def references( pipelines_package = importlib_resources.files(f"{PACKAGE_NAME}.pipelines") - # Iterate on pipelines//**/*pipeline*.py + # Iterate on pipelines/**/*.py that fits both modular or flat pipeline structure. result = [] - for pipeline_dir in pipelines_package.iterdir(): - if not pipeline_dir.is_dir(): - continue - # Use glob to find files matching the pattern recursively - pipeline_files = glob.glob(f"{pipeline_dir}/**/*.py", recursive=True) - for pipeline_file in pipeline_files: - # Read the line number and match keywords naively - with open(pipeline_file) as f: - for i, line in enumerate(f): - if f'"{word}"' in line: - result.append((Path(pipeline_file), i)) + pipeline_files = glob.glob(f"{pipelines_package}/**/*.py", recursive=True) + for pipeline_file in pipeline_files: + # Read the line number and match keywords naively + with open(pipeline_file) as f: + for i, line in enumerate(f): + if f'"{word}"' in line: + result.append((Path(pipeline_file), i)) locations = [] if result: From 3893fb1c00ddd75629afaf9aac31f076cf5ccbb2 Mon Sep 17 00:00:00 2001 From: Nok Lam Chan Date: Mon, 23 Sep 2024 17:18:47 +0100 Subject: [PATCH 2/3] bump release version Signed-off-by: Nok Lam Chan --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3007f53..0e47585 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "Kedro", "displayName": "Kedro", "description": "A Kedro VSCode Extension.", - "version": "0.2.0-rc3", + "version": "0.2.1", "preview": false, "serverInfo": { "name": "Kedro", From cc4768409f181de0895313e52708f119b9826d44 Mon Sep 17 00:00:00 2001 From: Nok Lam Chan Date: Mon, 23 Sep 2024 18:17:46 +0100 Subject: [PATCH 3/3] bug fix and bump 0.2.2 Signed-off-by: Nok Lam Chan --- .vscodeignore | 3 ++- Makefile | 7 ++++++- package.json | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.vscodeignore b/.vscodeignore index 7637d06..e02a9f0 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -21,4 +21,5 @@ noxfile.py .pylintrc **/requirements.txt **/requirements.in -**/tool/_debug_server.py \ No newline at end of file +**/tool/_debug_server.py +Kedro* diff --git a/Makefile b/Makefile index 7856158..d8ca266 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ sign-off: build: + make dev-install vsce package @@ -18,4 +19,8 @@ dev-install: nox --session build_package test: - pytest \ No newline at end of file + pytest + +release: + make dev-install + vsce publish \ No newline at end of file diff --git a/package.json b/package.json index 0e47585..edb7837 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "Kedro", "displayName": "Kedro", "description": "A Kedro VSCode Extension.", - "version": "0.2.1", + "version": "0.2.2", "preview": false, "serverInfo": { "name": "Kedro",