Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c935020a
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
c935020a
编写于
4月 25, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #22688: Always use CRLF for clipboard on Windows
上级
b58327d4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
6 deletion
+15
-6
src/vs/editor/browser/controller/textAreaHandler.ts
src/vs/editor/browser/controller/textAreaHandler.ts
+1
-1
src/vs/editor/common/viewModel/viewModel.ts
src/vs/editor/common/viewModel/viewModel.ts
+1
-1
src/vs/editor/common/viewModel/viewModelImpl.ts
src/vs/editor/common/viewModel/viewModelImpl.ts
+3
-3
src/vs/editor/test/common/viewModel/viewModelImpl.test.ts
src/vs/editor/test/common/viewModel/viewModelImpl.test.ts
+10
-1
未找到文件。
src/vs/editor/browser/controller/textAreaHandler.ts
浏览文件 @
c935020a
...
...
@@ -164,7 +164,7 @@ export class TextAreaHandler extends ViewPart {
const
textAreaInputHost
:
ITextAreaInputHost
=
{
getPlainTextToCopy
:
():
string
=>
{
const
rawWhatToCopy
=
this
.
_context
.
model
.
getPlainTextToCopy
(
this
.
_selections
,
this
.
_emptySelectionClipboard
);
const
rawWhatToCopy
=
this
.
_context
.
model
.
getPlainTextToCopy
(
this
.
_selections
,
this
.
_emptySelectionClipboard
,
platform
.
isWindows
);
const
newLineCharacter
=
this
.
_context
.
model
.
getEOL
();
const
isFromEmptySelection
=
(
this
.
_emptySelectionClipboard
&&
this
.
_selections
.
length
===
1
&&
this
.
_selections
[
0
].
isEmpty
());
...
...
src/vs/editor/common/viewModel/viewModel.ts
浏览文件 @
c935020a
...
...
@@ -147,7 +147,7 @@ export interface IViewModel {
deduceModelPositionRelativeToViewPosition
(
viewAnchorPosition
:
Position
,
deltaOffset
:
number
,
lineFeedCnt
:
number
):
Position
;
getEOL
():
string
;
getPlainTextToCopy
(
ranges
:
Range
[],
emptySelectionClipboard
:
boolean
):
string
|
string
[];
getPlainTextToCopy
(
ranges
:
Range
[],
emptySelectionClipboard
:
boolean
,
forceCRLF
:
boolean
):
string
|
string
[];
getHTMLToCopy
(
ranges
:
Range
[],
emptySelectionClipboard
:
boolean
):
string
;
}
...
...
src/vs/editor/common/viewModel/viewModelImpl.ts
浏览文件 @
c935020a
...
...
@@ -570,8 +570,8 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
return
this
.
model
.
getEOL
();
}
public
getPlainTextToCopy
(
ranges
:
Range
[],
emptySelectionClipboard
:
boolean
):
string
|
string
[]
{
const
newLineCharacter
=
this
.
model
.
getEOL
();
public
getPlainTextToCopy
(
ranges
:
Range
[],
emptySelectionClipboard
:
boolean
,
forceCRLF
:
boolean
):
string
|
string
[]
{
const
newLineCharacter
=
forceCRLF
?
'
\r\n
'
:
this
.
model
.
getEOL
();
ranges
=
ranges
.
slice
(
0
);
ranges
.
sort
(
Range
.
compareRangesUsingStarts
);
...
...
@@ -599,7 +599,7 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
let
result
:
string
[]
=
[];
for
(
let
i
=
0
;
i
<
nonEmptyRanges
.
length
;
i
++
)
{
result
.
push
(
this
.
getValueInRange
(
nonEmptyRanges
[
i
],
EndOfLinePreference
.
TextDefined
));
result
.
push
(
this
.
getValueInRange
(
nonEmptyRanges
[
i
],
forceCRLF
?
EndOfLinePreference
.
CRLF
:
EndOfLinePreference
.
TextDefined
));
}
return
result
.
length
===
1
?
result
[
0
]
:
result
;
}
...
...
src/vs/editor/test/common/viewModel/viewModelImpl.test.ts
浏览文件 @
c935020a
...
...
@@ -7,6 +7,7 @@
import
*
as
assert
from
'
assert
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
testViewModel
}
from
'
vs/editor/test/common/viewModel/testViewModel
'
;
import
{
EndOfLineSequence
}
from
'
vs/editor/common/model
'
;
suite
(
'
ViewModel
'
,
()
=>
{
...
...
@@ -109,7 +110,7 @@ suite('ViewModel', () => {
function
assertGetPlainTextToCopy
(
text
:
string
[],
ranges
:
Range
[],
emptySelectionClipboard
:
boolean
,
expected
:
string
|
string
[]):
void
{
testViewModel
(
text
,
{},
(
viewModel
,
model
)
=>
{
let
actual
=
viewModel
.
getPlainTextToCopy
(
ranges
,
emptySelectionClipboard
);
let
actual
=
viewModel
.
getPlainTextToCopy
(
ranges
,
emptySelectionClipboard
,
false
);
assert
.
deepEqual
(
actual
,
expected
);
});
}
...
...
@@ -250,4 +251,12 @@ suite('ViewModel', () => {
'
line2
\n
line3
\n
'
);
});
test
(
'
issue #22688 - always use CRLF for clipboard on Windows
'
,
()
=>
{
testViewModel
(
USUAL_TEXT
,
{},
(
viewModel
,
model
)
=>
{
model
.
setEOL
(
EndOfLineSequence
.
LF
);
let
actual
=
viewModel
.
getPlainTextToCopy
([
new
Range
(
2
,
1
,
5
,
1
)],
true
,
true
);
assert
.
deepEqual
(
actual
,
'
line2
\r\n
line3
\r\n
line4
\r\n
'
);
});
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录