Merge branch 'master' into master

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 
-## Unreleased
+## [v1.28.1](https://github.com/vscodevim/vim/tree/v1.28.1) (2024-09-07)
+
+### Fixed
+
+- Fixed `h` with unicode surrogate pairs ([@semicube](https://github.com/semicube)).
+
+## [v1.28.0](https://github.com/vscodevim/vim/tree/v1.28.0) (2024-08-25)
 
 ### Added
 

package.json

@@ -3,7 +3,7 @@
   "displayName": "Vim",
   "description": "Vim emulation for Visual Studio Code",
   "icon": "images/icon.png",
-  "version": "1.27.3",
+  "version": "1.28.1",
   "publisher": "vscodevim",
   "galleryBanner": {
     "color": "#e3f4ff",
@@ -1201,12 +1201,12 @@
     "util": "0.12.5"
   },
   "devDependencies": {
-    "@types/diff": "5.2.1",
+    "@types/diff": "5.2.2",
     "@types/diff-match-patch": "1.0.36",
     "@types/glob": "8.1.0",
     "@types/lodash": "4.17.7",
     "@types/mocha": "10.0.7",
-    "@types/node": "20.16.1",
+    "@types/node": "20.16.5",
     "@types/parsimmon": "1.10.9",
     "@types/sinon": "17.0.3",
     "@types/vscode": "1.74.0",

src/actions/motion.ts

@@ -689,11 +689,20 @@ class MoveLeft extends BaseMovement {
   public override async execAction(position: Position, vimState: VimState): Promise<Position> {
     const getLeftWhile = (p: Position): Position => {
       const line = vimState.document.lineAt(p.line).text;
-      const newPosition = p.getLeft();
-      if (newPosition.character === 0) {
-        return newPosition;
+
+      if (p.character === 0) {
+        return p;
+      }
+      if (
+        isLowSurrogate(line.charCodeAt(p.character)) &&
+        isHighSurrogate(line.charCodeAt(p.character - 1))
+      ) {
+        p = p.getLeft();
       }
+
+      const newPosition = p.getLeft();
       if (
+        newPosition.character > 0 &&
         isLowSurrogate(line.charCodeAt(newPosition.character)) &&
         isHighSurrogate(line.charCodeAt(newPosition.character - 1))
       ) {

src/statusBar.ts

@@ -113,8 +113,7 @@ class StatusBarImpl implements vscode.Disposable {
     }
 
     if (vimState.macro) {
-      const macroText = 'Recording @' + vimState.macro.registerName;
-      text.push(macroText);
+      text.push('recording @' + vimState.macro.registerKey);
     }
 
     StatusBar.setText(vimState, text.join(' '));

test/operator/surrogate.test.ts

@@ -46,4 +46,11 @@ suite('surrogate-pair', () => {
     keysPressed: 'i🐕🐕<ESC>',
     end: ['🐕🐕|'],
   });
+
+  newTest({
+    title: 'move left over cute dog',
+    start: ['|𩸽🐕', 'text'],
+    keysPressed: 'jlllkh',
+    end: ['|𩸽🐕', 'text'],
+  });
 });