Merge branch 'main' into pr/saidelike/2256

saidelike · Jul 18, 2024 · 49cb9f2 · 49cb9f2
2 parents 06bfbb7 + bb0d9d6
commit 49cb9f2
Show file tree

Hide file tree

Showing 8 changed files with 1,025 additions and 616 deletions.
diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "prettier": "3.2.5",
     "prettier-plugin-tailwindcss": "0.5.12",
     "syncpack": "12.3.0",
-    "typescript": "^5.4.3"
+    "typescript": "^5.5.3"
   },
   "pnpm": {
     "patchedDependencies": {

diff --git a/packages/cheatsheet-local/package.json b/packages/cheatsheet-local/package.json
@@ -47,7 +47,7 @@
     "tailwindcss": "3.4.1",
     "ts-loader": "9.5.1",
     "ts-node": "10.9.2",
-    "typescript": "^5.4.3",
+    "typescript": "^5.5.3",
     "webpack": "5.91.0",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "5.0.4"

diff --git a/packages/cheatsheet/package.json b/packages/cheatsheet/package.json
@@ -44,7 +44,7 @@
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
     "ts-jest": "29.1.2",
-    "typescript": "^5.4.3"
+    "typescript": "^5.5.3"
   },
   "type": "module"
 }
diff --git a/packages/cursorless-org-docs/package.json b/packages/cursorless-org-docs/package.json
@@ -50,7 +50,7 @@
     "@docusaurus/types": "3.1.1",
     "@tsconfig/docusaurus": "2.0.2",
     "@types/mdast": "4.0.3",
-    "typescript": "^5.4.3",
+    "typescript": "^5.5.3",
     "unified": "11.0.4"
   },
   "license": "MIT",

diff --git a/packages/cursorless-org/package.json b/packages/cursorless-org/package.json
@@ -35,7 +35,7 @@
     "http-server": "14.1.1",
     "postcss": "8.4.38",
     "tailwindcss": "3.4.1",
-    "typescript": "^5.4.3"
+    "typescript": "^5.5.3"
   },
   "license": "MIT",
   "main": "./out/index.js",

diff --git a/packages/cursorless-vscode-e2e/src/suite/keyboard/basic.vscode.test.ts b/packages/cursorless-vscode-e2e/src/suite/keyboard/basic.vscode.test.ts
@@ -83,11 +83,11 @@ const testCases: TestCase[] = [
     finalContent: "(a)",
   },
   {
-    name: "preserve keyboard target",
+    name: "set keyboard target to cursor",
     initialContent: "a\n",
     // round wrap air; round wrap <keyboard target>
     keySequence: ["da", "aw", "wp", "aw", "wp"],
-    finalContent: "((a))\n",
+    finalContent: "(a)\n()",
   },
   {
     name: "slice range",

diff --git a/packages/cursorless-vscode/src/keyboard/KeyboardCommandsTargeted.ts b/packages/cursorless-vscode/src/keyboard/KeyboardCommandsTargeted.ts
@@ -261,12 +261,7 @@ export default class KeyboardCommandsTargeted {
     } else {
       // If we're not exiting cursorless mode, preserve the keyboard mark
       // FIXME: Better to just not clobber the keyboard mark on each action?
-      await setKeyboardTarget({
-        type: "primitive",
-        mark: {
-          type: "that",
-        },
-      });
+      await this.targetSelection();
     }
 
     return returnValue;