Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
15d5dfdb
Commit
15d5dfdb
authored
9 years ago
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix diff syntax highlighting
Refactored HTML parser to avoid duplication of newline parsing. Closes #2235
parent
77f37fa9
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
21 deletions
+38
-21
lib/rouge/formatters/html_gitlab.rb
lib/rouge/formatters/html_gitlab.rb
+21
-20
spec/helpers/blob_helper_spec.rb
spec/helpers/blob_helper_spec.rb
+16
-0
spec/helpers/events_helper_spec.rb
spec/helpers/events_helper_spec.rb
+1
-1
No files found.
lib/rouge/formatters/html_gitlab.rb
View file @
15d5dfdb
...
...
@@ -93,16 +93,27 @@ module Rouge
end
def
process_tokens
(
tokens
)
num_lines
=
0
last_val
=
''
rendered
=
''
rendered
=
[]
current_line
=
''
tokens
.
each
do
|
tok
,
val
|
last_val
=
val
num_lines
+=
val
.
scan
(
/\n/
).
size
rendered
<<
span
(
tok
,
val
)
# In the case of multi-line values (e.g. comments), we need to apply
# styling to each line since span elements are inline.
val
.
lines
.
each
do
|
line
|
stripped
=
line
.
chomp
current_line
<<
span
(
tok
,
stripped
)
if
line
.
end_with?
(
"
\n
"
)
rendered
<<
current_line
current_line
=
''
end
end
end
# Add leftover text
rendered
<<
current_line
if
current_line
.
present?
num_lines
=
rendered
.
size
numbers
=
(
@linenostart
..
num_lines
+
@linenostart
-
1
).
to_a
{
numbers:
numbers
,
code:
rendered
}
...
...
@@ -117,9 +128,8 @@ module Rouge
numbers
.
join
(
"
\n
"
)
end
def
wrap_lines
(
rendered
)
def
wrap_lines
(
lines
)
if
@lineanchors
lines
=
rendered
.
split
(
"
\n
"
)
lines
=
lines
.
each_with_index
.
map
do
|
line
,
index
|
number
=
index
+
@linenostart
...
...
@@ -136,22 +146,15 @@ module Rouge
lines
.
join
(
"
\n
"
)
else
if
@linenos
==
'inline'
lines
=
rendered
.
split
(
"
\n
"
)
lines
=
lines
.
each_with_index
.
map
do
|
line
,
index
|
number
=
index
+
@linenostart
"<span class=
\"
linenos
\"
>
#{
number
}
</span>
#{
line
}
"
end
lines
.
join
(
"
\n
"
)
else
rendered
end
lines
.
join
(
"
\n
"
)
end
end
def
wrap_values
(
val
,
element
)
lines
=
val
.
split
(
"
\n
"
)
lines
=
lines
.
map
{
|
x
|
"<span
#{
element
}
>
#{
x
}
</span>"
}
lines
.
join
(
"
\n
"
)
end
def
span
(
tok
,
val
)
...
...
@@ -161,13 +164,11 @@ module Rouge
if
tok
.
shortname
.
empty?
val
else
# In the case of multi-line values (e.g. comments), we need to apply
# styling to each line since span elements are inline.
if
@inline_theme
rules
=
@inline_theme
.
style_for
(
tok
).
rendered_rules
wrap_values
(
val
,
"style=
\"
#{
rules
.
to_a
.
join
(
';'
)
}
\"
"
)
"<span style=
\"
#{
rules
.
to_a
.
join
(
';'
)
}
\"
#{
val
}
</span>"
else
wrap_values
(
val
,
"class=
\"
#{
tok
.
shortname
}
\"
"
)
"<span class=
\"
#{
tok
.
shortname
}
\"
>
#{
val
}
</span>"
end
end
end
...
...
This diff is collapsed.
Click to expand it.
spec/helpers/blob_helper_spec.rb
View file @
15d5dfdb
...
...
@@ -47,5 +47,21 @@ describe BlobHelper do
expect
(
lines
[
1
].
text
).
to
eq
(
' This is line 2.'
)
expect
(
lines
[
2
].
text
).
to
eq
(
' """'
)
end
context
'diff highlighting'
do
let
(
:blob_name
)
{
'test.diff'
}
let
(
:blob_content
)
{
"+aaa
\n
+bbb
\n
- ccc
\n
ddd
\n
"
}
let
(
:expected
)
do
%q(<span id="LC1" class="line"><span class="gi">+aaa</span></span>
<span id="LC2" class="line"><span class="gi">+bbb</span></span>
<span id="LC3" class="line"><span class="gd">- ccc</span></span>
<span id="LC4" class="line"> ddd</span>)
end
it
'should highlight each line properly'
do
result
=
highlight
(
blob_name
,
blob_content
,
nowrap:
true
,
continue:
false
)
expect
(
result
).
to
eq
(
expected
)
end
end
end
end
This diff is collapsed.
Click to expand it.
spec/helpers/events_helper_spec.rb
View file @
15d5dfdb
...
...
@@ -58,7 +58,7 @@ describe EventsHelper do
expected
=
'<pre class="code highlight white ruby">'
\
"<code><span class=
\"
k
\"
>def</span> <span class=
\"
nf
\"
>test</span>
\n
"
\
" <span class=
\"
s1
\"
>
\'
hello world
\'
</span>
\n
"
\
"<span class=
\"
k
\"
>end</span>
\n
"
\
"<span class=
\"
k
\"
>end</span>"
\
'</code></pre>'
expect
(
event_note
(
input
)).
to
eq
(
expected
)
end
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment