Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f5cc3f63
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
f5cc3f63
编写于
7月 11, 2016
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Render inline diffs for multiple changed lines following eachother
上级
92772f85
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
57 addition
and
24 deletion
+57
-24
CHANGELOG
CHANGELOG
+1
-0
lib/gitlab/diff/inline_diff.rb
lib/gitlab/diff/inline_diff.rb
+38
-14
spec/lib/gitlab/diff/inline_diff_spec.rb
spec/lib/gitlab/diff/inline_diff_spec.rb
+18
-10
未找到文件。
CHANGELOG
浏览文件 @
f5cc3f63
...
...
@@ -25,6 +25,7 @@ v 8.10.0 (unreleased)
- Updated layout for Projects, Groups, Users on Admin area !4424
- Fix changing issue state columns in milestone view
- Add notification settings dropdown for groups
- Render inline diffs for multiple changed lines following eachother
- Wildcards for protected branches. !4665
- Allow importing from Github using Personal Access Tokens. (Eric K Idema)
- API: Todos !3188 (Robert Schilling)
...
...
lib/gitlab/diff/inline_diff.rb
浏览文件 @
f5cc3f63
module
Gitlab
module
Diff
class
InlineDiff
# Regex to find a run of deleted lines followed by the same number of added lines
REGEX
=
%r{
# Runs start at the beginning of the string (the first line) or after a space (for an unchanged line)
(?:
\A
| )
# This matches a number of `-`s followed by the same number of `+`s through recursion
(?<del_ins>
-
\g
<del_ins>?
\+
)
# Runs end at the end of the string (the last line) or before a space (for an unchanged line)
(?= |
\z
)
}x
.
freeze
attr_accessor
:old_line
,
:new_line
,
:offset
def
self
.
for_lines
(
lines
)
local_edit_indexes
=
self
.
find_local_edit
s
(
lines
)
changed_line_pairs
=
self
.
find_changed_line_pair
s
(
lines
)
inline_diffs
=
[]
local_edit_indexes
.
each
do
|
index
|
old_index
=
index
new_index
=
index
+
1
changed_line_pairs
.
each
do
|
old_index
,
new_index
|
old_line
=
lines
[
old_index
]
new_line
=
lines
[
new_index
]
...
...
@@ -51,18 +65,28 @@ module Gitlab
private
def
self
.
find_local_edits
(
lines
)
line_prefixes
=
lines
.
map
{
|
line
|
line
.
match
(
/\A([+-])/
)
?
$1
:
' '
}
joined_line_prefixes
=
"
#{
line_prefixes
.
join
}
"
offset
=
0
local_edit_indexes
=
[]
while
index
=
joined_line_prefixes
.
index
(
" -+ "
,
offset
)
local_edit_indexes
<<
index
offset
=
index
+
1
# Finds pairs of old/new line pairs that represent the same line that changed
def
self
.
find_changed_line_pairs
(
lines
)
# Prefixes of all diff lines, indicating their types
# For example: `" - + -+ ---+++ --+ -++"`
line_prefixes
=
lines
.
each_with_object
(
""
)
{
|
line
,
s
|
s
<<
line
[
0
]
}.
gsub
(
/[^ +-]/
,
' '
)
changed_line_pairs
=
[]
line_prefixes
.
scan
(
REGEX
)
do
# For `"---+++"`, `begin_index == 0`, `end_index == 6`
begin_index
,
end_index
=
Regexp
.
last_match
.
offset
(
:del_ins
)
# For `"---+++"`, `changed_line_count == 3`
changed_line_count
=
(
end_index
-
begin_index
)
/
2
halfway_index
=
begin_index
+
changed_line_count
(
begin_index
...
halfway_index
).
each
do
|
i
|
# For `"---+++"`, index 1 maps to 1 + 3 = 4
changed_line_pairs
<<
[
i
,
i
+
changed_line_count
]
end
end
local_edit_indexe
s
changed_line_pair
s
end
def
longest_common_prefix
(
a
,
b
)
...
...
spec/lib/gitlab/diff/inline_diff_spec.rb
浏览文件 @
f5cc3f63
...
...
@@ -3,14 +3,19 @@ require 'spec_helper'
describe
Gitlab
::
Diff
::
InlineDiff
,
lib:
true
do
describe
'.for_lines'
do
let
(
:diff
)
do
<<
eos
class Test
- def initialize(test = true)
+ def initialize(test = false)
@test = test
end
end
eos
<<-
EOF
.
strip_heredoc
class Test
- def initialize(test = true)
+ def initialize(test = false)
@test = test
- if true
- @foo = "bar"
+ unless false
+ @foo = "baz"
end
end
end
EOF
end
let
(
:subject
)
{
described_class
.
for_lines
(
diff
.
lines
)
}
...
...
@@ -20,8 +25,11 @@ eos
expect
(
subject
[
1
]).
to
eq
([
25
..
27
])
expect
(
subject
[
2
]).
to
eq
([
25
..
28
])
expect
(
subject
[
3
]).
to
be_nil
expect
(
subject
[
4
]).
to
be_nil
expect
(
subject
[
5
]).
to
be_nil
expect
(
subject
[
4
]).
to
eq
([
5
..
10
])
expect
(
subject
[
5
]).
to
eq
([
17
..
17
])
expect
(
subject
[
6
]).
to
eq
([
5
..
15
])
expect
(
subject
[
7
]).
to
eq
([
17
..
17
])
expect
(
subject
[
8
]).
to
be_nil
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录