Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
6c4de0b9
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6c4de0b9
编写于
3月 19, 2020
作者:
C
Cyrus Najmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
make static
上级
9872e3c1
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
8 addition
and
8 deletion
+8
-8
src/Features/Core/Portable/ConflictMarkerResolution/AbstractConflictMarkerCodeFixProvider.cs
...MarkerResolution/AbstractConflictMarkerCodeFixProvider.cs
+8
-8
未找到文件。
src/Features/Core/Portable/ConflictMarkerResolution/AbstractConflictMarkerCodeFixProvider.cs
浏览文件 @
6c4de0b9
...
...
@@ -99,7 +99,7 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
return
true
;
}
private
bool
TryGetConflictLines
(
private
static
bool
TryGetConflictLines
(
SourceText
text
,
int
position
,
out
TextLine
startLine
,
out
TextLine
middleLine
,
out
TextLine
endLine
)
{
...
...
@@ -127,7 +127,7 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
}
}
private
bool
TryFindLineForwards
(
TextLine
startLine
,
char
ch
,
out
TextLine
foundLine
)
private
static
bool
TryFindLineForwards
(
TextLine
startLine
,
char
ch
,
out
TextLine
foundLine
)
{
var
text
=
startLine
.
Text
!;
var
lines
=
text
.
Lines
;
...
...
@@ -145,7 +145,7 @@ private bool TryFindLineForwards(TextLine startLine, char ch, out TextLine found
return
false
;
}
private
bool
TryFindLineBackwards
(
TextLine
startLine
,
char
ch
,
out
TextLine
foundLine
)
private
static
bool
TryFindLineBackwards
(
TextLine
startLine
,
char
ch
,
out
TextLine
foundLine
)
{
var
text
=
startLine
.
Text
!;
var
lines
=
text
.
Lines
;
...
...
@@ -163,7 +163,7 @@ private bool TryFindLineBackwards(TextLine startLine, char ch, out TextLine foun
return
false
;
}
private
bool
IsConflictMarker
(
TextLine
currentLine
,
char
ch
)
private
static
bool
IsConflictMarker
(
TextLine
currentLine
,
char
ch
)
{
var
text
=
currentLine
.
Text
!;
var
currentLineStart
=
currentLine
.
Start
;
...
...
@@ -220,7 +220,7 @@ private bool IsConflictMarker(TextLine currentLine, char ch)
context
.
Diagnostics
);
}
private
async
Task
<
Document
>
AddEditsAsync
(
private
static
async
Task
<
Document
>
AddEditsAsync
(
Document
document
,
int
startPos
,
int
equalsPos
,
int
endPos
,
Action
<
SourceText
,
ArrayBuilder
<
TextChange
>,
int
,
int
,
int
>
addEdits
,
CancellationToken
cancellationToken
)
...
...
@@ -277,13 +277,13 @@ private bool IsConflictMarker(TextLine currentLine, char ch)
edits
.
Add
(
new
TextChange
(
TextSpan
.
FromBounds
(
endPos
,
bottomEnd
),
""
));
}
private
Task
<
Document
>
TakeTopAsync
(
Document
document
,
int
startPos
,
int
equalsPos
,
int
endPos
,
CancellationToken
cancellationToken
)
private
static
Task
<
Document
>
TakeTopAsync
(
Document
document
,
int
startPos
,
int
equalsPos
,
int
endPos
,
CancellationToken
cancellationToken
)
=>
AddEditsAsync
(
document
,
startPos
,
equalsPos
,
endPos
,
AddTopEdits
,
cancellationToken
);
private
Task
<
Document
>
TakeBottomAsync
(
Document
document
,
int
startPos
,
int
equalsPos
,
int
endPos
,
CancellationToken
cancellationToken
)
private
static
Task
<
Document
>
TakeBottomAsync
(
Document
document
,
int
startPos
,
int
equalsPos
,
int
endPos
,
CancellationToken
cancellationToken
)
=>
AddEditsAsync
(
document
,
startPos
,
equalsPos
,
endPos
,
AddBottomEdits
,
cancellationToken
);
private
Task
<
Document
>
TakeBothAsync
(
Document
document
,
int
startPos
,
int
equalsPos
,
int
endPos
,
CancellationToken
cancellationToken
)
private
static
Task
<
Document
>
TakeBothAsync
(
Document
document
,
int
startPos
,
int
equalsPos
,
int
endPos
,
CancellationToken
cancellationToken
)
=>
AddEditsAsync
(
document
,
startPos
,
equalsPos
,
endPos
,
AddBothEdits
,
cancellationToken
);
private
static
int
GetEndIncludingLineBreak
(
SourceText
text
,
int
position
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录