Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
235a5719
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
235a5719
编写于
12月 11, 2019
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
address some strict function type errors (#81574)
上级
fb98d230
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
14 addition
and
15 deletion
+14
-15
src/vs/platform/files/test/files.test.ts
src/vs/platform/files/test/files.test.ts
+3
-3
src/vs/workbench/common/editor/editorGroup.ts
src/vs/workbench/common/editor/editorGroup.ts
+4
-5
src/vs/workbench/services/editor/test/browser/editorService.test.ts
...kbench/services/editor/test/browser/editorService.test.ts
+2
-2
src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
...ch/services/textfile/common/textFileEditorModelManager.ts
+2
-2
src/vs/workbench/services/textfile/test/textFileService.test.ts
.../workbench/services/textfile/test/textFileService.test.ts
+1
-1
src/vs/workbench/test/browser/quickopen.test.ts
src/vs/workbench/test/browser/quickopen.test.ts
+2
-2
未找到文件。
src/vs/platform/files/test/files.test.ts
浏览文件 @
235a5719
...
...
@@ -42,7 +42,7 @@ suite('Files', () => {
assert
.
strictEqual
(
true
,
r1
.
gotDeleted
());
});
function
testIsEqual
(
testMethod
:
(
pA
:
string
|
undefined
,
pB
:
string
,
ignoreCase
:
boolean
)
=>
boolean
):
void
{
function
testIsEqual
(
testMethod
:
(
pA
:
string
,
pB
:
string
,
ignoreCase
:
boolean
)
=>
boolean
):
void
{
// corner cases
assert
(
testMethod
(
''
,
''
,
true
));
...
...
@@ -136,7 +136,7 @@ suite('Files', () => {
test
(
'
isEqualOrParent (ignorecase)
'
,
function
()
{
// same assertions apply as with isEqual()
testIsEqual
(
isEqualOrParent
);
testIsEqual
(
isEqualOrParent
);
//
if
(
isWindows
)
{
assert
(
isEqualOrParent
(
'
c:
\\
some
\\
path
'
,
'
c:
\\
'
,
true
));
...
...
@@ -182,4 +182,4 @@ suite('Files', () => {
assert
(
!
isEqualOrParent
(
'
foo/bar/test.ts
'
,
'
foo/BAR/test.
'
,
true
));
}
});
});
\ No newline at end of file
});
src/vs/workbench/common/editor/editorGroup.ts
浏览文件 @
235a5719
...
...
@@ -477,14 +477,13 @@ export class EditorGroup extends Disposable {
private
splice
(
index
:
number
,
del
:
boolean
,
editor
?:
EditorInput
):
void
{
const
editorToDeleteOrReplace
=
this
.
editors
[
index
];
const
args
:
(
number
|
EditorInput
)[]
=
[
index
,
del
?
1
:
0
];
// Perform on editors array
if
(
editor
)
{
args
.
push
(
editor
);
this
.
editors
.
splice
(
index
,
del
?
1
:
0
,
editor
);
}
else
{
this
.
editors
.
splice
(
index
,
del
?
1
:
0
);
}
// Perform on editors array
this
.
editors
.
splice
.
apply
(
this
.
editors
,
args
);
// Add
if
(
!
del
&&
editor
)
{
this
.
mru
.
push
(
editor
);
// make it LRU editor
...
...
src/vs/workbench/services/editor/test/browser/editorService.test.ts
浏览文件 @
235a5719
...
...
@@ -7,7 +7,7 @@ import * as assert from 'assert';
import
{
IEditorModel
,
EditorActivation
}
from
'
vs/platform/editor/common/editor
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
BaseEditor
}
from
'
vs/workbench/browser/parts/editor/baseEditor
'
;
import
{
EditorInput
,
EditorOptions
,
IFileEditorInput
,
IEditorInput
,
GroupIdentifier
,
ISaveOptions
,
IRevertOptions
}
from
'
vs/workbench/common/editor
'
;
import
{
EditorInput
,
EditorOptions
,
IFileEditorInput
,
GroupIdentifier
,
ISaveOptions
,
IRevertOptions
}
from
'
vs/workbench/common/editor
'
;
import
{
workbenchInstantiationService
,
TestStorageService
}
from
'
vs/workbench/test/workbenchTestServices
'
;
import
{
ResourceEditorInput
}
from
'
vs/workbench/common/editor/resourceEditorInput
'
;
import
{
TestThemeService
}
from
'
vs/platform/theme/test/common/testThemeService
'
;
...
...
@@ -354,7 +354,7 @@ suite('EditorService', () => {
const
inp
=
instantiationService
.
createInstance
(
ResourceEditorInput
,
'
name
'
,
'
description
'
,
URI
.
parse
(
'
my://resource-delegate
'
),
undefined
);
const
delegate
=
instantiationService
.
createInstance
(
DelegatingEditorService
);
delegate
.
setEditorOpenHandler
((
delegate
,
group
:
IEditorGroup
,
input
:
IEditorInput
,
options
?:
EditorOptions
)
=>
{
delegate
.
setEditorOpenHandler
((
delegate
,
group
,
input
,
options
?
)
=>
{
assert
.
strictEqual
(
input
,
inp
);
done
();
...
...
src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
浏览文件 @
235a5719
...
...
@@ -128,8 +128,8 @@ export class TextFileEditorModelManager extends Disposable implements ITextFileE
}
}
private
debounce
(
event
:
Event
<
TextFileModelChangeEvent
>
):
Event
<
ReadonlyArray
<
TextFileModelChangeEvent
>
>
{
return
Event
.
debounce
(
event
,
(
prev
:
TextFileModelChangeEvent
[],
cur
:
TextFileModelChangeEvent
)
=>
{
private
debounce
(
event
:
Event
<
TextFileModelChangeEvent
>
):
Event
<
TextFileModelChangeEvent
[]
>
{
return
Event
.
debounce
<
TextFileModelChangeEvent
,
TextFileModelChangeEvent
[]
>
(
event
,
(
prev
,
cur
)
=>
{
if
(
!
prev
)
{
prev
=
[
cur
];
}
else
{
...
...
src/vs/workbench/services/textfile/test/textFileService.test.ts
浏览文件 @
235a5719
...
...
@@ -414,7 +414,7 @@ suite('Files - TextFileService', () => {
});
});
async
function
hotExitTest
(
this
:
any
,
setting
:
string
,
shutdownReason
:
ShutdownReason
,
multipleWindows
:
boolean
,
workspace
:
true
,
shouldVeto
:
boolean
):
Promise
<
void
>
{
async
function
hotExitTest
(
this
:
any
,
setting
:
string
,
shutdownReason
:
ShutdownReason
,
multipleWindows
:
boolean
,
workspace
:
boolean
,
shouldVeto
:
boolean
):
Promise
<
void
>
{
model
=
instantiationService
.
createInstance
(
TextFileEditorModel
,
toResource
.
call
(
this
,
'
/path/file.txt
'
),
'
utf8
'
,
undefined
);
(
<
TextFileEditorModelManager
>
accessor
.
textFileService
.
models
).
add
(
model
.
resource
,
model
);
...
...
src/vs/workbench/test/browser/quickopen.test.ts
浏览文件 @
235a5719
...
...
@@ -71,8 +71,8 @@ suite('QuickOpen', () => {
});
test
(
'
QuickOpen Action
'
,
()
=>
{
let
defaultAction
=
new
QuickOpenAction
(
'
id
'
,
'
label
'
,
(
undefined
)
!
,
new
TestQuickOpenService
(
(
prefix
:
string
)
=>
assert
(
!
prefix
)));
let
prefixAction
=
new
QuickOpenAction
(
'
id
'
,
'
label
'
,
'
,
'
,
new
TestQuickOpenService
(
(
prefix
:
string
)
=>
assert
(
!!
prefix
)));
let
defaultAction
=
new
QuickOpenAction
(
'
id
'
,
'
label
'
,
(
undefined
)
!
,
new
TestQuickOpenService
(
prefix
=>
assert
(
!
prefix
)));
let
prefixAction
=
new
QuickOpenAction
(
'
id
'
,
'
label
'
,
'
,
'
,
new
TestQuickOpenService
(
prefix
=>
assert
(
!!
prefix
)));
defaultAction
.
run
();
prefixAction
.
run
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录