isml-linter 5.43.3 → 5.43.5

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [5.43.5] - 2023-02-21
+
+### Fixed
+ - "indent" Rule - keep indentation of closing tag that is in same line as corresponding opening tag;
+ - Tree build for an empty template;
+ 
+## [5.43.4] - 2023-02-20
+
+### Fixed
+ - [Issue #39][issue#39] - Allow closing tag to be in the same line as corresponding opening tag last character;
+ 
 ## [5.43.3] - 2023-02-20
 
 ### Fixed
@@ -1103,6 +1114,8 @@
 ### Added
 - Linter is published;
 
+[5.43.5]: https://github.com/FabiowQuixada/isml-linter/compare/v5.43.4...v5.43.5
+[5.43.4]: https://github.com/FabiowQuixada/isml-linter/compare/v5.43.3...v5.43.4
 [5.43.3]: https://github.com/FabiowQuixada/isml-linter/compare/v5.43.2...v5.43.3
 [5.43.2]: https://github.com/FabiowQuixada/isml-linter/compare/v5.43.1...v5.43.2
 [5.43.1]: https://github.com/FabiowQuixada/isml-linter/compare/v5.43.0...v5.43.1
@@ -1270,6 +1283,7 @@
 [issue#30]: https://github.com/FabiowQuixada/isml-linter/issues/30
 [issue#31]: https://github.com/FabiowQuixada/isml-linter/issues/31
 [issue#35]: https://github.com/FabiowQuixada/isml-linter/issues/35
+[issue#39]: https://github.com/FabiowQuixada/isml-linter/issues/39
 
 [cli-docs]: <docs/cli.md>
 [api-docs]: <docs/api.md>

package/package.json

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

package/src/isml_tree/ParseUtils.js

@@ -491,6 +491,10 @@ const getElementList = (templateContent, templatePath, isCrlfLineBreak) => {
     const elementList        = state.elementList;
     let previousStateContent = state.remainingShadowContent;
 
+    if (templateContent === '') {
+        return [];
+    }
+
     do {
         initLoopState(state);
         parseNextElement(state);

package/src/rules/tree/indent.js

@@ -63,7 +63,7 @@ Rule.isTailBroken = function(node) {
     const configIndentSize         = this.getConfigs().indent;
     const expectedIndentation      = getExpectedIndentation(node, configIndentSize);
     const actualIndentation        = getActualTailIndentation(node);
-    const isInSameLineAsOpeningTag = node.lineNumber === node.tailLineNumber;
+    const isInSameLineAsOpeningTag = node.endLineNumber === node.tailLineNumber;
     const isInSameLineAsLastChild  = node.hasChildren() && node.getLastChild().getLastLineNumber() === node.tailLineNumber;
 
     return !node.isRoot() &&
@@ -763,6 +763,7 @@ const checkIfShouldAddIndentationToTail = node => {
     const isInSameLineAsChild       = !node.hasChildren() || node.getLastChild().isInSameLineAsParent();
     const isTailInSameLineAsChild   = !node.hasChildren() || node.tailLineNumber === node.getLastChild().getLastLineNumber();
     const isBrokenIntoMultipleLines = !node.hasChildren() && node.tailLineNumber && node.lineNumber !== node.tailLineNumber;
+    const isInSameLineAsOpeningTag  = !node.hasChildren() && node.tailLineNumber && node.endLineNumber === node.tailLineNumber;
 
     const shouldAdd = hasTail &&
         !isTailInSameLineAsChild &&
@@ -774,6 +775,11 @@ const checkIfShouldAddIndentationToTail = node => {
     ||
         isBrokenIntoMultipleLines;
 
+    // TODO Merge this condition into the above ones;
+    if (isInSameLineAsOpeningTag) {
+        return false;
+    }
+
     return shouldAdd;
 };