Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
20555fb0
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,发现更多精彩内容 >>
提交
20555fb0
编写于
2月 23, 2015
作者:
M
Marcin Kosieradzki
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Implemented incremental computation of ChangedText.Lines and added tests [#608]
上级
5738b06c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
186 addition
and
0 deletion
+186
-0
src/Compilers/Core/CodeAnalysisTest/Text/TextChangeTests.cs
src/Compilers/Core/CodeAnalysisTest/Text/TextChangeTests.cs
+93
-0
src/Compilers/Core/Portable/Text/ChangedText.cs
src/Compilers/Core/Portable/Text/ChangedText.cs
+93
-0
未找到文件。
src/Compilers/Core/CodeAnalysisTest/Text/TextChangeTests.cs
浏览文件 @
20555fb0
...
...
@@ -6,6 +6,7 @@
using
Microsoft.CodeAnalysis.Text
;
using
Roslyn.Test.Utilities
;
using
Xunit
;
using
System.Collections.Generic
;
namespace
Microsoft.CodeAnalysis.UnitTests
{
...
...
@@ -220,5 +221,97 @@ public void TestGetTextChangesToChangedText()
Assert
.
Equal
(
expected
.
NewText
,
actual
.
NewText
);
}
}
sealed
class
TextLineEqualityComparer
:
IEqualityComparer
<
TextLine
>
{
public
bool
Equals
(
TextLine
x
,
TextLine
y
)
{
return
x
.
Span
==
y
.
Span
;
}
public
int
GetHashCode
(
TextLine
obj
)
{
return
obj
.
Span
.
GetHashCode
();
}
}
[
Fact
]
public
void
TestOptimizedSourceTextLinesSimpleSubstition
()
{
var
changedText
=
SourceText
.
From
(
"Line1\r\nLine2\r\nLine3"
).
WithChanges
(
new
TextChange
(
new
TextSpan
(
8
,
2
),
"IN"
),
new
TextChange
(
new
TextSpan
(
15
,
2
),
"IN"
));
Assert
.
Equal
(
SourceText
.
From
(
changedText
.
ToString
()).
Lines
,
changedText
.
Lines
,
new
TextLineEqualityComparer
());
}
[
Fact
]
public
void
TestOptimizedSourceTextLinesSubstitionWithLongerText
()
{
var
changedText
=
SourceText
.
From
(
"Line1\r\nLine2\r\nLine3"
).
WithChanges
(
new
TextChange
(
new
TextSpan
(
8
,
2
),
new
string
(
'a'
,
10
)),
new
TextChange
(
new
TextSpan
(
15
,
2
),
new
string
(
'a'
,
10
)));
Assert
.
Equal
(
SourceText
.
From
(
changedText
.
ToString
()).
Lines
,
changedText
.
Lines
,
new
TextLineEqualityComparer
());
}
[
Fact
]
public
void
TestOptimizedSourceTextLinesInsertCrLf
()
{
var
changedText
=
SourceText
.
From
(
"Line1\r\nLine2\r\nLine3"
).
WithChanges
(
new
TextChange
(
new
TextSpan
(
8
,
2
),
"\r\n"
),
new
TextChange
(
new
TextSpan
(
15
,
2
),
"\r\n"
));
Assert
.
Equal
(
SourceText
.
From
(
changedText
.
ToString
()).
Lines
,
changedText
.
Lines
,
new
TextLineEqualityComparer
());
}
[
Fact
]
public
void
TestOptimizedSourceTextLinesSimpleCr
()
{
var
changedText
=
SourceText
.
From
(
"Line1\rLine2\rLine3"
).
WithChanges
(
new
TextChange
(
new
TextSpan
(
6
,
0
),
"aa\r"
),
new
TextChange
(
new
TextSpan
(
11
,
0
),
"aa\r"
));
Assert
.
Equal
(
SourceText
.
From
(
changedText
.
ToString
()).
Lines
,
changedText
.
Lines
,
new
TextLineEqualityComparer
());
}
[
Fact
]
public
void
TestOptimizedSourceTextLinesSimpleLf
()
{
var
changedText
=
SourceText
.
From
(
"Line1\nLine2\nLine3"
).
WithChanges
(
new
TextChange
(
new
TextSpan
(
6
,
0
),
"aa\n"
),
new
TextChange
(
new
TextSpan
(
11
,
0
),
"aa\n"
));
Assert
.
Equal
(
SourceText
.
From
(
changedText
.
ToString
()).
Lines
,
changedText
.
Lines
,
new
TextLineEqualityComparer
());
}
[
Fact
]
public
void
TestOptimizedSourceTextLinesRemoveCrLf
()
{
var
changedText
=
SourceText
.
From
(
"Line1\r\nLine2\r\nLine3"
).
WithChanges
(
new
TextChange
(
new
TextSpan
(
4
,
4
),
"aaaaaa"
),
new
TextChange
(
new
TextSpan
(
15
,
4
),
"aaaaaa"
));
Assert
.
Equal
(
SourceText
.
From
(
changedText
.
ToString
()).
Lines
,
changedText
.
Lines
,
new
TextLineEqualityComparer
());
}
[
Fact
]
public
void
TestOptimizedSourceTextLinesBrakeCrLf
()
{
var
changedText
=
SourceText
.
From
(
"Test\r\nMessage"
).
WithChanges
(
new
TextChange
(
new
TextSpan
(
5
,
0
),
"aaaaaa"
));
Assert
.
Equal
(
SourceText
.
From
(
changedText
.
ToString
()).
Lines
,
changedText
.
Lines
,
new
TextLineEqualityComparer
());
}
[
Fact
]
public
void
TestOptimizedSourceTextLinesBrakeCrLfWithLfPrefixedAndCrSufixed
()
{
var
changedText
=
SourceText
.
From
(
"Test\r\nMessage"
).
WithChanges
(
new
TextChange
(
new
TextSpan
(
5
,
0
),
"\naaaaaa\r"
));
Assert
.
Equal
(
SourceText
.
From
(
changedText
.
ToString
()).
Lines
,
changedText
.
Lines
,
new
TextLineEqualityComparer
());
}
[
Fact
]
public
void
TestOptimizedSourceTextLineInsertAtEnd
()
{
var
changedText
=
SourceText
.
From
(
"Line1\r\nLine2\r\nLine3\r\n"
).
WithChanges
(
new
TextChange
(
new
TextSpan
(
21
,
0
),
"Line4\r\n"
),
new
TextChange
(
new
TextSpan
(
21
,
0
),
"Line5\r\n"
));
Assert
.
Equal
(
SourceText
.
From
(
changedText
.
ToString
()).
Lines
,
changedText
.
Lines
,
new
TextLineEqualityComparer
());
}
}
}
src/Compilers/Core/Portable/Text/ChangedText.cs
浏览文件 @
20555fb0
...
...
@@ -97,5 +97,98 @@ public override IReadOnlyList<TextChangeRange> GetChangeRanges(SourceText oldTex
return
ImmutableArray
.
Create
(
new
TextChangeRange
(
new
TextSpan
(
0
,
oldText
.
Length
),
_newText
.
Length
));
}
protected
override
TextLineCollection
GetLinesCore
()
{
var
oldLineInfo
=
_oldText
.
Lines
;
var
lineStarts
=
ArrayBuilder
<
int
>.
GetInstance
();
lineStarts
.
Add
(
0
);
// position in the original document
var
position
=
0
;
// delta generated by already processed changes (position in the new document = position + delta)
var
delta
=
0
;
// true if last segment ends with CR and we need to check for CR+LF code below assumes that both CR and LF are also line breaks alone
var
endsWithCR
=
false
;
foreach
(
var
change
in
_changes
)
{
// change.Span.Start < position already ruled out by SourceText.WithChanges
// if we've skipped a range, add
if
(
change
.
Span
.
Start
>
position
)
{
if
(
endsWithCR
&&
_newText
[
position
+
delta
]
==
'\n'
)
{
lineStarts
.
RemoveLast
();
}
var
lps
=
oldLineInfo
.
GetLinePositionSpan
(
TextSpan
.
FromBounds
(
position
,
change
.
Span
.
Start
));
for
(
int
i
=
lps
.
Start
.
Line
+
1
;
i
<=
lps
.
End
.
Line
;
i
++)
{
lineStarts
.
Add
(
oldLineInfo
[
i
].
Start
+
delta
);
}
endsWithCR
=
_oldText
[
change
.
Span
.
Start
-
1
]
==
'\r'
;
// in case change is inserted between CR+LF we treat CR as line break alone, but this line break might be retracted and replaced with new one in case LF is inserted
if
(
endsWithCR
&&
change
.
Span
.
Start
<
_oldText
.
Length
&&
_oldText
[
change
.
Span
.
Start
]
==
'\n'
)
{
lineStarts
.
Add
(
change
.
Span
.
Start
+
delta
);
}
}
if
(
change
.
NewLength
>
0
)
{
var
text
=
GetSubText
(
new
TextSpan
(
change
.
Span
.
Start
+
delta
,
change
.
NewLength
));
// optimizations copied from SourceText.LineInfo.ParseLineStarts
var
index
=
0
;
while
(
index
<
text
.
Length
)
{
char
c
=
text
[
index
++];
// Common case - ASCII & not a line break
// if (c > '\r' && c <= 127)
// if (c >= ('\r'+1) && c <= 127)
const
uint
bias
=
'\r'
+
1
;
if
(
unchecked
(
c
-
bias
)
<=
(
127
-
bias
))
{
continue
;
}
if
(
endsWithCR
&&
c
==
'\n'
)
{
lineStarts
.
RemoveLast
();
}
else
if
(
c
==
'\r'
&&
index
<
text
.
Length
&&
text
[
index
]
==
'\n'
)
{
index
++;
}
else
if
(!
TextUtilities
.
IsAnyLineBreakCharacter
(
c
))
{
continue
;
}
lineStarts
.
Add
(
change
.
Span
.
Start
+
delta
+
index
);
}
endsWithCR
=
text
[
change
.
NewLength
-
1
]
==
'\r'
;
}
position
=
change
.
Span
.
End
;
delta
+=
(
change
.
NewLength
-
change
.
Span
.
Length
);
}
if
(
position
<
_oldText
.
Length
)
{
if
(
endsWithCR
&&
_newText
[
position
+
delta
]
==
'\n'
)
{
lineStarts
.
RemoveLast
();
}
var
lps
=
oldLineInfo
.
GetLinePositionSpan
(
TextSpan
.
FromBounds
(
position
,
_oldText
.
Length
));
for
(
int
i
=
lps
.
Start
.
Line
+
1
;
i
<=
lps
.
End
.
Line
;
i
++)
{
lineStarts
.
Add
(
oldLineInfo
[
i
].
Start
+
delta
);
}
}
return
new
LineInfo
(
this
,
lineStarts
.
ToArrayAndFree
());
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录