Skip to content

Commit 6462542

Browse files
[pre-commit.ci lite] apply automatic fixes
1 parent 0762be0 commit 6462542

File tree

13 files changed

+44
-53
lines changed

13 files changed

+44
-53
lines changed

cursorless-talon-dev/src/spoken_form_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import json
2-
from typing import Any, Optional
2+
from typing import Any
33

44
from talon import Context, Module, actions, scope, settings
55

@@ -115,7 +115,7 @@ def private_cursorless_use_community_snippets(enable: bool): # pyright: ignore
115115

116116
def private_cursorless_spoken_form_test(
117117
phrase: str, # pyright: ignore [reportGeneralTypeIssues]
118-
mockedGetValue_: Optional[str],
118+
mockedGetValue_: str | None,
119119
):
120120
"""Run Cursorless spoken form test"""
121121
global commands_run, mockedGetValue

cursorless-talon/src/actions/actions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import Callable, Union
1+
from typing import Callable
22

33
from talon import Module, actions
44

@@ -123,7 +123,7 @@ def cursorless_ide_command(command_id: str, target: CursorlessTarget): # pyrigh
123123

124124
def cursorless_insert(
125125
destination: CursorlessDestination, # pyright: ignore [reportGeneralTypeIssues]
126-
text: Union[str, list[str]],
126+
text: str | list[str],
127127
):
128128
"""Perform text insertion on Cursorless destination"""
129129
if isinstance(text, str):

cursorless-talon/src/actions/get_text.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from typing import Optional
2-
31
from talon import Module, actions
42

