isml-linter 5.42.1 → 5.42.2

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [5.42.2] - 2023-01-29
+
+### Fixed
+ - HTML conditional comment children indentation;
+ 
 ## [5.42.1] - 2023-01-28
 
 ### Fixed
@@ -1064,6 +1069,7 @@
 ### Added
 - Linter is published;
 
+[5.42.2]: https://github.com/FabiowQuixada/isml-linter/compare/v5.42.1...v5.42.2
 [5.42.1]: https://github.com/FabiowQuixada/isml-linter/compare/v5.42.0...v5.42.1
 [5.42.0]: https://github.com/FabiowQuixada/isml-linter/compare/v5.41.0...v5.42.0
 [5.41.0]: https://github.com/FabiowQuixada/isml-linter/compare/v5.40.5...v5.41.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isml-linter",
-  "version": "5.42.1",
+  "version": "5.42.2",
   "author": "Fabiow Quixadá <ftquixada@gmail.com>",
   "license": "MIT",
   "main": "src/publicApi.js",

package/src/isml_tree/IsmlNode.js

@@ -54,7 +54,9 @@ class IsmlNode {
 
         const head = this.head.trim();
 
-        if (head.startsWith('<!--')) {
+        if (head.startsWith('<!--[if')) {
+            return 'html_conditional_comment';
+        } else if (head.startsWith('<!--')) {
             return 'html_comment';
         } else if (this.isDocType()) {
             return 'doctype';

package/src/isml_tree/ParseUtils.js

@@ -128,8 +128,9 @@ const parseNextElement = state => {
             parseTextElement(state, newElement);
     }
 
-    newElement.columnNumber  = getElementColumnNumber(newElement, state);
-    newElement.isVoidElement = !config.disableHtml5 && Constants.voidElementsArray.indexOf(newElement.tagType) >= 0;
+    newElement.columnNumber             = getElementColumnNumber(newElement, state);
+    newElement.isVoidElement            = !config.disableHtml5 && Constants.voidElementsArray.indexOf(newElement.tagType) >= 0;
+    newElement.isHtmlConditionalComment = !!(newElement.type === 'htmlOrIsmlComment' && (newElement.value.indexOf('<!--[if') >= 0 || newElement.value.indexOf('<!--<![endif]' >= 0)));
 
     if (state.isCrlfLineBreak) {
         newElement.globalPos += newElement.lineNumber - 1;
@@ -158,10 +159,11 @@ const parseNextElement = state => {
 };
 
 const parseTagOrExpressionElement = (state, newElement) => {
-    const trimmedElement      = newElement.value.trim().toLowerCase();
-    const isTag               = trimmedElement.startsWith('<') && !trimmedElement.startsWith('<!--');
-    const isExpression        = trimmedElement.startsWith('${');
-    const isHtmlOrIsmlComment = trimmedElement.startsWith('<!--');
+    const trimmedElement       = newElement.value.trim().toLowerCase();
+    const isTag                = trimmedElement.startsWith('<') && !trimmedElement.startsWith('<!--');
+    const isExpression         = trimmedElement.startsWith('${');
+    const isHtmlOrIsmlComment  = trimmedElement.startsWith('<!--');
+    const isConditionalComment = trimmedElement.indexOf('<!--[if') >= 0 || trimmedElement.indexOf('<![endif') >= 0;
 
     if (isTag) {
         if (trimmedElement.startsWith('<is') || trimmedElement.startsWith('</is')) {
@@ -171,6 +173,8 @@ const parseTagOrExpressionElement = (state, newElement) => {
         } else {
             newElement.type = 'htmlTag';
         }
+    } else if (isConditionalComment) {
+        newElement.type = 'htmlConditionalComment';
     } else if (isHtmlOrIsmlComment) {
         newElement.type = 'htmlOrIsmlComment';
     } else if (isExpression) {
@@ -180,16 +184,24 @@ const parseTagOrExpressionElement = (state, newElement) => {
     }
 
     if (isTag) {
-        newElement.tagType = getElementType(trimmedElement);
-
+        newElement.tagType     = getElementType(trimmedElement);
         newElement.isCustomTag = newElement.type === 'ismlTag' && !SfccTagContainer[newElement.tagType];
     }
 
     newElement.isSelfClosing = isSelfClosing(trimmedElement);
+    newElement.isClosingTag  = isTag && trimmedElement.startsWith('</');
+    newElement.lineNumber    = getLineBreakQty(state.pastContent) + getLeadingLineBreakQty(newElement.value) + 1;
+    newElement.globalPos     = state.pastContent.length + getLeadingEmptyChars(newElement.value).length;
+
+    // TODO Refactor this, remove this post-processing;
+    if (newElement.type === 'htmlConditionalComment') {
+        newElement.tagType       = 'html_conditional_comment';
+        newElement.isSelfClosing = false;
 
-    newElement.isClosingTag = isTag && trimmedElement.startsWith('</');
-    newElement.lineNumber   = getLineBreakQty(state.pastContent) + getLeadingLineBreakQty(newElement.value) + 1;
-    newElement.globalPos    = state.pastContent.length + getLeadingEmptyChars(newElement.value).length;
+        if (trimmedElement.indexOf('<!--<![endif]') >= 0) {
+            newElement.isClosingTag = true;
+        }
+    }
 };
 
 const parseTextElement = (state, newElement) => {

package/src/rules/tree/indent.js

@@ -613,7 +613,7 @@ const addIndentation = (node, isOpeningTag) => {
     const fullLeadingContent  = content.substring(0, startingPos);
     const preLineBreakContent = fullLeadingContent.substring(0, fullLeadingContent.lastIndexOf(Constants.EOL) + 1);
     const fullTrailingContent = content.substring(endingPos);
-    const nodeIndentation     = node.isInSameLineAsParent() && isOpeningTag ? '' : Rule.getIndentation(node.depth - 1);
+    let nodeIndentation       = node.isInSameLineAsParent() && isOpeningTag ? '' : Rule.getIndentation(node.depth - 1);
     const attributeOffset     = Rule.getAttributeIndentationOffset();
     const attributeList       = node.getAttributeList();
     let contentResult         = '';
@@ -642,7 +642,20 @@ const addIndentation = (node, isOpeningTag) => {
             contentResult = node.head.trim();
         }
     } else {
-        contentResult = node.tail.trim();
+        const nodeLastChild = node.getLastChild();
+
+        if (nodeLastChild) {
+            const lastChildLineNumber = nodeLastChild.isContainer() ?
+                nodeLastChild.getLastChild().getLastLineNumber() :
+                nodeLastChild.getLastLineNumber();
+
+            if (node.tailLineNumber === lastChildLineNumber) {
+                contentResult   = Constants.EOL + nodeIndentation;
+                nodeIndentation = '';
+            }
+        }
+
+        contentResult += node.tail.trim();
     }
 
     return preLineBreakContent + nodeIndentation + contentResult + fullTrailingContent;