isml-linter 5.42.2 → 5.42.4

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [5.42.4] - 2023-01-30
+
+### Fixed
+ - "indent" rule fix - multiline self-closing HTML conditional comment;
+ - "indent" rule fix - closing tag after closing "isif" tag;
+ 
+## [5.42.3] - 2023-01-29
+
+### Fixed
+ - Tree build fix when self-closing HTML conditional comments are present;
+ 
 ## [5.42.2] - 2023-01-29
 
 ### Fixed
@@ -1069,6 +1080,8 @@
 ### Added
 - Linter is published;
 
+[5.42.4]: https://github.com/FabiowQuixada/isml-linter/compare/v5.42.3...v5.42.4
+[5.42.3]: https://github.com/FabiowQuixada/isml-linter/compare/v5.42.2...v5.42.3
 [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

package/package.json

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

package/src/isml_tree/IsmlNode.js

@@ -404,7 +404,11 @@ class IsmlNode {
             indentation += '    ';
         }
 
-        console.log(this.depth + ' :: ' + this.lineNumber + ' :: ' + indentation + getDisplayText(this));
+        if(this.isRoot()) {
+            console.log('Depth\t :: LineNumber\t :: Content');
+        }
+
+        console.log(this.depth + '\t :: ' + this.lineNumber + '\t\t :: ' + indentation + getDisplayText(this));
 
         for (let i = 0; i < this.children.length; i++) {
             this.children[i].print();

package/src/isml_tree/ParseUtils.js

@@ -128,9 +128,8 @@ const parseNextElement = state => {
             parseTextElement(state, newElement);
     }
 
-    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)));
+    newElement.columnNumber  = getElementColumnNumber(newElement, state);
+    newElement.isVoidElement = !config.disableHtml5 && Constants.voidElementsArray.indexOf(newElement.tagType) >= 0;
 
     if (state.isCrlfLineBreak) {
         newElement.globalPos += newElement.lineNumber - 1;
@@ -196,7 +195,7 @@ const parseTagOrExpressionElement = (state, newElement) => {
     // TODO Refactor this, remove this post-processing;
     if (newElement.type === 'htmlConditionalComment') {
         newElement.tagType       = 'html_conditional_comment';
-        newElement.isSelfClosing = false;
+        newElement.isSelfClosing = newElement.value.indexOf('<!--[if') >= 0 && newElement.value.indexOf('<![endif') >= 0;
 
         if (trimmedElement.indexOf('<!--<![endif]') >= 0) {
             newElement.isClosingTag = true;

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);
-    let nodeIndentation       = node.isInSameLineAsParent() && isOpeningTag ? '' : Rule.getIndentation(node.depth - 1);
+    const nodeIndentation     = node.isInSameLineAsParent() && isOpeningTag ? '' : Rule.getIndentation(node.depth - 1);
     const attributeOffset     = Rule.getAttributeIndentationOffset();
     const attributeList       = node.getAttributeList();
     let contentResult         = '';
@@ -641,21 +641,15 @@ const addIndentation = (node, isOpeningTag) => {
         } else {
             contentResult = node.head.trim();
         }
-    } else {
-        const nodeLastChild = node.getLastChild();
-
-        if (nodeLastChild) {
-            const lastChildLineNumber = nodeLastChild.isContainer() ?
-                nodeLastChild.getLastChild().getLastLineNumber() :
-                nodeLastChild.getLastLineNumber();
 
-            if (node.tailLineNumber === lastChildLineNumber) {
-                contentResult   = Constants.EOL + nodeIndentation;
-                nodeIndentation = '';
-            }
+        if (node.isOfType('html_conditional_comment')) {
+            contentResult = contentResult
+                .split(Constants.EOL)
+                .map((line, i) => i > 0 ? nodeIndentation + line : line)
+                .join(Constants.EOL);
         }
-
-        contentResult += node.tail.trim();
+    } else {
+        contentResult = node.tail.trim();
     }
 
     return preLineBreakContent + nodeIndentation + contentResult + fullTrailingContent;