Get custom spoken forms from Talon by pokey · Pull Request #1940 · cursorless-dev/cursorless

pokey · 2023-10-12T15:44:58Z

This PR is the VSCode side of Write spokenForms.json from Talon #1939

Checklist

[-] I have added tests (tests added in Scope info provider #1941)
[-] I have updated the docs and cheatsheet
[-] I have not broken the cheatsheet

packages/cursorless-engine/src/generateSpokenForm/CustomSpokenFormGeneratorImpl.ts

packages/common/src/util/Disposer.ts

packages/cursorless-engine/src/scopeProviders/SpokenFormEntry.ts

auscompgeek · 2023-10-26T10:18:44Z

packages/cursorless-engine/src/nodeCommon/TalonSpokenFormsJsonReader.ts

+    } catch (err) {
+      if ((err as any)?.code === "ENOENT") {


You could type annotate the catch instead:

Suggested change

} catch (err) {

if ((err as any)?.code === "ENOENT") {

} catch (err: any) {

if (err?.code === "ENOENT") {

but the idiomatic thing would be to do an instanceof check

c1bd390 contains an alternative approach, courtesy of chatgpt. wdyt?

packages/cursorless-engine/src/nodeCommon/TalonSpokenFormsJsonReader.ts

packages/cursorless-engine/src/spokenForms/CustomSpokenForms.ts

packages/cursorless-engine/src/nodeCommon/TalonSpokenFormsJsonReader.ts

pokey · 2023-10-26T16:28:39Z

ok @AndreasArvidsson all feedback addressed; this one is ready for review again. I managed to get down to 2 type assertions, and they're more reasonable ones. Factoring it out into a function and using a for loop did simplify things 👍

packages/cursorless-vscode/src/ide/vscode/VscodeFileSystem.ts

- This PR is the Talon side of #1940 ## Checklist - [-] I have added [tests](https://www.cursorless.org/docs/contributing/test-case-recorder/) (will do in follow-up) - [-] I have updated the [docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and [cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet) - [x] I have not broken the cheatsheet - [x] have the json have its own version number

pokey mentioned this pull request Oct 12, 2023

Scope info provider #1941

Merged

1 task

pokey force-pushed the pokey/write-spokenformsjson-from-talon branch from 2410b74 to 0c3eca4 Compare October 12, 2023 17:41

pokey force-pushed the pokey/get-custom-spoken-forms-from-talon branch from 9286669 to dad00fb Compare October 12, 2023 17:41

pokey force-pushed the pokey/write-spokenformsjson-from-talon branch from 0c3eca4 to 91b22f2 Compare October 16, 2023 15:02

pokey force-pushed the pokey/get-custom-spoken-forms-from-talon branch from c4e7b75 to 6a6d06a Compare October 16, 2023 15:02

pokey force-pushed the pokey/write-spokenformsjson-from-talon branch from 91b22f2 to b45b136 Compare October 16, 2023 15:29

pokey force-pushed the pokey/get-custom-spoken-forms-from-talon branch from 88af8bf to 5aefc8b Compare October 16, 2023 15:29

pokey force-pushed the pokey/write-spokenformsjson-from-talon branch from b45b136 to a39fb93 Compare October 16, 2023 15:47

pokey force-pushed the pokey/get-custom-spoken-forms-from-talon branch 2 times, most recently from 88d7ec1 to 84d2f1d Compare October 16, 2023 16:17

pokey force-pushed the pokey/write-spokenformsjson-from-talon branch from 1522908 to aaeb7a8 Compare October 17, 2023 13:55

pokey force-pushed the pokey/get-custom-spoken-forms-from-talon branch 2 times, most recently from 60a927f to c07368a Compare October 17, 2023 14:11

pokey force-pushed the pokey/write-spokenformsjson-from-talon branch 2 times, most recently from 74240bc to 129b71e Compare October 18, 2023 15:06

pokey force-pushed the pokey/get-custom-spoken-forms-from-talon branch 2 times, most recently from 2e509b7 to 983ebe2 Compare October 18, 2023 15:08

pokey force-pushed the pokey/write-spokenformsjson-from-talon branch from 129b71e to 474772a Compare October 18, 2023 15:08

pokey force-pushed the pokey/get-custom-spoken-forms-from-talon branch from 983ebe2 to 516045d Compare October 18, 2023 15:17

pokey force-pushed the pokey/write-spokenformsjson-from-talon branch from 474772a to 0542218 Compare October 18, 2023 15:17

pokey mentioned this pull request Oct 18, 2023

Allow spoken forms generator to use custom #1947

Merged

3 tasks

pokey force-pushed the pokey/get-custom-spoken-forms-from-talon branch from 516045d to e71eb95 Compare October 18, 2023 15:57

pokey force-pushed the pokey/write-spokenformsjson-from-talon branch from 3b87860 to 3d8e394 Compare October 20, 2023 12:45

pokey force-pushed the pokey/get-custom-spoken-forms-from-talon branch from e71eb95 to 3abd5af Compare October 20, 2023 12:45

pokey changed the base branch from pokey/write-spokenformsjson-from-talon to base/pokey/get-custom-spoken-forms-from-talon October 20, 2023 12:50

pokey mentioned this pull request Oct 20, 2023

Write spokenForms.json from Talon #1939

Merged

2 tasks

pokey force-pushed the base/pokey/get-custom-spoken-forms-from-talon branch from 3d8e394 to 97cc750 Compare October 20, 2023 13:00

pokey force-pushed the pokey/get-custom-spoken-forms-from-talon branch from 3abd5af to 896bbe4 Compare October 20, 2023 13:00

pokey force-pushed the base/pokey/get-custom-spoken-forms-from-talon branch from 97cc750 to f3920b5 Compare October 20, 2023 13:07

pokey force-pushed the pokey/get-custom-spoken-forms-from-talon branch from 896bbe4 to c9f226b Compare October 20, 2023 13:07

AndreasArvidsson reviewed Oct 26, 2023

View reviewed changes

packages/cursorless-engine/src/generateSpokenForm/CustomSpokenFormGeneratorImpl.ts Outdated Show resolved Hide resolved

pokey commented Oct 26, 2023

View reviewed changes

packages/common/src/util/Disposer.ts Outdated Show resolved Hide resolved

pokey commented Oct 26, 2023

View reviewed changes

packages/common/src/util/Disposer.ts Outdated Show resolved Hide resolved

pokey commented Oct 26, 2023

View reviewed changes

packages/cursorless-engine/src/scopeProviders/SpokenFormEntry.ts Outdated Show resolved Hide resolved

auscompgeek reviewed Oct 26, 2023

View reviewed changes

pokey commented Oct 26, 2023

View reviewed changes

packages/cursorless-engine/src/nodeCommon/TalonSpokenFormsJsonReader.ts Outdated Show resolved Hide resolved

pokey commented Oct 26, 2023

View reviewed changes

packages/cursorless-engine/src/spokenForms/CustomSpokenForms.ts Outdated Show resolved Hide resolved

pokey commented Oct 26, 2023

View reviewed changes

packages/cursorless-engine/src/spokenForms/CustomSpokenForms.ts Outdated Show resolved Hide resolved

pokey commented Oct 26, 2023

View reviewed changes

packages/cursorless-engine/src/spokenForms/CustomSpokenForms.ts Outdated Show resolved Hide resolved

pokey added 9 commits October 26, 2023 15:11

Improved types

eb9e422

Log errors and disposer

fa94cc1

More PR feedback

9c93fab

improve error type safety

c1bd390

fix imports

0adcc2e

More PR feedback

285e614

More tweaks

4d20004

More cleanup#

36d027e

Throw error

3086cc4

pokey commented Oct 26, 2023

View reviewed changes

packages/cursorless-engine/src/nodeCommon/TalonSpokenFormsJsonReader.ts Outdated Show resolved Hide resolved

pokey added 3 commits October 26, 2023 16:46

More cleanup

a08bf21

More simplification

37e3481

Remove export

e2af29e

pokey mentioned this pull request Oct 27, 2023

Scope support tree view #1663

Closed

26 tasks

AndreasArvidsson reviewed Oct 28, 2023

View reviewed changes

packages/cursorless-vscode/src/ide/vscode/VscodeFileSystem.ts Outdated Show resolved Hide resolved

AndreasArvidsson approved these changes Oct 28, 2023

View reviewed changes

Pr cleanup

bb80326

pokey added this pull request to the merge queue Oct 30, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Get custom spoken forms from Talon#1940

Get custom spoken forms from Talon#1940
pokey merged 14 commits intomainfrom
pokey/get-custom-spoken-forms-from-talon

pokey commented Oct 12, 2023 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

auscompgeek Oct 26, 2023

Uh oh!

pokey Oct 26, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pokey commented Oct 26, 2023

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

pokey commented Oct 12, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

auscompgeek Oct 26, 2023

Choose a reason for hiding this comment

Uh oh!

pokey Oct 26, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pokey commented Oct 26, 2023

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

pokey commented Oct 12, 2023 •

edited

Loading