Browse Source

Merge branch 'gsilvapt-master'

n1474335 5 years ago
parent
commit
ace71f20b3
2 changed files with 30 additions and 2 deletions
  1. 7 1
      src/core/operations/Diff.mjs
  2. 23 1
      tests/operations/tests/StrUtils.mjs

+ 7 - 1
src/core/operations/Diff.mjs

@@ -47,6 +47,11 @@ class Diff extends Operation {
                 "type": "boolean",
                 "value": true
             },
+            {
+                "name": "Show subtraction",
+                "type": "boolean",
+                "value": false
+            },
             {
                 "name": "Ignore whitespace",
                 "type": "boolean",
@@ -67,6 +72,7 @@ class Diff extends Operation {
                 diffBy,
                 showAdded,
                 showRemoved,
+                showSubtraction,
                 ignoreWhitespace
             ] = args,
             samples = input.split(sampleDelim);
@@ -116,7 +122,7 @@ class Diff extends Operation {
                 if (showAdded) output += "<span class='hl5'>" + Utils.escapeHtml(diff[i].value) + "</span>";
             } else if (diff[i].removed) {
                 if (showRemoved) output += "<span class='hl3'>" + Utils.escapeHtml(diff[i].value) + "</span>";
-            } else {
+            } else if (!showSubtraction) {
                 output += Utils.escapeHtml(diff[i].value);
             }
         }

+ 23 - 1
tests/operations/tests/StrUtils.mjs

@@ -15,7 +15,29 @@ TestRegister.addTests([
         recipeConfig: [
             {
                 "op": "Diff",
-                "args": ["\\n\\n", "Character", true, true, false]
+                "args": ["\\n\\n", "Character", true, true, false, false]
+            }
+        ],
+    },
+    {
+        name: "Diff added with subtraction, basic usage",
+        input: "testing23\n\ntesting123",
+        expectedOutput: "<span class='hl5'>1</span>",
+        recipeConfig: [
+            {
+                "op": "Diff",
+                "args": ["\\n\\n", "Character", true, true, true, false]
+            }
+        ],
+    },
+    {
+        name: "Diff removed with subtraction, basic usage",
+        input: "testing123\n\ntesting3",
+        expectedOutput: "<span class='hl3'>12</span>",
+        recipeConfig: [
+            {
+                "op": "Diff",
+                "args": ["\\n\\n", "Character", true, true, true, false]
             }
         ],
     },