feat: improvements to ERB template recognition

codsen · Feb 3, 2021 · 5fd2ba1 · 5fd2ba1
1 parent 9aeddc3
commit 5fd2ba1
Show file tree

Hide file tree

Showing 8 changed files with 598 additions and 27 deletions.
diff --git a/packages/codsen-tokenizer/coverage/coverage-summary.json b/packages/codsen-tokenizer/coverage/coverage-summary.json
@@ -1 +1 @@
-{"total":{"lines":{"total":855,"covered":789,"skipped":0,"pct":92.28},"statements":{"total":883,"covered":815,"skipped":0,"pct":92.3},"functions":{"total":42,"covered":40,"skipped":0,"pct":95.24},"branches":{"total":1351,"covered":1238,"skipped":0,"pct":91.64}}}
+{"total":{"lines":{"total":855,"covered":789,"skipped":0,"pct":92.28},"statements":{"total":883,"covered":815,"skipped":0,"pct":92.3},"functions":{"total":42,"covered":40,"skipped":0,"pct":95.24},"branches":{"total":1355,"covered":1242,"skipped":0,"pct":91.66}}}
diff --git a/packages/codsen-tokenizer/dist/codsen-tokenizer.cjs.js b/packages/codsen-tokenizer/dist/codsen-tokenizer.cjs.js
@@ -353,12 +353,10 @@ function matchLayerLast(wholeEspTagLump, layers, matchFirstInstead) {
   // present in the extracted lump
   Array.from(wholeEspTagLump).every(function (char) {
     return whichLayerToMatch.guessedClosingLump.includes(char);
-  })) {
-    // console.log(
-    //   `047 matchLayer(): ${`\u001b[${32}m${`RETURN`}\u001b[${39}m`} ${
-    //     wholeEspTagLump.length
-    //   }`
-    // );
+  }) || // consider ruby heads, <%# and tails -%>
+  whichLayerToMatch.guessedClosingLump && // length is more than 2
+  whichLayerToMatch.guessedClosingLump.length > 2 && // and last two characters match to what was guessed
+  whichLayerToMatch.guessedClosingLump[whichLayerToMatch.guessedClosingLump.length - 1] === wholeEspTagLump[wholeEspTagLump.length - 1] && whichLayerToMatch.guessedClosingLump[whichLayerToMatch.guessedClosingLump.length - 2] === wholeEspTagLump[wholeEspTagLump.length - 2]) {
     return wholeEspTagLump.length;
   } // console.log(`054 matchLayer(): finally, return undefined`);
 

diff --git a/packages/codsen-tokenizer/dist/codsen-tokenizer.dev.umd.js b/packages/codsen-tokenizer/dist/codsen-tokenizer.dev.umd.js
@@ -3759,12 +3759,10 @@ function matchLayerLast(wholeEspTagLump, layers, matchFirstInstead) {
   // present in the extracted lump
   Array.from(wholeEspTagLump).every(function (char) {
     return whichLayerToMatch.guessedClosingLump.includes(char);
-  })) {
-    // console.log(
-    //   `047 matchLayer(): ${`\u001b[${32}m${`RETURN`}\u001b[${39}m`} ${
-    //     wholeEspTagLump.length
-    //   }`
-    // );
+  }) || // consider ruby heads, <%# and tails -%>
+  whichLayerToMatch.guessedClosingLump && // length is more than 2
+  whichLayerToMatch.guessedClosingLump.length > 2 && // and last two characters match to what was guessed
+  whichLayerToMatch.guessedClosingLump[whichLayerToMatch.guessedClosingLump.length - 1] === wholeEspTagLump[wholeEspTagLump.length - 1] && whichLayerToMatch.guessedClosingLump[whichLayerToMatch.guessedClosingLump.length - 2] === wholeEspTagLump[wholeEspTagLump.length - 2]) {
     return wholeEspTagLump.length;
   } // console.log(`054 matchLayer(): finally, return undefined`);
 

diff --git a/packages/codsen-tokenizer/dist/codsen-tokenizer.esm.js b/packages/codsen-tokenizer/dist/codsen-tokenizer.esm.js
@@ -327,12 +327,10 @@ function matchLayerLast(wholeEspTagLump, layers, matchFirstInstead = false) {
   if ( // imagine case of Nunjucks: heads "{%" are normal but tails "-%}" (notice dash)
   wholeEspTagLump.includes(whichLayerToMatch.guessedClosingLump) || // match every character from the last "layers" complex-type entry must be
   // present in the extracted lump
-  Array.from(wholeEspTagLump).every(char => whichLayerToMatch.guessedClosingLump.includes(char))) {
-    // console.log(
-    //   `047 matchLayer(): ${`\u001b[${32}m${`RETURN`}\u001b[${39}m`} ${
-    //     wholeEspTagLump.length
-    //   }`
-    // );
+  Array.from(wholeEspTagLump).every(char => whichLayerToMatch.guessedClosingLump.includes(char)) || // consider ruby heads, <%# and tails -%>
+  whichLayerToMatch.guessedClosingLump && // length is more than 2
+  whichLayerToMatch.guessedClosingLump.length > 2 && // and last two characters match to what was guessed
+  whichLayerToMatch.guessedClosingLump[whichLayerToMatch.guessedClosingLump.length - 1] === wholeEspTagLump[wholeEspTagLump.length - 1] && whichLayerToMatch.guessedClosingLump[whichLayerToMatch.guessedClosingLump.length - 2] === wholeEspTagLump[wholeEspTagLump.length - 2]) {
     return wholeEspTagLump.length;
   } // console.log(`054 matchLayer(): finally, return undefined`);
 

diff --git a/packages/codsen-tokenizer/dist/codsen-tokenizer.mjs b/packages/codsen-tokenizer/dist/codsen-tokenizer.mjs
diff --git a/packages/codsen-tokenizer/dist/codsen-tokenizer.umd.js b/packages/codsen-tokenizer/dist/codsen-tokenizer.umd.js
diff --git a/packages/codsen-tokenizer/src/util/matchLayerLast.ts b/packages/codsen-tokenizer/src/util/matchLayerLast.ts
@@ -47,13 +47,24 @@ function matchLayerLast(
     // present in the extracted lump
     Array.from(wholeEspTagLump).every((char) =>
       whichLayerToMatch.guessedClosingLump.includes(char)
-    )
+    ) ||
+    // consider ruby heads, <%# and tails -%>
+    (whichLayerToMatch.guessedClosingLump &&
+      // length is more than 2
+      whichLayerToMatch.guessedClosingLump.length > 2 &&
+      // and last two characters match to what was guessed
+      whichLayerToMatch.guessedClosingLump[
+        whichLayerToMatch.guessedClosingLump.length - 1
+      ] === wholeEspTagLump[wholeEspTagLump.length - 1] &&
+      whichLayerToMatch.guessedClosingLump[
+        whichLayerToMatch.guessedClosingLump.length - 2
+      ] === wholeEspTagLump[wholeEspTagLump.length - 2])
   ) {
-    // console.log(
-    //   `047 matchLayer(): ${`\u001b[${32}m${`RETURN`}\u001b[${39}m`} ${
-    //     wholeEspTagLump.length
-    //   }`
-    // );
+    console.log(
+      `047 matchLayer(): ${`\u001b[${32}m${`RETURN`}\u001b[${39}m`} ${
+        wholeEspTagLump.length
+      }`
+    );
     return wholeEspTagLump.length;
   }