Merge pull request #144 from soulbeing/SpliteFile

Split file using all possible line delimiter instead of hard-coded "/n" and join lines back using the original delimiters

Author: kpdecker

Diff for: src/patch/apply.js

@@ -15,7 +15,8 @@ export function applyPatch(source, uniDiff, options = {}) {
   }
 
   // Apply the diff to the input
-  let lines = source.split('\n'),
+  let lines = source.split(/\r\n|[\n\v\f\r\x85]/),
+      delimiters = source.match(/\r\n|[\n\v\f\r\x85]/g) || [],
       hunks = uniDiff.hunks,
 
       compareLine = options.compareLine || ((lineNumber, line, operation, patchContent) => line === patchContent),
@@ -86,15 +87,18 @@ export function applyPatch(source, uniDiff, options = {}) {
     for (let j = 0; j < hunk.lines.length; j++) {
       let line = hunk.lines[j],
           operation = line[0],
-          content = line.substr(1);
+          content = line.substr(1),
+          delimiter = hunk.linedelimiters[j];
 
       if (operation === ' ') {
         toPos++;
       } else if (operation === '-') {
         lines.splice(toPos, 1);
+        delimiters.splice(toPos, 1);
       /* istanbul ignore else */
       } else if (operation === '+') {
         lines.splice(toPos, 0, content);
+        delimiters.splice(toPos, 0, delimiter);
         toPos++;
       } else if (operation === '\\') {
         let previousOperation = hunk.lines[j - 1] ? hunk.lines[j - 1][0] : null;
@@ -111,11 +115,16 @@ export function applyPatch(source, uniDiff, options = {}) {
   if (removeEOFNL) {
     while (!lines[lines.length - 1]) {
       lines.pop();
+      delimiters.pop();
     }
   } else if (addEOFNL) {
     lines.push('');
+    delimiters.push('\n');
+  }
+  for (let _k = 0; _k < lines.length - 1; _k++) {
+    lines[_k] = lines[_k] + delimiters[_k];
   }
-  return lines.join('\n');
+  return lines.join('');
 }
 
 // Wrapper that supports multiple file patches via callbacks.

Diff for: src/patch/parse.js

@@ -1,5 +1,6 @@
 export function parsePatch(uniDiff, options = {}) {
-  let diffstr = uniDiff.split('\n'),
+  let diffstr = uniDiff.split(/\r\n|[\n\v\f\r\x85]/),
+      delimiters = uniDiff.match(/\r\n|[\n\v\f\r\x85]/g) || [],
       list = [],
       i = 0;
 
@@ -75,7 +76,8 @@ export function parsePatch(uniDiff, options = {}) {
       oldLines: +chunkHeader[2] || 1,
       newStart: +chunkHeader[3],
       newLines: +chunkHeader[4] || 1,
-      lines: []
+      lines: [],
+      linedelimiters: []
     };
 
     let addCount = 0,
@@ -93,6 +95,7 @@ export function parsePatch(uniDiff, options = {}) {
 
       if (operation === '+' || operation === '-' || operation === ' ' || operation === '\\') {
         hunk.lines.push(diffstr[i]);
+        hunk.linedelimiters.push(delimiters[i] || '\n');
 
         if (operation === '+') {
           addCount++;

Diff for: test/patch/parse.js

@@ -21,6 +21,12 @@ describe('patch/parse', function() {
                 ' line3',
                 '+line4',
                 ' line5'
+              ],
+              linedelimiters: [
+                '\n',
+                '\n',
+                '\n',
+                '\n'
               ]
             }
           ]
@@ -39,6 +45,10 @@ describe('patch/parse', function() {
               lines: [
                 '-line3',
                 '+line4'
+              ],
+              linedelimiters: [
+                '\n',
+                '\n'
               ]
             }
           ]
@@ -66,6 +76,12 @@ describe('patch/parse', function() {
                 ' line3',
                 '+line4',
                 ' line5'
+              ],
+              linedelimiters: [
+                '\n',
+                '\n',
+                '\n',
+                '\n'
               ]
             },
             {
@@ -76,6 +92,12 @@ describe('patch/parse', function() {
                 ' line3',
                 '-line4',
                 ' line5'
+              ],
+              linedelimiters: [
+                '\n',
+                '\n',
+                '\n',
+                '\n'
               ]
             }
           ]
@@ -107,6 +129,12 @@ describe('patch/parse', function() {
                 ' line3',
                 '+line4',
                 ' line5'
+              ],
+              linedelimiters: [
+                '\n',
+                '\n',
+                '\n',
+                '\n'
               ]
             }
           ]
@@ -147,6 +175,12 @@ Index: test2
                 ' line3',
                 '+line4',
                 ' line5'
+              ],
+              linedelimiters: [
+                '\n',
+                '\n',
+                '\n',
+                '\n'
               ]
             }
           ]
@@ -165,6 +199,12 @@ Index: test2
                 ' line3',
                 '+line4',
                 ' line5'
+              ],
+              linedelimiters: [
+                '\n',
+                '\n',
+                '\n',
+                '\n'
               ]
             }
           ]
@@ -201,6 +241,12 @@ Index: test2
                 ' line3',
                 '+line4',
                 ' line5'
+              ],
+              linedelimiters: [
+                '\n',
+                '\n',
+                '\n',
+                '\n'
               ]
             }
           ]
@@ -218,6 +264,12 @@ Index: test2
                 ' line3',
                 '+line4',
                 ' line5'
+              ],
+              linedelimiters: [
+                '\n',
+                '\n',
+                '\n',
+                '\n'
               ]
             }
           ]
@@ -237,6 +289,10 @@ Index: test2
               lines: [
                 '-line5',
                 '\\ No newline at end of file'
+              ],
+              linedelimiters: [
+                '\n',
+                '\n'
               ]
             }
           ]
@@ -255,6 +311,10 @@ Index: test2
               lines: [
                 '+line5',
                 '\\ No newline at end of file'
+              ],
+              linedelimiters: [
+                '\n',
+                '\n'
               ]
             }
           ]
@@ -275,6 +335,11 @@ Index: test2
                 '+line4',
                 ' line5',
                 '\\ No newline at end of file'
+              ],
+              linedelimiters: [
+                '\n',
+                '\n',
+                '\n'
               ]
             }
           ]