53
from ..targets.target_types import CursorlessTarget
@@ -35,8 +33,8 @@ def cursorless_get_text_list(
3533
def cursorless_get_text_action(
3634
target: CursorlessTarget,
3735
*,
38-
show_decorations: Optional[bool] = None,
39-
ensure_single_target: Optional[bool] = None,
36+
show_decorations: bool | None = None,
37+
ensure_single_target: bool | None = None,
4038
) -> list[str]:
4139
"""Get target texts"""
4240
options: dict[str, bool] = {}

cursorless-talon/src/actions/homophones.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from typing import Optional
2-
31
from talon import actions, app
42

53
from ..targets.target_types import (
@@ -23,7 +21,7 @@ def cursorless_homophones_action(target: CursorlessExplicitTarget):
2321

2422

2523
def get_next_homophone(word: str) -> str:
26-
homophones: Optional[list[str]] = actions.user.homophones_get(word)
24+
homophones: list[str] | None = actions.user.homophones_get(word)
2725
if not homophones:
2826
raise LookupError(f"Found no homophones for '{word}'")
2927
index = (homophones.index(word.lower()) + 1) % len(homophones)

cursorless-talon/src/cheatsheet/get_list.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import re
22
import typing
33
from collections.abc import Mapping, Sequence
4-
from typing import Optional, TypedDict
4+
from typing import TypedDict
55

66
from talon import registry
77

@@ -20,7 +20,7 @@ class ListItemDescriptor(TypedDict):
2020

2121

2222
def get_list(
23-
name: str, type: str, descriptions: Optional[Mapping[str, str]] = None
23+
name: str, type: str, descriptions: Mapping[str, str] | None = None
2424
) -> list[ListItemDescriptor]:
2525
if descriptions is None:
2626
descriptions = {}
@@ -31,7 +31,7 @@ def get_list(
3131

3232

3333
def get_lists(
34-
names: Sequence[str], type: str, descriptions: Optional[Mapping[str, str]] = None
34+
names: Sequence[str], type: str, descriptions: Mapping[str, str] | None = None
3535
) -> list[ListItemDescriptor]:
3636
return [item for name in names for item in get_list(name, type, descriptions)]
3737

cursorless-talon/src/csv_overrides.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from dataclasses import dataclass
66
from datetime import datetime
77
from pathlib import Path
8-
from typing import Callable, Iterable, Optional, TypedDict
8+
from typing import Callable, Iterable, TypedDict
99

1010
from talon import Context, Module, actions, app, fs, settings
1111

@@ -60,15 +60,15 @@ def csv_get_normalized_ctx():
6060
def init_csv_and_watch_changes(
6161
filename: str,
6262
default_values: ListToSpokenForms,
63-
handle_new_values: Optional[Callable[[list[SpokenFormEntry]], None]] = None,
63+
handle_new_values: Callable[[list[SpokenFormEntry]], None] | None = None,
6464
*,
65-
extra_ignored_values: Optional[list[str]] = None,
66-
extra_allowed_values: Optional[list[str]] = None,
65+
extra_ignored_values: list[str] | None = None,
66+
extra_allowed_values: list[str] | None = None,
6767
allow_unknown_values: bool = False,
68-
default_list_name: Optional[str] = None,
68+
default_list_name: str | None = None,
6969
headers: list[str] = [SPOKEN_FORM_HEADER, CURSORLESS_IDENTIFIER_HEADER],
7070
no_update_file: bool = False,
71-
pluralize_lists: Optional[list[str]] = None,
71+
pluralize_lists: list[str] | None = None,
7272
):
7373
"""
7474
Initialize a cursorless settings csv, creating it if necessary, and watch
@@ -229,9 +229,9 @@ def update_dicts(
229229
extra_ignored_values: list[str],
230230
extra_allowed_values: list[str],
231231
allow_unknown_values: bool,
232-
default_list_name: Optional[str],
232+
default_list_name: str | None,
233233
pluralize_lists: list[str],
234-
handle_new_values: Optional[Callable[[list[SpokenFormEntry]], None]],
234+
handle_new_values: Callable[[list[SpokenFormEntry]], None] | None,
235235
):
236236
# Create map with all default values
237237
results_map: dict[str, ResultsListEntry] = {}

cursorless-talon/src/private_api/private_api.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import Any, Optional, Union
1+
from typing import Any
22

33
from talon import Module, actions
44

@@ -26,14 +26,14 @@ class TargetBuilderActions:
2626

2727
def cursorless_private_build_primitive_target(
2828
modifiers: list[dict], # pyright: ignore [reportGeneralTypeIssues]
29-
mark: Optional[dict],
29+
mark: dict | None,
3030
) -> PrimitiveTarget:
3131
"""Cursorless private api low-level target builder: Create a primitive target"""
3232
return PrimitiveTarget(mark, modifiers)
3333

3434
def cursorless_private_build_list_target(
35-
elements: list[Union[PrimitiveTarget, RangeTarget]], # pyright: ignore [reportGeneralTypeIssues]
36-
) -> Union[PrimitiveTarget, RangeTarget, ListTarget]:
35+
elements: list[PrimitiveTarget | RangeTarget], # pyright: ignore [reportGeneralTypeIssues]
36+
) -> PrimitiveTarget | RangeTarget | ListTarget:
3737
"""Cursorless private api low-level target builder: Create a list target"""
3838
if len(elements) == 1:
3939
return elements[0]
@@ -52,7 +52,7 @@ def cursorless_private_target_nothing() -> PrimitiveTarget:
5252
class ActionActions:
5353
def cursorless_private_action_highlight(
5454
target: CursorlessTarget, # pyright: ignore [reportGeneralTypeIssues]
55-
highlightId: Optional[str] = None,
55+
highlightId: str | None = None,
5656
) -> None:
5757
"""Cursorless private api: Highlights a target"""
5858
payload = {

cursorless-talon/src/public_api.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import Any, Optional
1+
from typing import Any
22

33
from talon import Module, actions
44

@@ -28,9 +28,9 @@ def cursorless_create_destination(
2828
class CommandActions:
2929
def cursorless_custom_command(
3030
content: str, # pyright: ignore [reportGeneralTypeIssues]
31-
arg1: Optional[Any] = None,
32-
arg2: Optional[Any] = None,
33-
arg3: Optional[Any] = None,
31+
arg1: Any | None = None,
32+
arg2: Any | None = None,
33+
arg3: Any | None = None,
3434
):
3535
"""Cursorless: Run custom parsed command"""
3636
actions.user.private_cursorless_command_and_wait(

cursorless-talon/src/snippets.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from dataclasses import dataclass
2-
from typing import Any, Optional, Union
2+
from typing import Any
33

44
from talon import Module, actions
55

@@ -97,7 +97,7 @@ def insert_snippet(snippet_description: dict, destination: CursorlessDestination
9797
def insert_named_snippet(
9898
name: str,
9999
destination: CursorlessDestination,
100-
substitutions: Optional[dict] = None,
100+
substitutions: dict | None = None,
101101
):
102102
snippet: dict = {
103103
"type": "named",
@@ -111,7 +111,7 @@ def insert_named_snippet(
111111
def insert_custom_snippet(
112112
body: str,
113113
destination: CursorlessDestination,
114-
scope_types: Optional[list[dict]] = None,
114+
scope_types: list[dict] | None = None,
115115
):
116116
snippet: dict = {
117117
"type": "custom",
@@ -155,7 +155,7 @@ def cursorless_insert_snippet_by_name(name: str): # pyright: ignore [reportGene
155155
def cursorless_insert_snippet(
156156
body: str, # pyright: ignore [reportGeneralTypeIssues]
157157
destination: CursorlessDestination = ImplicitDestination(),
158-
scope_type: Optional[Union[str, list[str]]] = None,
158+
scope_type: str | list[str] | None = None,
159159
):
160160
"""Cursorless: Insert custom snippet <body>"""
161161
if isinstance(scope_type, str):
@@ -186,8 +186,8 @@ def cursorless_wrap_with_snippet_by_name(
186186
def cursorless_wrap_with_snippet(
187187
body: str, # pyright: ignore [reportGeneralTypeIssues]
188188
target: CursorlessTarget,
189-
variable_name: Optional[str] = None,
190-
scope: Optional[str] = None,
189+
variable_name: str | None = None,
190+
scope: str | None = None,
191191
):
192192
"""Cursorless: Wrap target with custom snippet <body>"""
193193
snippet_arg: dict[str, Any] = {

cursorless-talon/src/targets/destination.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from typing import Union
2-
31
from talon import Module
42

53
from .target_types import ListDestination, PrimitiveDestination
@@ -29,7 +27,7 @@ def cursorless_insertion_mode(m) -> str:
2927
"({user.cursorless_list_connective} <user.cursorless_insertion_mode> <user.cursorless_target>)*"
3028
)
3129
)
32-
def cursorless_destination(m) -> Union[ListDestination, PrimitiveDestination]:
30+
def cursorless_destination(m) -> ListDestination | PrimitiveDestination:
3331
destinations = [
3432
PrimitiveDestination(insertion_mode, target)
3533
for insertion_mode, target in zip(

0 commit comments

Comments
 (0)