From 1defbd99ef5662b22b79dfa9a75ae1ecc5b7f58c Mon Sep 17 00:00:00 2001
From: Alexander Doroshko <alexander.doroshko@jetbrains.com>
Date: Mon, 10 Dec 2018 19:36:40 +0300
Subject: [PATCH] WEB-35193 HTML5 Outline shows <td> elements

---
 .../structureView/NoSectioningRoot.html       |  8 +++++-
 .../structureView/NoSectioningRoot.tree       |  4 +--
 .../structureView/Html5SectionsProcessor.java | 28 ++++++-------------
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/xml/tests/testData/structureView/NoSectioningRoot.html b/xml/tests/testData/structureView/NoSectioningRoot.html
index d0b4849a0d9b..617b875d1744 100644
--- a/xml/tests/testData/structureView/NoSectioningRoot.html
+++ b/xml/tests/testData/structureView/NoSectioningRoot.html
@@ -5,7 +5,13 @@
   <dialog>dialog</dialog>
   <fieldset>fieldset</fieldset>
   <figure>figure</figure>
-  <td>td</td>
+  <cmc-table>
+    <td>td1</td>
+    <td><h2>in table</h2></td>
+    <td><div>td2</div></td>
+    <td><fieldset>f</fieldset></td>
+    <td>td3</td>
+  </cmc-table>
   <hgroup>
     <a/>
     <h1>1</h1>
diff --git a/xml/tests/testData/structureView/NoSectioningRoot.tree b/xml/tests/testData/structureView/NoSectioningRoot.tree
index e63bb3297a2e..000b7fe60d97 100644
--- a/xml/tests/testData/structureView/NoSectioningRoot.tree
+++ b/xml/tests/testData/structureView/NoSectioningRoot.tree
@@ -3,7 +3,7 @@
  blockquote
  body
  details
- dialog
  fieldset
  figure
- td
\ No newline at end of file
+ in table
+ f
\ No newline at end of file
diff --git a/xml/xml-structure-view-impl/src/com/intellij/lang/html/structureView/Html5SectionsProcessor.java b/xml/xml-structure-view-impl/src/com/intellij/lang/html/structureView/Html5SectionsProcessor.java
index e8b3707eabb4..8f1f3286ceb2 100644
--- a/xml/xml-structure-view-impl/src/com/intellij/lang/html/structureView/Html5SectionsProcessor.java
+++ b/xml/xml-structure-view-impl/src/com/intellij/lang/html/structureView/Html5SectionsProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.lang.html.structureView;
 
 import com.intellij.ide.structureView.StructureViewTreeElement;
@@ -29,9 +15,8 @@ import java.util.Collection;
 import java.util.Comparator;
 import java.util.LinkedList;
 
-
-// Algorithm described at http://www.w3.org/html/wg/drafts/html/master/sections.html#outlines
-// One of implementations: http://hoyois.github.com/html5outliner/ (https://github.com/hoyois/html5outliner)
+// Algorithm described on https://www.w3.org/TR/html51/sections.html#creating-an-outline
+// One of the implementations: http://hoyois.github.com/html5outliner/ (https://github.com/hoyois/html5outliner)
 class Html5SectionsProcessor {
 
   private static class SectionHolder {
@@ -82,13 +67,13 @@ class Html5SectionsProcessor {
     }
   }
 
-  private static final String[] SECTIONING_ROOT_ELEMENTS = {"blockquote", "body", "details", "dialog", "fieldset", "figure", "td"};
+  private static final String[] SECTIONING_ROOT_ELEMENTS = {"blockquote", "body", "details", "fieldset", "figure", "td"};
   private static final String[] SECTIONING_CONTENT_ELEMENTS = {"article", "aside", "nav", "section"};
   private static final String[] HEADER_ELEMENTS = {"h1", "h2", "h3", "h4", "h5", "h6"};
   private static final String HGROUP_ELEMENT = "hgroup";
 
   private final Collection<SectionHolder> myRootSectionHolders = new SortedList<>(
-    (first, second) -> first.getTag().getTextRange().getStartOffset() - second.getTag().getTextRange().getStartOffset());
+    Comparator.comparingInt(holder -> holder.getTag().getTextRange().getStartOffset()));
 
   private SectionHolder myCurrentOutlinee = null;
   private Section myCurrentSection = null;
@@ -200,6 +185,9 @@ class Html5SectionsProcessor {
     final Collection<Html5SectionTreeElement> result = new ArrayList<>();
     for (SectionHolder sectionHolder : myRootSectionHolders) {
       for (Section section : sectionHolder.getChildren()) {
+        if ("td".equalsIgnoreCase(section.getTag().getName()) && section.getHeader() == null && section.getChildren().isEmpty()) {
+          continue;
+        }
         result.add(createHtml5SectionTreeElement(section));
       }
     }