-
-
Notifications
You must be signed in to change notification settings - Fork 85
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Generate snippets for community format (#2744)
If the user has set the `user.cursorless_use_community_snippets` tag we create a snippet in the community snippet format instead of the Cursorless one. The legacy Cursorless snippets will be removed in a final pull request. ## Checklist - [x] I have added [tests](https://www.cursorless.org/docs/contributing/test-case-recorder/) - [/] 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) - [/] I have not broken the cheatsheet --------- Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Co-authored-by: Phil Cohen <[email protected]>
- Loading branch information
1 parent
3d1447c
commit 9611d3d
Showing
17 changed files
with
778 additions
and
263 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
import glob | ||
from pathlib import Path | ||
|
||
from talon import Context, Module, actions, settings | ||
|
||
from ..targets.target_types import CursorlessExplicitTarget | ||
|
||
mod = Module() | ||
|
||
ctx = Context() | ||
ctx.matches = r""" | ||
tag: user.cursorless_use_community_snippets | ||
""" | ||
|
||
|
||
@mod.action_class | ||
class Actions: | ||
def private_cursorless_generate_snippet_action(target: CursorlessExplicitTarget): # pyright: ignore [reportGeneralTypeIssues] | ||
"""Generate a snippet from the given target""" | ||
actions.user.private_cursorless_command_no_wait( | ||
{ | ||
"name": "generateSnippet", | ||
"target": target, | ||
} | ||
) | ||
|
||
|
||
@ctx.action_class("user") | ||
class UserActions: | ||
def private_cursorless_generate_snippet_action(target: CursorlessExplicitTarget): # pyright: ignore [reportGeneralTypeIssues] | ||
actions.user.private_cursorless_command_no_wait( | ||
{ | ||
"name": "generateSnippet", | ||
"target": target, | ||
"directory": str(get_directory_path()), | ||
} | ||
) | ||
|
||
|
||
def get_directory_path() -> Path: | ||
settings_dir = get_setting_dir() | ||
if settings_dir is not None: | ||
return settings_dir | ||
return get_community_snippets_dir() | ||
|
||
|
||
def get_setting_dir() -> Path | None: | ||
try: | ||
setting_dir = settings.get("user.snippets_dir") | ||
if not setting_dir: | ||
return None | ||
|
||
dir = Path(str(setting_dir)) | ||
|
||
if not dir.is_absolute(): | ||
user_dir = Path(actions.path.talon_user()) | ||
dir = user_dir / dir | ||
|
||
return dir.resolve() | ||
except Exception: | ||
return None | ||
|
||
|
||
def get_community_snippets_dir() -> Path: | ||
files = glob.iglob( | ||
f"{actions.path.talon_user()}/**/snippets/snippets/*.snippet", | ||
recursive=True, | ||
) | ||
for file in files: | ||
return Path(file).parent | ||
raise ValueError("Could not find community snippets directory") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
languageId: typescript | ||
command: | ||
version: 7 | ||
spokenForm: snippet make funk | ||
action: | ||
name: generateSnippet | ||
directory: "" | ||
snippetName: snippetTest1 | ||
target: | ||
type: primitive | ||
modifiers: | ||
- type: containingScope | ||
scopeType: {type: namedFunction} | ||
usePrePhraseSnapshot: true | ||
spokenFormError: generateSnippet.snippetName | ||
initialState: | ||
documentContents: |2- | ||
function helloWorld() { | ||
const whatever = "hello"; | ||
if (whatever == null) { | ||
console.log("hello") | ||
} | ||
} | ||
selections: | ||
- anchor: {line: 0, character: 13} | ||
active: {line: 0, character: 23} | ||
- anchor: {line: 3, character: 8} | ||
active: {line: 5, character: 9} | ||
marks: {} | ||
finalState: | ||
documentContents: | | ||
name: snippetTest1 | ||
language: typescript | ||
phrase: | ||
$1.wrapperPhrase: | ||
$0.wrapperPhrase: | ||
- | ||
function $1() { | ||
const whatever = "hello"; | ||
$0 | ||
} | ||
--- | ||
selections: | ||
- anchor: {line: 2, character: 8} | ||
active: {line: 2, character: 8} | ||
thatMark: | ||
- type: UntypedTarget | ||
contentRange: | ||
start: {line: 0, character: 4} | ||
end: {line: 6, character: 5} | ||
isReversed: false | ||
hasExplicitRange: true |
46 changes: 46 additions & 0 deletions
46
data/fixtures/recorded/actions/snippets/snipMakeState2.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
languageId: typescript | ||
command: | ||
version: 7 | ||
spokenForm: snippet make state | ||
action: | ||
name: generateSnippet | ||
directory: "" | ||
snippetName: snippetTest1 | ||
target: | ||
type: primitive | ||
modifiers: | ||
- type: containingScope | ||
scopeType: {type: statement} | ||
usePrePhraseSnapshot: true | ||
spokenFormError: generateSnippet.snippetName | ||
initialState: | ||
documentContents: |- | ||
if () { | ||
console.log("hello") | ||
} | ||
selections: | ||
- anchor: {line: 0, character: 4} | ||
active: {line: 0, character: 4} | ||
marks: {} | ||
finalState: | ||
documentContents: | | ||
name: snippetTest1 | ||
language: typescript | ||
phrase: | ||
$0.wrapperPhrase: | ||
- | ||
if ($0) { | ||
console.log("hello") | ||
} | ||
--- | ||
selections: | ||
- anchor: {line: 2, character: 8} | ||
active: {line: 2, character: 8} | ||
thatMark: | ||
- type: UntypedTarget | ||
contentRange: | ||
start: {line: 0, character: 0} | ||
end: {line: 2, character: 1} | ||
isReversed: false | ||
hasExplicitRange: true |
41 changes: 41 additions & 0 deletions
41
data/fixtures/recorded/actions/snippets/testSnippetMakeLine2.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
languageId: plaintext | ||
command: | ||
version: 7 | ||
spokenForm: test snippet make line | ||
action: | ||
name: generateSnippet | ||
directory: "" | ||
snippetName: testSnippet | ||
target: | ||
type: primitive | ||
modifiers: | ||
- type: containingScope | ||
scopeType: {type: line} | ||
usePrePhraseSnapshot: true | ||
spokenFormError: generateSnippet.snippetName | ||
initialState: | ||
documentContents: \textbf{$foo} | ||
selections: | ||
- anchor: {line: 0, character: 9} | ||
active: {line: 0, character: 12} | ||
marks: {} | ||
finalState: | ||
documentContents: | | ||
name: testSnippet | ||
language: plaintext | ||
phrase: | ||
$0.wrapperPhrase: | ||
- | ||
\textbf{\$$0} | ||
--- | ||
selections: | ||
- anchor: {line: 2, character: 8} | ||
active: {line: 2, character: 8} | ||
thatMark: | ||
- type: UntypedTarget | ||
contentRange: | ||
start: {line: 0, character: 0} | ||
end: {line: 0, character: 13} | ||
isReversed: false | ||
hasExplicitRange: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.