Fix change surrounding tag, fixes #8177 (#9648)

Author: robertmoura

src/actions/plugins/surround.ts

@@ -6,6 +6,7 @@ import {
   SelectWord,
   TextObject,
 } from '../../textobject/textobject';
+import { WordType } from '../../textobject/word';
 import { isIMovement } from '../baseMotion';
 import {
   MoveAroundBacktick,
@@ -585,11 +586,11 @@ class SurroundHelper {
       // start -> <foo>bar</foo> <-- stop
       const openTagNameStart = rangeStart.getRight();
       const openTagNameEnd = openTagNameStart
-        .nextWordEnd(vimState.document, { inclusive: true })
+        .nextWordEnd(vimState.document, { wordType: WordType.TagName, inclusive: true })
         .getRight();
       const closeTagNameStart = rangeEnd
         .getLeft(2)
-        .prevWordStart(vimState.document, { inclusive: true });
+        .prevWordStart(vimState.document, { wordType: WordType.TagName, inclusive: true });
       const closeTagNameEnd = rangeEnd.getLeft();
       vimState.cursorStartPosition = position; // some textobj (MoveInsideCharacter) expect this
       vimState.cursorStopPosition = position;

src/textobject/word.ts

@@ -8,10 +8,12 @@ export enum WordType {
   Big,
   CamelCase,
   FileName,
+  TagName,
 }
 
 const nonBigWordCharRegex = makeWordRegex('');
 const nonFileNameRegex = makeWordRegex('"\'`;<>{}[]()');
+const nonTagNameRegex = makeWordRegex('</>');
 
 function regexForWordType(wordType: WordType): RegExp {
   switch (wordType) {
@@ -23,6 +25,8 @@ function regexForWordType(wordType: WordType): RegExp {
       return makeCamelCaseWordRegex(configuration.iskeyword);
     case WordType.FileName:
       return nonFileNameRegex;
+    case WordType.TagName:
+      return nonTagNameRegex;
   }
 }
 

test/plugins/surround.test.ts

@@ -456,6 +456,18 @@ suite('surround plugin', () => {
     },
   });
 
+  newTest({
+    title: 'change surround with tags with kebab case names',
+    start: ['<custom-tag>|</custom-tag>'],
+    keysPressed: 'cstt',
+    end: ['<h1>|</h1>'],
+    stub: {
+      stubClass: CommandSurroundAddSurroundingTag,
+      methodName: 'readTag',
+      returnValue: 'h1',
+    },
+  });
+
   newTest({
     title: 'change surround with tags that contain an attribute and remove them',
     start: ['<h2 test class="foo">b|ar</h2>'],