From 6282202ee84f80f2197698b6f132abdf588e94d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= <rdavila84@gmail.com>
Date: Fri, 8 Jan 2016 15:17:45 -0500
Subject: Remove custom Lexer. #3945 [ci skip]

Inline diff is going to be generated client side now. #3945
---
 lib/gitlab/diff/highlight.rb    |  3 +--
 lib/rouge/lexers/gitlab_diff.rb | 26 --------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 lib/rouge/lexers/gitlab_diff.rb

(limited to 'lib')

diff --git a/lib/gitlab/diff/highlight.rb b/lib/gitlab/diff/highlight.rb
index 0d0a3268107..7dd44b6004a 100644
--- a/lib/gitlab/diff/highlight.rb
+++ b/lib/gitlab/diff/highlight.rb
@@ -95,8 +95,7 @@ module Gitlab
       end
 
       def lexer
-        parent = Rouge::Lexer.guess(filename: @file_name, source: @code).new rescue Rouge::Lexers::PlainText.new
-        Rouge::Lexers::GitlabDiff.new(parent_lexer: parent)
+        Rouge::Lexer.guess(filename: @file_name, source: @code).new rescue Rouge::Lexers::PlainText.new
       end
 
       def unescape_html(content)
diff --git a/lib/rouge/lexers/gitlab_diff.rb b/lib/rouge/lexers/gitlab_diff.rb
deleted file mode 100644
index cbf272ee1de..00000000000
--- a/lib/rouge/lexers/gitlab_diff.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-Rouge::Token::Tokens.token(:InlineDiff, 'idiff')
-
-module Rouge
-  module Lexers
-    # This new Lexer is required in order to avoid the inline diff markup
-    # to be tokenized, it will be rendered as raw HTML code if that happens.
-    class GitlabDiff < RegexLexer
-      title "GitLab Diff"
-      tag 'gitlab_diff'
-
-      state :root do
-        rule %r{<span class='idiff'>(.*?)</span>} do |match|
-          token InlineDiff, match[1]
-        end
-
-        rule /(?:(?!<span class='idiff').)*/m do
-          delegate option(:parent_lexer)
-        end
-      end
-
-      start do
-        option(:parent_lexer).reset!
-      end
-    end
-  end
-end
-- 
cgit v1.2.1