[261956] SSI includes give strange warning
diff --git a/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF index a3f55a1..131c816 100644 --- a/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.html.core; singleton:=true -Bundle-Version: 1.1.3.qualifier +Bundle-Version: 1.1.4.qualifier Bundle-Activator: org.eclipse.wst.html.core.internal.HTMLCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SyntaxValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SyntaxValidator.java index 57c749f..69170fc 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SyntaxValidator.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SyntaxValidator.java
@@ -213,9 +213,14 @@ } else { if (info.isXHTML) { // XHTML - if (!info.target.isEmptyTag()) { + if (!info.target.isEmptyTag() && DOMRegionContext.XML_TAG_OPEN.equals(info.target.getStartStructuredDocumentRegion().getFirstRegion().getType())) { + /* + * https://bugs.eclipse.org/bugs/show_bug.cgi?id=261956 : + * report empty tags not written as such, but only when + * they follow actual XML/HTML syntax + */ if (isEmptyContent(info.decl)) { - // EMPTY element should be written in <.../> form. + // EMPTY element should be written in <.../> form Segment errorSeg = FMUtil.getSegment(info.target, FMUtil.SEG_START_TAG); report(INVALID_EMPTY_ELEMENT_TAG, errorSeg, info.target); }
diff --git a/features/org.eclipse.wst.web_core.feature.patch/buildnotes_org.eclipse.wst.web_core.feature.patch.html b/features/org.eclipse.wst.web_core.feature.patch/buildnotes_org.eclipse.wst.web_core.feature.patch.html index 4f2dd0f..93198bc 100644 --- a/features/org.eclipse.wst.web_core.feature.patch/buildnotes_org.eclipse.wst.web_core.feature.patch.html +++ b/features/org.eclipse.wst.web_core.feature.patch/buildnotes_org.eclipse.wst.web_core.feature.patch.html
@@ -16,4 +16,5 @@ <p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=185402'>185402</a>. JSP validation fails because of defaulted attribute flush on jsp:include</p> <p>Bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=247722">247722</a>. NamespaceValidator can report zero-length problems for undefined tags</p> <p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=250030'>250030</a>. Ignoring problems caused by missing start and end tags</p> +<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=261956'>261956</a>. SSI includes give strange warning</p> </body></html> \ No newline at end of file
diff --git a/features/org.eclipse.wst.web_core.feature.patch/feature.properties b/features/org.eclipse.wst.web_core.feature.patch/feature.properties index c79c3f0..80bbdff 100644 --- a/features/org.eclipse.wst.web_core.feature.patch/feature.properties +++ b/features/org.eclipse.wst.web_core.feature.patch/feature.properties
@@ -34,6 +34,7 @@ Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=185402 JSP validation fails because of defaulted attribute flush on jsp:include\n\ Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=247722 NamespaceValidator can report zero-length problems for undefined tags\n\ Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=250030 Ignoring problems caused by missing start and end tags\n\ +Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=261956 SSI includes give strange warning\n\ \n\ # "copyright" property - text of the "Feature Update Copyright"