Merge pull request #236 from rtfpessoa/fix-char-by-char-diff

fix: Bring char by char option back

Author: rtfpessoa

README.md

@@ -194,6 +194,7 @@ The HTML output accepts a Javascript object with configuration. Possible options
   - `inputFormat`: the format of the input data: `'diff'` or `'json'`, default is `'diff'`
   - `outputFormat`: the format of the output data: `'line-by-line'` or `'side-by-side'`, default is `'line-by-line'`
   - `showFiles`: show a file list before the diff: `true` or `false`, default is `false`
+  - `diffStyle`: show differences level in each line: `word` or `char`, default is `word`
   - `matching`: matching level: `'lines'` for matching lines, `'words'` for matching lines and words or `'none'`, default is `none`
   - `matchWordsThreshold`: similarity threshold for word matching, default is 0.25
   - `matchingMaxComparisons`: perform at most this much comparisons for line matching a block of changes, default is `2500`

src/diff2html.js

@@ -17,6 +17,7 @@
     inputFormat: 'diff',
     outputFormat: 'line-by-line',
     showFiles: false,
+    diffStyle: 'word',
     matching: 'none',
     matchWordsThreshold: 0.25,
     matchingMaxComparisons: 2500,

src/printer-utils.js

@@ -159,7 +159,7 @@
     }
 
     var diff;
-    if (config.charByChar) {
+    if (config.diffStyle === 'char') {
       diff = jsDiff.diffChars(unprefixedLine1, unprefixedLine2);
     } else {
       diff = jsDiff.diffWordsWithSpace(unprefixedLine1, unprefixedLine2);
@@ -168,7 +168,7 @@
     var highlightedLine = '';
 
     var changedWords = [];
-    if (!config.charByChar && config.matching === 'words') {
+    if (config.diffStyle === 'word' && config.matching === 'words') {
       var treshold = 0.25;
 
       if (typeof (config.matchWordsThreshold) !== 'undefined') {

test/printer-utils-tests.js

@@ -99,7 +99,7 @@ describe('Utils', function() {
       var result = PrinterUtils.diffHighlight(
         '-var myVar = 2;',
         '+var myVariable = 3;',
-        {charByChar: true}
+        { diffStyle: 'char' }
       );
 
       assert.deepEqual({
@@ -118,6 +118,7 @@ describe('Utils', function() {
         ' -var myVar = 2;',
         ' +var myVariable = 3;',
         {
+          diffStyle: 'word',
           isCombined: true,
           matching: 'words',
           matchWordsThreshold: 1.00