Git: Add support for unified diff. Fixes #769, fixes #357, closes #401

PrismJS · Sep 14, 2015 · 3aadd5d · 3aadd5d
1 parent 112e0e8
commit 3aadd5d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/components/prism-git.js b/components/prism-git.js
@@ -8,7 +8,13 @@ Prism.languages.git = {
 	 * # and have 1 and 2 different commits each, respectively.
 	 * nothing to commit (working directory clean)
 	 */
-	'comment': /^#.*$/m,
+	'comment': /^#.*/m,
+
+	/*
+	 * Regexp to match the changed lines in a git diff output. Check the example below.
+	 */
+	'deleted': /^[-–].*/m,
+	'inserted': /^\+.*/m,
 
 	/*
 	 * a string (double and simple quote)
@@ -48,12 +54,6 @@ Prism.languages.git = {
 	 */
 	'coord': /^@@.*@@$/m,
 
-	/*
-	 * Regexp to match the changed lines in a git diff output. Check the example above.
-	 */
-	'deleted': /^-(?!-).+$/m,
-	'inserted': /^\+(?!\+).+$/m,
-
 	/*
 	 * Match a "commit [SHA1]" line in a git log output.
 	 * For instance:

diff --git a/components/prism-git.min.js b/components/prism-git.min.js
diff --git a/tests/languages/git/diff_feature.test b/tests/languages/git/diff_feature.test
@@ -2,12 +2,28 @@
 +Here's my text file
 +And this is the second line
 
+––– a/web/js/lazy.js
++++ b/web/js/lazy.js
+
+-      if (url !== null && url !== '' && typeof url !== 'undefined') {
++      if (url === null || url === '' || typeof url === 'undefined') {
++        return;
++      }
++
+
 ----------------------------------------------------
 
 [
 	["deleted", "-Here's my tetx file"],
 	["inserted", "+Here's my text file"],
-	["inserted", "+And this is the second line"]
+	["inserted", "+And this is the second line"],
+	["deleted", "––– a/web/js/lazy.js"],
+	["inserted", "+++ b/web/js/lazy.js"],
+	["deleted", "-      if (url !== null && url !== '' && typeof url !== 'undefined') {"],
+	["inserted", "+      if (url === null || url === '' || typeof url === 'undefined') {"],
+	["inserted", "+        return;"],
+	["inserted", "+      }"],
+	["inserted", "+"]
 ]
 
 ----------------------------------------------------