Merge remote-tracking branch 'origin/html-attr'

HenryTSZ · May 23, 2024 · eed24d5 · eed24d5
2 parents ff2c33b + 85e5e65
commit eed24d5
Showing 1 changed file with 46 additions and 0 deletions.
diff --git a/src/textobject/textobject.ts b/src/textobject/textobject.ts
@@ -24,6 +24,8 @@ import { WordType } from './word';
 export abstract class TextObject extends BaseMovement {
   override modes = [Mode.Normal, Mode.Visual, Mode.VisualBlock];
 
+  public static readonly attrRegExp = /[\w.:@-]+=(["']).*?\1|[\w.:@-]+=\{.*?\}/;
+
   public override async execActionForOperator(
     position: Position,
     vimState: VimState,
@@ -593,6 +595,50 @@ export class SelectEntireIgnoringLeadingTrailing extends TextObject {
   }
 }
 
+@RegisterAction
+export class SelectAttrs extends TextObject {
+  keys = ['a', 'r'];
+
+  public async execAction(position: Position, vimState: VimState): Promise<IMovement> {
+    let start = position;
+    let stop = position;
+
+    const range = vimState.document.getWordRangeAtPosition(position, TextObject.attrRegExp);
+
+    if (range) {
+      start = range.start;
+      stop = range.end;
+    }
+
+    return {
+      start,
+      stop,
+    };
+  }
+}
+
+@RegisterAction
+export class SelectInnerAttrs extends TextObject {
+  keys = ['i', 'r'];
+
+  public async execAction(position: Position, vimState: VimState): Promise<IMovement> {
+    let start = position;
+    let stop = position;
+
+    const range = vimState.document.getWordRangeAtPosition(position, TextObject.attrRegExp);
+
+    if (range) {
+      start = range.start;
+      stop = range.end.getLeft();
+    }
+
+    return {
+      start,
+      stop,
+    };
+  }
+}
+
 abstract class IndentObjectMatch extends TextObject {
   override setsDesiredColumnToEOL = true;