Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 82 additions & 42 deletions cursorless-talon/src/spoken_forms.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
"NOTE FOR USERS": "Please don't edit this json file; see https://www.cursorless.org/docs/user/customization",
"actions.csv": {
"simple_action": {
"append": "addSelection",
"append post": "addSelectionAfter",
"append pre": "addSelectionBefore",
"append": "addSelection",
"bottom": "scrollToBottom",
"break point": "toggleLineBreakpoint",
"break": "breakLine",
"break point": "toggleLineBreakpoint",
"carve": "cutToClipboard",
"center": "scrollToCenter",
"change": "clearAndSetSelection",
"chuck": "remove",
"clone up": "insertCopyBefore",
"clone": "insertCopyAfter",
"clone up": "insertCopyBefore",
"comment": "toggleLineComment",
"copy": "copyToClipboard",
"crown": "scrollToTop",
Expand All @@ -26,12 +26,12 @@
"flash": "flashTargets",
"float": "insertEmptyLineAfter",
"fold": "foldRegion",
"follow split": "followLinkAside",
"follow": "followLink",
"follow split": "followLinkAside",
"git accept": "gitAccept",
"git revert": "gitRevert",
"git stage": "gitStage",
"git unstage": "gitUnstage",
"git revert": "gitRevert",
"give": "deselect",
"highlight": "highlight",
"hover": "showHover",
Expand All @@ -47,8 +47,8 @@
"reference": "showReferences",
"rename": "rename",
"reverse": "reverseTargets",
"scout all": "findInWorkspace",
"scout": "findInDocument",
"scout all": "findInWorkspace",
"shuffle": "randomizeTargets",
"snip make": "generateSnippet",
"sort": "sortTargets",
Expand All @@ -59,16 +59,29 @@
"callback_action": {
"phones": "nextHomophone"
},
"paste_action": { "paste": "pasteFromClipboard" },
"paste_action": {
"paste": "pasteFromClipboard"
},
"bring_move_action": {
"bring": "replaceWithTarget",
"move": "moveToTarget"
},
"swap_action": { "swap": "swapTargets" },
"wrap_action": { "wrap": "wrapWithPairedDelimiter", "repack": "rewrap" },
"insert_snippet_action": { "snip": "insertSnippet" },
"reformat_action": { "format": "applyFormatter" },
"call_action": { "call": "callAsFunction" }
"swap_action": {
"swap": "swapTargets"
},
"wrap_action": {
"wrap": "wrapWithPairedDelimiter",
"repack": "rewrap"
},
"insert_snippet_action": {
"snip": "insertSnippet"
},
"reformat_action": {
"format": "applyFormatter"
},
"call_action": {
"call": "callAsFunction"
}
},
"target_connectives.csv": {
"range_connective": {
Expand All @@ -77,9 +90,15 @@
"-": "rangeExcludingStart",
"until": "rangeExcludingEnd"
},
"list_connective": { "and": "listConnective" },
"swap_connective": { "with": "swapConnective" },
"insertion_mode_to": { "to": "sourceDestinationConnective" }
"list_connective": {
"and": "listConnective"
},
"swap_connective": {
"with": "swapConnective"
},
"insertion_mode_to": {
"to": "sourceDestinationConnective"
}
},
"modifiers.csv": {
"simple_modifier": {
Expand All @@ -92,8 +111,9 @@
"its": "inferPreviousMark",
"visible": "visible"
},
"every_scope_modifier": { "every": "every" },
"ancestor_scope_modifier": { "grand": "ancestor" },
"every_scope_modifier": {
"every": "every"
},
"interior_modifier": {
"inside": "interiorOnly"
},
Expand All @@ -104,9 +124,19 @@
"range_type": {
"slice": "verticalRange"
},
"first_modifier": { "first": "first" },
"last_modifier": { "last": "last" },
"previous_next_modifier": { "previous": "previous", "next": "next" },
"ancestor_scope_modifier": {
"grand": "ancestor"
},
"first_modifier": {
"first": "first"
},
"last_modifier": {
"last": "last"
},
"previous_next_modifier": {
"previous": "previous",
"next": "next"
},
"forward_backward_modifier": {
"forward": "forward",
"backward": "backward"
Expand All @@ -126,23 +156,28 @@
"scope_type": {
"arg": "argumentOrParameter",
"arg list": "argumentList",
"lambda": "anonymousFunction",
"attribute": "attribute",
"call": "functionCall",
"callee": "functionCallee",
"class name": "className",
"branch": "branch",
"class": "class",
"class name": "className",
"item": "collectionItem",
"key": "collectionKey",
"comment": "comment",
"call": "functionCall",
"callee": "functionCallee",
"funk name": "functionName",
"funk": "namedFunction",
"if state": "ifStatement",
"instance": "instance",
"item": "collectionItem",
"key": "collectionKey",
"lambda": "anonymousFunction",
"list": "list",
"map": "map",
"name": "name",
"funk": "namedFunction",
"regex": "regularExpression",
"state": "statement",
"type": "type",
"value": "value",
"condition": "condition",
"section": "section",
"-one section": "sectionLevelOne",
"-two section": "sectionLevelTwo",
Expand All @@ -151,24 +186,18 @@
"-five section": "sectionLevelFive",
"-six section": "sectionLevelSix",
"selector": "selector",
"state": "statement",
"branch": "branch",
"type": "type",
"value": "value",
"condition": "condition",
"unit": "unit",
"element": "xmlElement",
"tags": "xmlBothTags",
"start tag": "xmlStartTag",
"element": "xmlElement",
"end tag": "xmlEndTag",
"start tag": "xmlStartTag",
"part": "part",
"chapter": "chapter",
"subsection": "subSection",
"subsubsection": "subSubSection",
"paragraph": "namedParagraph",
"subparagraph": "subParagraph",
"environment": "environment",
"command": "command",
"char": "character",
"sub": "word",
"token": "token",
Expand All @@ -177,12 +206,13 @@
"full line": "fullLine",
"sentence": "sentence",
"block": "paragraph",
"short block": "boundedParagraph",
"file": "document",
"paint": "nonWhitespaceSequence",
"short paint": "boundedNonWhitespaceSequence",
"short block": "boundedParagraph",
"link": "url",
"cell": "notebookCell"
"cell": "notebookCell",
"command": "command"
},
"surrounding_pair_scope_type": {
"string": "string"
Expand All @@ -192,8 +222,12 @@
}
},
"paired_delimiters.csv": {
"selectable_only_paired_delimiter": { "pair": "any" },
"wrapper_only_paired_delimiter": { "void": "whitespace" },
"selectable_only_paired_delimiter": {
"pair": "any"
},
"wrapper_only_paired_delimiter": {
"void": "whitespace"
},
"wrapper_selectable_paired_delimiter": {
"curly": "curlyBrackets",
"diamond": "angleBrackets",
Expand All @@ -215,16 +249,22 @@
"source": "previousSource",
"nothing": "nothing"
},
"unknown_symbol": { "special": "unknownSymbol" },
"unknown_symbol": {
"special": "unknownSymbol"
},
"line_direction": {
"row": "lineNumberModulo100",
"up": "lineNumberRelativeUp",
"down": "lineNumberRelativeDown"
}
},
"scope_visualizer.csv": {
"show_scope_visualizer": { "visualize": "showScopeVisualizer" },
"hide_scope_visualizer": { "visualize nothing": "hideScopeVisualizer" },
"show_scope_visualizer": {
"visualize": "showScopeVisualizer"
},
"hide_scope_visualizer": {
"visualize nothing": "hideScopeVisualizer"
},
"visualization_type": {
"removal": "removal",
"iteration": "iteration"
Expand Down
2 changes: 2 additions & 0 deletions packages/tool-meta-updater/src/metaUpdater.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { updatePairedDelimitersMd } from "./updatePairedDelimitersMd";
import { updateReferenceMdx } from "./updateReferenceMdx";
import { updateReferenceReadmeMd } from "./updateReferenceReadmeMd";
import { updateScopeSupportFacetInfos } from "./updateScopeSupportFacetInfos";
import { updateSpokenForms } from "./updateSpokenForms";
import { updateTSConfig } from "./updateTSConfig";
import { updateTSConfigBase } from "./updateTSConfigBase";
import { cleanId } from "./util/cleanId";
Expand Down Expand Up @@ -55,6 +56,7 @@ export const updater = async (workspaceDir: string) => {
"tsconfig.base.json": updateTSConfigBase.bind(null, context),
"resources/fixtures/scope-support-facet-infos.md":
updateScopeSupportFacetInfos,
"cursorless-talon/src/spoken_forms.json": updateSpokenForms,
...Object.fromEntries(
languageIds.map((languageId) => [
`${userDir}/languages/${languageId}.mdx`,
Expand Down
Loading
Loading