more changes

Change-Id: I301f5e4822582689116bb5ba61228ed28d0fd1be
Signed-off-by: Sidney <[email protected]>

Author: soulbeing

src/patch/apply.js

@@ -15,8 +15,8 @@ export function applyPatch(source, uniDiff, options = {}) {
   }
 
   // Apply the diff to the input
-  let lines = source.split(/\r\n|[\n\v\f\r\x85\u2028\u2029]/),
-      delimiters = source.match(/\r\n|[\n\v\f\r\x85\u2028\u2029]/g),
+  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),
@@ -121,7 +121,7 @@ export function applyPatch(source, uniDiff, options = {}) {
     lines.push('');
     delimiters.push('\n');
   }
-  for (let _k = 0; _k < lines.length; _k++) {
+  for (let _k = 0; _k < lines.length - 1; _k++) {
     lines[_k] = lines[_k] + delimiters[_k];
   }
   return lines.join('');

src/patch/parse.js

@@ -1,6 +1,6 @@
 export function parsePatch(uniDiff, options = {}) {
-  let diffstr = uniDiff.split(/\r\n|[\n\v\f\r\x85\u2028\u2029]/),
-      delimiters = uniDiff.match(/\r\n|[\n\v\f\r\x85\u2028\u2029]/g),
+  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;
 
@@ -95,7 +95,7 @@ export function parsePatch(uniDiff, options = {}) {
 
       if (operation === '+' || operation === '-' || operation === ' ' || operation === '\\') {
         hunk.lines.push(diffstr[i]);
-        hunk.linedelimiters.push(delimiters[i]);
+        hunk.linedelimiters.push(delimiters[i] || '\n');
 
         if (operation === '+') {
           addCount++;

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'
               ]
             }
           ]