From 7d5c9710e50c17d0d4dfb001f2a76adca6eb1d29 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Fri, 30 Dec 2022 16:04:48 -0600 Subject: [PATCH 1/3] editor/sagas: fix signature trigger characters The intended behavior is that comma should trigger signature help when it is not showing. retrigger only triggers if already showing. --- CHANGELOG.md | 3 +++ src/editor/sagas.ts | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4208a37a..e86fae31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ ## [Unreleased] +### Changed +- Code completion trigger improvements. + ### Fixed - Fixed terminal layout issues when resizing window vertically. - Fixed editor find widget visible over modal dialogs. diff --git a/src/editor/sagas.ts b/src/editor/sagas.ts index 9b93eb61..219097c6 100644 --- a/src/editor/sagas.ts +++ b/src/editor/sagas.ts @@ -635,8 +635,8 @@ function* runJedi(): Generator { const subscription = monaco.languages.registerSignatureHelpProvider( pybricksMicroPythonId, { - signatureHelpTriggerCharacters: ['('], - signatureHelpRetriggerCharacters: [','], + signatureHelpTriggerCharacters: ['(', ','], + signatureHelpRetriggerCharacters: [')'], provideSignatureHelp(model, position, token, context) { return new Promise((resolve) => { emit({ model, position, token, context, resolve }); From 62d7fdff363df1f8b3b434c7df01318e5c2824cb Mon Sep 17 00:00:00 2001 From: David Lechner Date: Fri, 30 Dec 2022 16:07:52 -0600 Subject: [PATCH 2/3] editor/sagas: disable code completion trigger on space This gets in the way when typing comments and often results in accepting a completion that was not intended. Fixes: https://github.com/pybricks/support/issues/894 --- CHANGELOG.md | 4 +++- src/editor/sagas.ts | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e86fae31..42af1092 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,12 +5,14 @@ ## [Unreleased] ### Changed -- Code completion trigger improvements. +- Code completion trigger improvements ([support#894]). ### Fixed - Fixed terminal layout issues when resizing window vertically. - Fixed editor find widget visible over modal dialogs. +[support#894]: https://github.com/pybricks/support/issues/894 + ## [2.1.0-beta.3] - 2022-12-28 ### Changed diff --git a/src/editor/sagas.ts b/src/editor/sagas.ts index 219097c6..0fc37c71 100644 --- a/src/editor/sagas.ts +++ b/src/editor/sagas.ts @@ -606,7 +606,7 @@ function* runJedi(): Generator { const subscription = monaco.languages.registerCompletionItemProvider( pybricksMicroPythonId, { - triggerCharacters: ['.', ' '], + triggerCharacters: ['.'], provideCompletionItems( model, position, From 2de7803c77016c99c15226f364feae3a8ec11202 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Fri, 30 Dec 2022 16:10:49 -0600 Subject: [PATCH 3/3] v2.1.0-beta.4 --- CHANGELOG.md | 5 ++++- package.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42af1092..3772b219 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ ## [Unreleased] +## [2.1.0-beta.4] - 2022-12-30 + ### Changed - Code completion trigger improvements ([support#894]). @@ -675,7 +677,8 @@ Prerelease changes are documented at [support#48]. -[Unreleased]: https://github.com/pybricks/pybricks-code/compare/v2.1.0-beta.3...HEAD +[Unreleased]: https://github.com/pybricks/pybricks-code/compare/v2.1.0-beta.4...HEAD +[2.1.0-beta.4]: https://github.com/pybricks/pybricks-code/compare/v2.1.0-beta.3...v2.1.0-beta.4 [2.1.0-beta.3]: https://github.com/pybricks/pybricks-code/compare/v2.1.0-beta.2...v2.1.0-beta.3 [2.1.0-beta.2]: https://github.com/pybricks/pybricks-code/compare/v2.1.0-beta.1...v2.1.0-beta.2 [2.1.0-beta.1]: https://github.com/pybricks/pybricks-code/compare/v2.0.1...v2.1.0-beta.1 diff --git a/package.json b/package.json index 5bbebf48..ac080339 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@pybricks/pybricks-code", - "version": "2.1.0-beta.3", + "version": "2.1.0-beta.4", "license": "MIT", "author": "The Pybricks Authors", "repository": {