Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
05e4c24c
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,发现更多精彩内容 >>
提交
05e4c24c
编写于
10月 29, 2019
作者:
A
Allison Chou
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactoring
上级
5b95097c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
36 deletion
+22
-36
src/EditorFeatures/CSharp/SplitStringLiteral/SplitStringLiteralCommandHandler.cs
...rp/SplitStringLiteral/SplitStringLiteralCommandHandler.cs
+20
-34
src/EditorFeatures/CSharpTest/SplitStringLiteral/SplitStringLiteralCommandHandlerTests.cs
...litStringLiteral/SplitStringLiteralCommandHandlerTests.cs
+2
-2
未找到文件。
src/EditorFeatures/CSharp/SplitStringLiteral/SplitStringLiteralCommandHandler.cs
浏览文件 @
05e4c24c
...
@@ -63,47 +63,33 @@ public bool ExecuteCommandWorker(ReturnKeyCommandArgs args)
...
@@ -63,47 +63,33 @@ public bool ExecuteCommandWorker(ReturnKeyCommandArgs args)
}
}
var
caret
=
textView
.
GetCaretPoint
(
subjectBuffer
);
var
caret
=
textView
.
GetCaretPoint
(
subjectBuffer
);
if
(
caret
!
=
null
)
if
(
caret
=
=
null
)
{
{
// First, we need to verify that we are only working with string literals.
return
false
;
// Otherwise, let the editor handle all carets.
}
for
(
var
spanIndex
=
0
;
spanIndex
<
spans
.
Count
;
spanIndex
++)
// First, we need to verify that we are only working with string literals.
// Otherwise, let the editor handle all carets.
foreach
(
var
span
in
spans
)
{
var
spanStart
=
span
.
Start
;
var
line
=
subjectBuffer
.
CurrentSnapshot
.
GetLineFromPosition
(
span
.
Start
);
if
(!
LineContainsQuote
(
line
,
span
.
Start
))
{
{
var
spanStart
=
spans
[
spanIndex
].
Start
;
return
false
;
var
line
=
subjectBuffer
.
CurrentSnapshot
.
GetLineFromPosition
(
spanStart
);
if
(!
LineContainsQuote
(
line
,
spanStart
))
{
return
false
;
}
}
}
}
// We now go through the verified string literals and split each of them.
// We now go through the verified string literals and split each of them.
for
(
var
spanIndex
=
0
;
spanIndex
<
spans
.
Count
;
spanIndex
++)
foreach
(
var
span
in
spans
.
Reverse
())
{
if
(!
SplitString
(
textView
,
subjectBuffer
,
span
.
Start
))
{
{
var
spanStart
=
spans
[
spanIndex
].
Start
;
return
false
;
// Multi-caret case
if
(
spanIndex
>
0
)
{
caret
=
textView
.
GetCaretPoint
(
subjectBuffer
);
if
(
caret
==
null
)
{
return
false
;
}
// We change the span's starting point based on how much space was added from the last split.
var
addedSpan
=
caret
.
Value
.
Subtract
(
spans
[
spanIndex
-
1
].
Start
);
spanStart
=
new
SnapshotPoint
(
caret
.
Value
.
Snapshot
,
addedSpan
.
Position
+
spanStart
.
Position
);
}
if
(!
SplitString
(
textView
,
subjectBuffer
,
spanStart
))
{
return
false
;
}
}
}
return
true
;
}
}
return
false
;
return
true
;
}
}
private
bool
SplitString
(
ITextView
textView
,
ITextBuffer
subjectBuffer
,
SnapshotPoint
caret
)
private
bool
SplitString
(
ITextView
textView
,
ITextBuffer
subjectBuffer
,
SnapshotPoint
caret
)
...
...
src/EditorFeatures/CSharpTest/SplitStringLiteral/SplitStringLiteralCommandHandlerTests.cs
浏览文件 @
05e4c24c
...
@@ -68,7 +68,7 @@ public class SplitStringLiteralCommandHandlerTests
...
@@ -68,7 +68,7 @@ public class SplitStringLiteralCommandHandlerTests
out
var
expectedOutput
,
out
ImmutableArray
<
TextSpan
>
expectedSpans
);
out
var
expectedOutput
,
out
ImmutableArray
<
TextSpan
>
expectedSpans
);
Assert
.
Equal
(
expectedOutput
,
view
.
TextBuffer
.
CurrentSnapshot
.
AsText
().
ToString
());
Assert
.
Equal
(
expectedOutput
,
view
.
TextBuffer
.
CurrentSnapshot
.
AsText
().
ToString
());
Assert
.
Equal
(
expectedSpans
.
La
st
().
Start
,
view
.
Caret
.
Position
.
BufferPosition
.
Position
);
Assert
.
Equal
(
expectedSpans
.
Fir
st
().
Start
,
view
.
Caret
.
Position
.
BufferPosition
.
Position
);
if
(
verifyUndo
)
if
(
verifyUndo
)
{
{
...
@@ -78,7 +78,7 @@ public class SplitStringLiteralCommandHandlerTests
...
@@ -78,7 +78,7 @@ public class SplitStringLiteralCommandHandlerTests
var
currentSnapshot
=
document
.
GetTextBuffer
().
CurrentSnapshot
;
var
currentSnapshot
=
document
.
GetTextBuffer
().
CurrentSnapshot
;
Assert
.
Equal
(
originalSnapshot
.
GetText
(),
currentSnapshot
.
GetText
());
Assert
.
Equal
(
originalSnapshot
.
GetText
(),
currentSnapshot
.
GetText
());
Assert
.
Equal
(
originalSelections
.
La
st
().
Start
,
view
.
Caret
.
Position
.
BufferPosition
.
Position
);
Assert
.
Equal
(
originalSelections
.
Fir
st
().
Start
,
view
.
Caret
.
Position
.
BufferPosition
.
Position
);
}
}
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录