[angular] WEB-70584 Extend selection in Angular control flow

(cherry picked from commit 371702a6898517a47a81e70beedea8e72bf970f6)

IJ-CR-174954

GitOrigin-RevId: 8bb2f8e37929e822c51c67e3eb426bc6411388ce

xml/impl/src/com/intellij/codeInsight/editorActions/HtmlSelectioner.java

@@ -1,16 +1,13 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 
 package com.intellij.codeInsight.editorActions;
 
 import com.intellij.application.options.editor.WebEditorOptions;
 import com.intellij.codeInsight.editorActions.wordSelection.AbstractWordSelectioner;
-import com.intellij.ide.highlighter.HighlighterFactory;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.Language;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.highlighter.EditorHighlighter;
 import com.intellij.openapi.util.TextRange;
-import com.intellij.openapi.util.UnfairTextRange;
 import com.intellij.psi.FileViewProvider;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
@@ -26,7 +23,8 @@ import java.util.List;
 
 public class HtmlSelectioner extends AbstractWordSelectioner {
 
-  private static final SelectWordUtil.CharCondition JAVA_IDENTIFIER_AND_HYPHEN_CONDITION = ch -> Character.isJavaIdentifierPart(ch) || ch == '-';
+  private static final SelectWordUtil.CharCondition JAVA_IDENTIFIER_AND_HYPHEN_CONDITION =
+    ch -> Character.isJavaIdentifierPart(ch) || ch == '-';
 
   @Override
   public boolean canSelect(@NotNull PsiElement e) {
@@ -34,20 +32,24 @@ public class HtmlSelectioner extends AbstractWordSelectioner {
   }
 
   static boolean canSelectElement(final PsiElement e) {
-    if (e instanceof XmlToken) {
-      return HtmlUtil.hasHtml(e.getContainingFile()) || HtmlUtil.supportsXmlTypedHandlers(e.getContainingFile());
-    }
-    return false;
+    return (e instanceof XmlToken || e instanceof XmlTag)
+           && (HtmlUtil.hasHtml(e.getContainingFile()) || HtmlUtil.supportsXmlTypedHandlers(e.getContainingFile()));
   }
 
   @Override
   public List<TextRange> select(@NotNull PsiElement e, @NotNull CharSequence editorText, int cursorOffset, @NotNull Editor editor) {
     List<TextRange> result;
 
-    if (!(e instanceof XmlToken) ||
-        XmlTokenSelectioner.shouldSelectToken((XmlToken)e) ||
-        ((XmlToken)e).getTokenType() == XmlTokenType.XML_DATA_CHARACTERS) {
-      result = super.select(e, editorText, cursorOffset, editor);
+    if (e instanceof XmlTag) {
+      result = new ArrayList<>();
+      addTagSelection((XmlTag)e, result, editorText);
+      return result;
+    }
+    else if (!(e instanceof XmlToken) ||
+             XmlTokenSelectioner.shouldSelectToken((XmlToken)e) ||
+             ((XmlToken)e).getTokenType() == XmlTokenType.XML_DATA_CHARACTERS) {
+      var superResult = super.select(e, editorText, cursorOffset, editor);
+      result = superResult != null ? superResult : new ArrayList<>();
     }
     else {
       result = new ArrayList<>();
@@ -64,37 +66,51 @@ public class HtmlSelectioner extends AbstractWordSelectioner {
     final FileViewProvider fileViewProvider = psiFile.getViewProvider();
     for (Language lang : fileViewProvider.getLanguages()) {
       final PsiFile langFile = fileViewProvider.getPsi(lang);
-      if (langFile != psiFile) addAttributeSelection(result, editor, cursorOffset, editorText,
-                                                     fileViewProvider.findElementAt(cursorOffset, lang));
+      if (langFile != psiFile) {
+        addAttributeSelection(result, editor, cursorOffset, editorText,
+                              fileViewProvider.findElementAt(cursorOffset, lang));
+      }
     }
-
-    EditorHighlighter highlighter = HighlighterFactory.createHighlighter(e.getProject(), psiFile.getVirtualFile());
-    highlighter.setText(editorText);
-
-    addTagSelection2(e, result);
-
     return result;
   }
 
-  private static void addTagSelection2(PsiElement e, List<? super TextRange> result) {
-    XmlTag tag = PsiTreeUtil.getParentOfType(e, XmlTag.class, true);
-    while (tag != null) {
-      result.add(tag.getTextRange());
-      final ASTNode tagStartEnd = XmlChildRole.START_TAG_END_FINDER.findChild(tag.getNode());
-      final ASTNode tagEndStart = XmlChildRole.CLOSING_TAG_START_FINDER.findChild(tag.getNode());
-      if (tagStartEnd != null && tagEndStart != null) {
-        result.add(new UnfairTextRange(tagStartEnd.getTextRange().getEndOffset(),
-                                       tagEndStart.getTextRange().getStartOffset()));
+  private static void addTagSelection(XmlTag tag, List<? super TextRange> result, @NotNull CharSequence editorText) {
+    // A parent can be a JS return statement, so we shouldn't expand the selection to the whole line
+    // if the parent does not have a new line inside. Expansion to the whole line should be done on the parent level.
+    boolean expandToWholeLine = tag.getParent() != null && tag.getParent().textContains('\n');
+    addRangeToResult(result, editorText, expandToWholeLine, tag.getTextRange());
+
+    final ASTNode tagStartEnd = XmlChildRole.START_TAG_END_FINDER.findChild(tag.getNode());
+    final ASTNode tagEndStart = XmlChildRole.CLOSING_TAG_START_FINDER.findChild(tag.getNode());
+
+    if (tagStartEnd != null && tagEndStart != null) {
+      var startOffset = tagStartEnd.getTextRange().getEndOffset();
+      var endOffset = tagEndStart.getTextRange().getStartOffset();
+      if (startOffset < endOffset) {
+        addRangeToResult(result, editorText, expandToWholeLine, new TextRange(startOffset, endOffset));
       }
-      if (tagStartEnd != null) {
-        result.add(new TextRange(tag.getTextRange().getStartOffset(),
-                                 tagStartEnd.getTextRange().getEndOffset()));
-      }
-      if (tagEndStart != null) {
-        result.add(new TextRange(tagEndStart.getTextRange().getStartOffset(),
-                                 tag.getTextRange().getEndOffset()));
-      }
-      tag = PsiTreeUtil.getParentOfType(tag, XmlTag.class, true);
+    }
+    if (tagStartEnd != null) {
+      TextRange range = new TextRange(tag.getTextRange().getStartOffset(),
+                                      tagStartEnd.getTextRange().getEndOffset());
+      addRangeToResult(result, editorText, expandToWholeLine, range);
+    }
+    if (tagEndStart != null) {
+      TextRange range = new TextRange(tagEndStart.getTextRange().getStartOffset(),
+                                      tag.getTextRange().getEndOffset());
+      addRangeToResult(result, editorText, expandToWholeLine, range);
+    }
+  }
+
+  private static void addRangeToResult(List<? super TextRange> result,
+                                       @NotNull CharSequence editorText,
+                                       boolean expandToWholeLine,
+                                       TextRange range) {
+    if (expandToWholeLine) {
+      result.addAll(expandToWholeLine(editorText, range, false));
+    }
+    else {
+      result.add(range);
     }
   }
 

xml/impl/src/com/intellij/codeInsight/editorActions/XmlTagSelectioner.java

@@ -1,10 +1,11 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.codeInsight.editorActions;
 
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiWhiteSpace;
+import com.intellij.psi.html.HtmlTag;
 import com.intellij.psi.xml.*;
 import org.jetbrains.annotations.NotNull;
 
@@ -13,7 +14,7 @@ import java.util.List;
 public class XmlTagSelectioner extends ExtendWordSelectionHandlerBase {
   @Override
   public boolean canSelect(@NotNull PsiElement e) {
-    return e instanceof XmlTag;
+    return e instanceof XmlTag && !(e instanceof HtmlTag);
   }
 
   @Override

xml/tests/testData/codeInsight/selectWordAction/html2/after3.html

@@ -1,5 +1,5 @@
 <selection><t<caret>ag attr="value" another="value">
-
+</selection>
   some Text
 
-</tag></selection>
+</tag>

xml/tests/testData/codeInsight/selectWordAction/html2/after4.html

@@ -0,0 +1,5 @@
+<selection><t<caret>ag attr="value" another="value">
+
+  some Text
+
+</tag></selection>

xml/tests/testData/selectWord/selectTag/after4.html

@@ -1,3 +1,3 @@
-<html><selection>
-<div>blablabla</div>
+<html>
+<selection><div>blablabla</div>
 </selection></html>

xml/tests/testData/selectWord/selectTag/after5.html

@@ -0,0 +1,3 @@
+<html><selection>
+<div>blablabla</div>
+</selection></html>

xml/tests/testData/selectWord/selectTag/after6.html

@@ -0,0 +1,3 @@
+<selection><html>
+<div>blablabla</div>
+</html></selection>