Add new command to select matching tags

The 'Select matching tags' command creates multiple selections on both
tag names for synchronized editing, similar to 'editor.linkedEditing' in
VS Code. Self-closing tags are handled by simply selecting the tag name

Cf. https://code.visualstudio.com/Docs/languages/html#_auto-update-tags

Closes ticket 41117e59c3 [^1]
Completes a feature request [^2]

  --
  [^1] https://fossil.2of4.net/npp_htmltag/tktview/41117e59c3
  [^2] https://community.notepad-plus-plus.org/post/88110

Author: rdipardo

src/U_HTMLTagFinder.pas

@@ -13,7 +13,8 @@ interface
   uses
     NppSimpleObjects;
 
-  procedure FindMatchingTag(ASelect: boolean = False; AContentsOnly: Boolean = False);
+  type TSelectionOptions = set of (soNone, soTags, soContents);
+  procedure FindMatchingTag(SelectionOptions: TSelectionOptions = [soNone]);
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 implementation
@@ -141,7 +142,7 @@ function ExtractTagName(AView: TActiveDocument;
 end {ExtractTagName};
 
 { ------------------------------------------------------------------------------------------------ }
-procedure FindMatchingTag(ASelect: boolean = False; AContentsOnly: Boolean = False);
+procedure FindMatchingTag(SelectionOptions: TSelectionOptions);
 var
   npp: TApplication;
   doc: TActiveDocument;
@@ -150,9 +151,9 @@ procedure FindMatchingTag(ASelect: boolean = False; AContentsOnly: Boolean = Fal
   Tag, NextTag, MatchingTag, Target: TTextRange;
   TagName: string;
   TagOpens, TagCloses: boolean;
-
+  InitPos: Sci_Position;
   Direction: TDirectionEnum;
-  IsXML: boolean;
+  IsXML, ASelect, AContentsOnly, TagsOnly: boolean;
   DisposeOfTag: boolean;
   i: integer;
   Found: TTextRange;
@@ -184,14 +185,41 @@ procedure FindMatchingTag(ASelect: boolean = False; AContentsOnly: Boolean = Fal
     end;
   end;
   // ---------------------------------------------------------------------------------------------
-var
-  InitPos: Sci_Position;
+  procedure SelectTags(Tag, MatchingTag: TTextRange);
+  var
+    Doc: TActiveDocument;
+    TagAttrPos: Integer;
+  begin
+    Doc := Tag.Document;
+    // Trim attributes from tag selection
+    TagAttrPos := Pos(' ', Tag.Text);
+    if TagAttrPos > Pos('<', Tag.Text) then
+      Tag.EndPos := Tag.StartPos + TagAttrPos;
+    // Trim '<' or '</' and '>' from selection
+    if not Assigned(MatchingTag) then begin
+      // Narrow selection for a self-closing tag
+      Tag.StartPos := Tag.StartPos + Pos('<', Tag.Text);
+      if Pos('/>', Tag.Text) > 0 then
+        Tag.EndPos := Tag.EndPos - 1;
+    end else
+      Tag.StartPos := Tag.StartPos + (Pos('/', Tag.Text) shr 1) + 1;
+    Doc.SendMessage(SCI_SETSELECTION, Tag.StartPos, Tag.EndPos - 1);
+    if Assigned(MatchingTag) then begin
+      TagAttrPos := Pos(' ', MatchingTag.Text);
+      if TagAttrPos > Pos('<', MatchingTag.Text) then
+        MatchingTag.EndPos := MatchingTag.StartPos + TagAttrPos;
+      Doc.SendMessage(SCI_ADDSELECTION, MatchingTag.StartPos + (Pos('/', MatchingTag.Text) shr 1) + 1, MatchingTag.EndPos - 1);
+    end;
+  end;
+  // ---------------------------------------------------------------------------------------------
 begin
   npp := GetApplication();
   doc := npp.ActiveDocument;
 
   IsXML := (doc.Language = L_XML);
-
+  ASelect := not (soNone in SelectionOptions);
+  AContentsOnly := ASelect and ([soContents] = SelectionOptions);
+  TagsOnly := ASelect and (not (soContents in SelectionOptions));
   Tags := TStringList.Create;
   MatchingTag := nil;
   NextTag := nil;
@@ -298,8 +326,10 @@ procedure FindMatchingTag(ASelect: boolean = False; AContentsOnly: Boolean = Fal
       Tags.LineBreak := #9;
       if Assigned(MatchingTag) then begin
         if Tags.Count = 2 then begin
+          // Matching tag may be hidden by a fold
+          doc.SendMessage(SCI_FOLDLINE, doc.SendMessage(SCI_LINEFROMPOSITION, MatchingTag.StartPos), SC_FOLDACTION_EXPAND);
           Tag := TTextRange(Tags.Objects[0]);
-          if ASelect then begin
+          if ASelect and not TagsOnly then begin
             if Tag.StartPos < MatchingTag.StartPos then begin
               if AContentsOnly then begin
                 Target := doc.GetRange(Tag.EndPos, MatchingTag.StartPos);
@@ -336,12 +366,14 @@ procedure FindMatchingTag(ASelect: boolean = False; AContentsOnly: Boolean = Fal
             finally
               Target.Free;
             end;
+          end else if ASelect then begin
+            SelectTags(Tag, MatchingTag);
           end else begin
             MatchingTag.Select;
           end;
-        end else begin
-          if ASelect then begin
-            MatchingTag.Select;
+        end else begin  // Self-closing tag
+          if TagsOnly then begin
+            SelectTags(MatchingTag, nil);
           end else begin
             MatchingTag.Select;
           end;

src/U_Npp_HTMLTag.pas

@@ -44,6 +44,7 @@   TNppPluginHTMLTag = class(TNppPlugin)
     constructor Create;
     destructor Destroy; override;
     procedure commandFindMatchingTag;
+    procedure commandSelectMatchingTags;
     procedure commandSelectTagContents;
     procedure commandSelectTagContentsOnly;
     procedure commandEncodeEntities(const InclLineBreaks: Boolean = False);
@@ -68,6 +69,7 @@   TNppPluginHTMLTag = class(TNppPlugin)
   end;
 
 procedure _commandFindMatchingTag(); cdecl;
+procedure _commandSelectMatchingTags(); cdecl;
 procedure _commandSelectTagContents(); cdecl;
 procedure _commandSelectTagContentsOnly(); cdecl;
 procedure _commandEncodeEntities(); cdecl;
@@ -98,6 +100,11 @@ procedure _commandFindMatchingTag(); cdecl;
   npp.commandFindMatchingTag;
 end;
 { ------------------------------------------------------------------------------------------------ }
+procedure _commandSelectMatchingTags(); cdecl;
+begin
+  npp.commandSelectMatchingTags;
+end;
+{ ------------------------------------------------------------------------------------------------ }
 procedure _commandSelectTagContents(); cdecl;
 begin
   npp.commandSelectTagContents;
@@ -172,6 +179,9 @@ constructor TNppPluginHTMLTag.Create;
   sk := self.MakeShortcutKey(False, True, False, 'T'); // Alt-T
   self.AddFuncItem('&Find matching tag', _commandFindMatchingTag, sk);
 
+  sk := self.MakeShortcutKey(False, True, False, #113); // Alt-F2
+  self.AddFuncItem('Select &matching tags', _commandSelectMatchingTags, sk);
+
   sk := self.MakeShortcutKey(False, True, True, 'T'); // Alt-Shift-T
   self.AddFuncItem('&Select tag and contents', _commandSelectTagContents, sk);
 
@@ -309,12 +319,26 @@ procedure TNppPluginHTMLTag.commandFindMatchingTag;
     Exit;
 {$ENDIF}
   try
-    U_HTMLTagFinder.FindMatchingTag(False, False);
+    U_HTMLTagFinder.FindMatchingTag;
   except
     HandleException(ExceptObject, ExceptAddr);
   end;
 end {TNppPluginHTMLTag.commandFindMatchingTag};
 
+{ ------------------------------------------------------------------------------------------------ }
+procedure TNppPluginHTMLTag.commandSelectMatchingTags;
+begin
+{$IFDEF CPUX64}
+  if not SupportsBigFiles then
+    Exit;
+{$ENDIF}
+  try
+    U_HTMLTagFinder.FindMatchingTag([soTags]);
+  except
+    HandleException(ExceptObject, ExceptAddr);
+  end;
+end {TNppPluginHTMLTag.commandSelectMatchingTags};
+
 { ------------------------------------------------------------------------------------------------ }
 procedure TNppPluginHTMLTag.commandSelectTagContents;
 begin
@@ -323,7 +347,7 @@ procedure TNppPluginHTMLTag.commandSelectTagContents;
     Exit;
 {$ENDIF}
   try
-    U_HTMLTagFinder.FindMatchingTag(True, False);
+    U_HTMLTagFinder.FindMatchingTag([soContents, soTags]);
   except
     HandleException(ExceptObject, ExceptAddr);
   end;
@@ -337,7 +361,7 @@ procedure TNppPluginHTMLTag.commandSelectTagContentsOnly;
     Exit;
 {$ENDIF}
   try
-    U_HTMLTagFinder.FindMatchingTag(True, True);
+    U_HTMLTagFinder.FindMatchingTag([soContents]);
   except
     HandleException(ExceptObject, ExceptAddr);
   end;