Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
7f3e830d
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,发现更多精彩内容 >>
提交
7f3e830d
编写于
9月 30, 2015
作者:
C
Charles Stoner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use correct span to determine block kind
上级
f85b53ea
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
9 deletion
+9
-9
src/InteractiveWindow/Editor/InteractiveWindow.UIThreadOnly.cs
...nteractiveWindow/Editor/InteractiveWindow.UIThreadOnly.cs
+1
-1
src/InteractiveWindow/EditorTest/InteractiveWindowTests.cs
src/InteractiveWindow/EditorTest/InteractiveWindowTests.cs
+8
-8
未找到文件。
src/InteractiveWindow/Editor/InteractiveWindow.UIThreadOnly.cs
浏览文件 @
7f3e830d
...
...
@@ -2521,7 +2521,7 @@ private void GetTextBlocks(List<BufferBlock> blocks, SnapshotSpan span)
var
intersection
=
sourceSpan
.
Span
.
Intersection
(
mappedSpan
);
if
(
intersection
.
HasValue
&&
!
intersection
.
Value
.
IsEmpty
)
{
var
kind
=
GetSpanKind
(
span
);
var
kind
=
GetSpanKind
(
s
ourceS
pan
);
if
(
kind
==
ReplSpanKind
.
LineBreak
)
{
kind
=
ReplSpanKind
.
Output
;
...
...
src/InteractiveWindow/EditorTest/InteractiveWindowTests.cs
浏览文件 @
7f3e830d
...
...
@@ -624,7 +624,7 @@ public void CopyInputAndOutput()
3
> "
,
@"> foreach (var o in new[] \{ 1, 2, 3 \})\par > System.Console.WriteLine();\par 1\par 2\par 3\par > "
,
@"[{""content"":""> "",""kind"":
2},{""content"":""foreach (var o in new[] { 1, 2, 3 })\u000d\u000a"",""kind"":2},{""content"":""> "",""kind"":2},{""content"":""System.Console.WriteLine();\u000d\u000a"",""kind"":2},{""content"":""1\u000d\u000a2\u000d\u000a3\u000d\u000a"",""kind"":2},{""content"":""> "",""kind"":2
}]"
);
@"[{""content"":""> "",""kind"":
0},{""content"":""foreach (var o in new[] { 1, 2, 3 })\u000d\u000a"",""kind"":2},{""content"":""> "",""kind"":0},{""content"":""System.Console.WriteLine();\u000d\u000a"",""kind"":2},{""content"":""1\u000d\u000a2\u000d\u000a3\u000d\u000a"",""kind"":1},{""content"":""> "",""kind"":0
}]"
);
// Shrink the selection.
var
selection
=
Window
.
TextView
.
Selection
;
...
...
@@ -638,7 +638,7 @@ public void CopyInputAndOutput()
2
3"
,
@"oreach (var o in new[] \{ 1, 2, 3 \})\par > System.Console.WriteLine();\par 1\par 2\par 3"
,
@"[{""content"":""oreach (var o in new[] { 1, 2, 3 })\u000d\u000a"",""kind"":2},{""content"":""> "",""kind"":
2},{""content"":""System.Console.WriteLine();\u000d\u000a"",""kind"":2},{""content"":""1\u000d\u000a2\u000d\u000a3"",""kind"":2
}]"
);
@"[{""content"":""oreach (var o in new[] { 1, 2, 3 })\u000d\u000a"",""kind"":2},{""content"":""> "",""kind"":
0},{""content"":""System.Console.WriteLine();\u000d\u000a"",""kind"":2},{""content"":""1\u000d\u000a2\u000d\u000a3"",""kind"":1
}]"
);
}
[
Fact
(
Skip
=
"5544"
),
WorkItem
(
5544
,
"https://github.com/dotnet/roslyn/issues/5544"
)]
...
...
@@ -705,12 +705,12 @@ public void CopyNoSelection()
@" 1
2 "
);
CopyNoSelectionAndVerify
(
0
,
7
,
"> s +\r\n"
,
@"> s +\par "
,
@"[{""content"":""> "",""kind"":
2
},{""content"":""s +\u000d\u000a"",""kind"":2}]"
);
CopyNoSelectionAndVerify
(
7
,
11
,
"> \r\n"
,
@"> \par "
,
@"[{""content"":""> "",""kind"":
2
},{""content"":""\u000d\u000a"",""kind"":2}]"
);
CopyNoSelectionAndVerify
(
11
,
17
,
"> t\r\n"
,
@"> t\par "
,
@"[{""content"":""> "",""kind"":
2
},{""content"":"" t\u000d\u000a"",""kind"":2}]"
);
CopyNoSelectionAndVerify
(
17
,
21
,
" 1\r\n"
,
@" 1\par "
,
@"[{""content"":"" 1\u000d\u000a"",""kind"":
2
}]"
);
CopyNoSelectionAndVerify
(
21
,
23
,
"\r\n"
,
@"\par "
,
@"[{""content"":""\u000d\u000a"",""kind"":
2
}]"
);
CopyNoSelectionAndVerify
(
23
,
28
,
"2 > "
,
"2 > "
,
@"[{""content"":""2 "",""kind"":
2},{""content"":""> "",""kind"":2
}]"
);
CopyNoSelectionAndVerify
(
0
,
7
,
"> s +\r\n"
,
@"> s +\par "
,
@"[{""content"":""> "",""kind"":
0
},{""content"":""s +\u000d\u000a"",""kind"":2}]"
);
CopyNoSelectionAndVerify
(
7
,
11
,
"> \r\n"
,
@"> \par "
,
@"[{""content"":""> "",""kind"":
0
},{""content"":""\u000d\u000a"",""kind"":2}]"
);
CopyNoSelectionAndVerify
(
11
,
17
,
"> t\r\n"
,
@"> t\par "
,
@"[{""content"":""> "",""kind"":
0
},{""content"":"" t\u000d\u000a"",""kind"":2}]"
);
CopyNoSelectionAndVerify
(
17
,
21
,
" 1\r\n"
,
@" 1\par "
,
@"[{""content"":"" 1\u000d\u000a"",""kind"":
1
}]"
);
CopyNoSelectionAndVerify
(
21
,
23
,
"\r\n"
,
@"\par "
,
@"[{""content"":""\u000d\u000a"",""kind"":
1
}]"
);
CopyNoSelectionAndVerify
(
23
,
28
,
"2 > "
,
"2 > "
,
@"[{""content"":""2 "",""kind"":
1},{""content"":""> "",""kind"":0
}]"
);
}
private
void
CopyNoSelectionAndVerify
(
int
start
,
int
end
,
string
expectedText
,
string
expectedRtf
,
string
expectedRepl
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录