Cursorless 0.5.0; other stuff

pokey · pokey · commit a07c9c71355f · 2021-05-03T17:17:20.000+01:00
diff --git a/apps/vscode/cursorless/cursorless.talon b/apps/vscode/cursorless/cursorless.talon
@@ -11,7 +11,7 @@ pour <user.cursorless_arg>:
     user.cursorless_single_target_command("setSelection", cursorless_arg)
     user.new_line_below()
 
-funk wrap <user.cursorless_arg> with <user.code_functions>:
+funk <user.code_functions> wrap <user.cursorless_arg>:
     user.cursorless_single_target_command("wrap", cursorless_arg, "{code_functions}(", ")")
 
 square wrap <user.cursorless_arg>:
@@ -32,4 +32,7 @@ quad wrap <user.cursorless_arg>:
 twin wrap <user.cursorless_arg>:
     user.cursorless_single_target_command("wrap", cursorless_arg, "'", "'")
 
+puff <user.cursorless_arg>:
+    user.cursorless_single_target_command("wrap", cursorless_arg, "\n", "\n")
+
 action(user.dental_click): user.vscode("cursorless.toggleDecorations")
diff --git a/apps/vscode/cursorless/target.py b/apps/vscode/cursorless/target.py
@@ -86,13 +86,17 @@ def make_simple_transformation(type: str):
     "arg": "argumentOrParameter",
     "arrow": "arrowFunction",
     "class": "class",
+    "elm": "listElement",
     "funk": "namedFunction",
     "if": "ifStatement",
+    "invoke": "functionCall",
+    "key": "pairKey",
     "lambda": "arrowFunction",
+    "list": "list",
     "map": "dictionary",
     "pair": "pair",
-    "value": "pairValue",
-    "key": "pairKey",
+    "state": "statement",
+    "value": "value",
 }
 
 containing_scope_types = {
@@ -140,6 +144,7 @@ def json_repr(self):
 }
 
 cursor_mark = {"mark": {"type": "cursor"}}
+that_mark = {"mark": {"type": "that"}}
 
 marks = {
     "here": cursor_mark,
@@ -152,12 +157,17 @@ def json_repr(self):
         f"these {selection_type.plural}": {**selection_type.json_repr, **cursor_mark}
         for selection_type in SELECTION_TYPES
     },
-    "change": {"mark": {"type": "lastEditRange"}},
+    "there": that_mark,
+    "that": that_mark,
     "last cursor": {"mark": {"type": "lastCursorPosition"}},
     **{
         f"this {containing_scope_type}": {**cursor_mark, **value}
         for containing_scope_type, value in containing_scope_types.items()
     },
+    **{
+        f"that {containing_scope_type}": {**that_mark, **value}
+        for containing_scope_type, value in containing_scope_types.items()
+    },
 }
 
 mod.list("cursorless_mark", desc="Types of marks")
diff --git a/lang/typescript/typescript.py b/lang/typescript/typescript.py
@@ -8,9 +8,10 @@
 """
 # tbd
 ctx.lists["user.code_functions"] = {
-#     "integer": "int.TryParse",
+    #     "integer": "int.TryParse",
     "print": "console.log",
-#     "string": ".ToString",
+    "flatten": "flatten",
+    #     "string": ".ToString",
 }
 
 
@@ -80,4 +81,3 @@ def code_public_function(text: str):
     #     )
 
     #     actions.user.code_insert_function(result, None)
-
diff --git a/lang/typescript/typescript.talon b/lang/typescript/typescript.talon
@@ -14,9 +14,9 @@ settings():
     user.code_protected_variable_formatter = "PRIVATE_CAMEL_CASE"
     user.code_public_variable_formatter = "PRIVATE_CAMEL_CASE"
 
-action(user.code_is_not_null): " !== null"
+action(user.code_is_not_null): " != null"
 
-action(user.code_is_null): " === null"
+action(user.code_is_null): " == null"
 
 action(user.code_type_dictionary):
   insert("{}")
