Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ea6a78ef
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,发现更多精彩内容 >>
未验证
提交
ea6a78ef
编写于
11月 13, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Split complex Gitlab::InlineDiff::processing method
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
bcc82511
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
36 addition
and
19 deletion
+36
-19
lib/gitlab/inline_diff.rb
lib/gitlab/inline_diff.rb
+36
-19
未找到文件。
lib/gitlab/inline_diff.rb
浏览文件 @
ea6a78ef
...
...
@@ -16,15 +16,7 @@ module Gitlab
# Skip inline diff if empty line was replaced with content
next
if
first_line
==
"-
\n
"
first_the_same_symbols
=
0
(
0
..
max_length
+
1
).
each
do
|
i
|
first_the_same_symbols
=
i
-
1
if
first_line
[
i
]
!=
second_line
[
i
]
&&
i
>
0
break
end
end
first_token
=
first_line
[
0
..
first_the_same_symbols
][
1
..-
1
]
first_token
=
find_first_token
(
first_line
,
second_line
)
start
=
first_token
+
START
if
first_token
.
empty?
...
...
@@ -36,25 +28,50 @@ module Gitlab
diff_arr
[
index
+
2
].
sub!
(
first_token
,
first_token
=>
start
)
end
last_the_same_symbols
=
0
(
1
..
max_length
+
1
).
each
do
|
i
|
last_the_same_symbols
=
-
i
shortest_line
=
second_line
.
size
>
first_line
.
size
?
first_line
:
second_line
if
(
first_line
[
-
i
]
!=
second_line
[
-
i
]
)
||
"
#{
first_token
}#{
START
}
"
.
size
==
shortest_line
[
1
..-
i
].
size
break
end
end
last_the_same_symbols
+=
1
last_token
=
first_line
[
last_the_same_symbols
..-
1
]
last_token
=
find_last_token
(
first_line
,
second_line
,
first_token
)
# This is tricky: escape backslashes so that `sub` doesn't interpret them
# as backreferences. Regexp.escape does NOT do the right thing.
replace_token
=
FINISH
+
last_token
.
gsub
(
/\\/
,
'\&\&'
)
diff_arr
[
index
+
1
].
sub!
(
/
#{
Regexp
.
escape
(
last_token
)
}
$/
,
replace_token
)
diff_arr
[
index
+
2
].
sub!
(
/
#{
Regexp
.
escape
(
last_token
)
}
$/
,
replace_token
)
end
diff_arr
end
def
find_first_token
(
first_line
,
second_line
)
max_length
=
[
first_line
.
size
,
second_line
.
size
].
max
first_the_same_symbols
=
0
(
0
..
max_length
+
1
).
each
do
|
i
|
first_the_same_symbols
=
i
-
1
if
first_line
[
i
]
!=
second_line
[
i
]
&&
i
>
0
break
end
end
first_line
[
0
..
first_the_same_symbols
][
1
..-
1
]
end
def
find_last_token
(
first_line
,
second_line
,
first_token
)
max_length
=
[
first_line
.
size
,
second_line
.
size
].
max
last_the_same_symbols
=
0
(
1
..
max_length
+
1
).
each
do
|
i
|
last_the_same_symbols
=
-
i
shortest_line
=
second_line
.
size
>
first_line
.
size
?
first_line
:
second_line
if
(
first_line
[
-
i
]
!=
second_line
[
-
i
])
||
"
#{
first_token
}#{
START
}
"
.
size
==
shortest_line
[
1
..-
i
].
size
break
end
end
last_the_same_symbols
+=
1
first_line
[
last_the_same_symbols
..-
1
]
end
def
_indexes_of_changed_lines
(
diff_arr
)
chain_of_first_symbols
=
""
diff_arr
.
each_with_index
do
|
line
,
i
|
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录