Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
b1a8048c
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,发现更多精彩内容 >>
提交
b1a8048c
编写于
12月 27, 2017
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix tests and groups
上级
036560ad
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
23 addition
and
19 deletion
+23
-19
extensions/markdown/package.json
extensions/markdown/package.json
+1
-1
src/vs/platform/actions/test/common/menuService.test.ts
src/vs/platform/actions/test/common/menuService.test.ts
+5
-5
src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
...arts/execution/electron-browser/execution.contribution.ts
+2
-2
src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts
.../parts/files/electron-browser/fileActions.contribution.ts
+8
-8
src/vs/workbench/parts/search/electron-browser/search.contribution.ts
...ench/parts/search/electron-browser/search.contribution.ts
+2
-2
src/vs/workbench/services/keybinding/test/node/keybindingEditing.test.ts
...h/services/keybinding/test/node/keybindingEditing.test.ts
+3
-1
src/vs/workbench/test/workbenchTestServices.ts
src/vs/workbench/test/workbenchTestServices.ts
+2
-0
未找到文件。
extensions/markdown/package.json
浏览文件 @
b1a8048c
...
...
@@ -154,7 +154,7 @@
{
"command"
:
"markdown.showPreview"
,
"when"
:
"resourceLangId == markdown"
,
"group"
:
"
2_
navigation"
"group"
:
"navigation"
}
],
"commandPalette"
:
[
...
...
src/vs/platform/actions/test/common/menuService.test.ts
浏览文件 @
b1a8048c
...
...
@@ -151,8 +151,8 @@ suite('MenuService', function () {
const
groups
=
menuService
.
createMenu
(
MenuId
.
ExplorerContext
,
contextKeyService
).
getActions
();
assert
.
equal
(
groups
.
length
,
1
);
const
[
[,
actions
]]
=
groups
;
assert
.
equal
(
groups
.
length
,
2
);
const
[
,
actions
]
=
groups
[
1
]
;
assert
.
equal
(
actions
.
length
,
3
);
const
[
one
,
two
,
three
]
=
actions
;
...
...
@@ -188,8 +188,8 @@ suite('MenuService', function () {
const
groups
=
menuService
.
createMenu
(
MenuId
.
ExplorerContext
,
contextKeyService
).
getActions
();
assert
.
equal
(
groups
.
length
,
1
);
const
[
[,
actions
]]
=
groups
;
assert
.
equal
(
groups
.
length
,
2
);
const
[
,
actions
]
=
groups
[
1
]
;
assert
.
equal
(
actions
.
length
,
4
);
const
[
one
,
two
,
three
,
four
]
=
actions
;
...
...
@@ -225,7 +225,7 @@ suite('MenuService', function () {
assert
.
equal
(
groups
.
length
,
1
);
const
[[,
actions
]]
=
groups
;
assert
.
equal
(
actions
.
length
,
3
);
assert
.
equal
(
actions
.
length
,
5
);
const
[
one
,
two
,
three
]
=
actions
;
assert
.
equal
(
one
.
id
,
'
c
'
);
assert
.
equal
(
two
.
id
,
'
b
'
);
...
...
src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
浏览文件 @
b1a8048c
...
...
@@ -163,14 +163,14 @@ const openConsoleCommand = {
};
MenuRegistry
.
appendMenuItem
(
MenuId
.
OpenEditorsContext
,
{
group
:
'
2_
navigation
'
,
group
:
'
navigation
'
,
order
:
30
,
command
:
openConsoleCommand
,
when
:
ResourceContextKey
.
Scheme
.
isEqualTo
(
'
file
'
)
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
ExplorerContext
,
{
group
:
'
2_
navigation
'
,
group
:
'
navigation
'
,
order
:
30
,
command
:
openConsoleCommand
,
when
:
ResourceContextKey
.
Scheme
.
isEqualTo
(
'
file
'
)
...
...
src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts
浏览文件 @
b1a8048c
...
...
@@ -130,7 +130,7 @@ function appendSaveConflictEditorTitleAction(id: string, title: string, iconClas
MenuRegistry
.
appendMenuItem
(
MenuId
.
EditorTitle
,
{
command
:
{
id
,
title
,
iconClass
},
when
:
ContextKeyExpr
.
equals
(
CONFLICT_RESOLUTION_CONTEXT
,
true
),
group
:
'
2_
navigation
'
,
group
:
'
navigation
'
,
order
});
}
...
...
@@ -142,7 +142,7 @@ const openToSideCommand = {
title
:
nls
.
localize
(
'
openToSide
'
,
"
Open to the Side
"
)
};
MenuRegistry
.
appendMenuItem
(
MenuId
.
OpenEditorsContext
,
{
group
:
'
2_
navigation
'
,
group
:
'
navigation
'
,
order
:
10
,
command
:
openToSideCommand
,
when
:
ResourceContextKey
.
HasResource
...
...
@@ -153,7 +153,7 @@ const revealInOsCommand = {
title
:
isWindows
?
nls
.
localize
(
'
revealInWindows
'
,
"
Reveal in Explorer
"
)
:
isMacintosh
?
nls
.
localize
(
'
revealInMac
'
,
"
Reveal in Finder
"
)
:
nls
.
localize
(
'
openContainer
'
,
"
Open Containing Folder
"
)
};
MenuRegistry
.
appendMenuItem
(
MenuId
.
OpenEditorsContext
,
{
group
:
'
2_
navigation
'
,
group
:
'
navigation
'
,
order
:
20
,
command
:
revealInOsCommand
,
when
:
ResourceContextKey
.
Scheme
.
isEqualTo
(
'
file
'
)
...
...
@@ -164,7 +164,7 @@ const copyPathCommand = {
title
:
nls
.
localize
(
'
copyPath
'
,
"
Copy Path
"
)
};
MenuRegistry
.
appendMenuItem
(
MenuId
.
OpenEditorsContext
,
{
group
:
'
2_
navigation
'
,
group
:
'
navigation
'
,
order
:
40
,
command
:
copyPathCommand
,
when
:
ResourceContextKey
.
HasResource
...
...
@@ -281,7 +281,7 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
// Menu registration - explorer
MenuRegistry
.
appendMenuItem
(
MenuId
.
ExplorerContext
,
{
group
:
'
1_new
'
,
group
:
'
navigation
'
,
order
:
4
,
command
:
{
id
:
NEW_FILE_COMMAND_ID
,
...
...
@@ -291,7 +291,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
ExplorerContext
,
{
group
:
'
1_new
'
,
group
:
'
navigation
'
,
order
:
6
,
command
:
{
id
:
NEW_FOLDER_COMMAND_ID
,
...
...
@@ -301,14 +301,14 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
ExplorerContext
,
{
group
:
'
2_
navigation
'
,
group
:
'
navigation
'
,
order
:
10
,
command
:
openToSideCommand
,
when
:
ContextKeyExpr
.
and
(
ResourceContextKey
.
Scheme
.
isEqualTo
(
'
file
'
),
ExplorerFolderContext
.
toNegated
())
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
ExplorerContext
,
{
group
:
'
2_
navigation
'
,
group
:
'
navigation
'
,
order
:
20
,
command
:
revealInOsCommand
,
when
:
ResourceContextKey
.
HasResource
...
...
src/vs/workbench/parts/search/electron-browser/search.contribution.ts
浏览文件 @
b1a8048c
...
...
@@ -220,7 +220,7 @@ CommandsRegistry.registerCommand({
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
ExplorerContext
,
{
group
:
'
2_
navigation
'
,
group
:
'
navigation
'
,
order
:
50
,
command
:
{
id
:
FIND_IN_FOLDER_ID
,
...
...
@@ -230,7 +230,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
ExplorerContext
,
{
group
:
'
2_
navigation
'
,
group
:
'
navigation
'
,
order
:
20
,
command
:
{
id
:
FIND_IN_WORKSPACE_ID
,
...
...
src/vs/workbench/services/keybinding/test/node/keybindingEditing.test.ts
浏览文件 @
b1a8048c
...
...
@@ -37,13 +37,14 @@ import { IModeService } from 'vs/editor/common/services/modeService';
import
{
ModeServiceImpl
}
from
'
vs/editor/common/services/modeServiceImpl
'
;
import
{
IModelService
}
from
'
vs/editor/common/services/modelService
'
;
import
{
ModelServiceImpl
}
from
'
vs/editor/common/services/modelServiceImpl
'
;
import
{
ContextKeyExpr
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
ContextKeyExpr
,
IContextKeyService
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
KeybindingsEditingService
}
from
'
vs/workbench/services/keybinding/common/keybindingEditing
'
;
import
{
IUserFriendlyKeybinding
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
ResolvedKeybindingItem
}
from
'
vs/platform/keybinding/common/resolvedKeybindingItem
'
;
import
{
TestConfigurationService
}
from
'
vs/platform/configuration/test/common/testConfigurationService
'
;
import
{
IHashService
}
from
'
vs/workbench/services/hash/common/hashService
'
;
import
{
mkdirp
}
from
'
vs/base/node/pfs
'
;
import
{
MockContextKeyService
}
from
'
vs/platform/keybinding/test/common/mockKeybindingService
'
;
interface
Modifiers
{
metaKey
?:
boolean
;
...
...
@@ -73,6 +74,7 @@ suite('Keybindings Editing', () => {
instantiationService
.
stub
(
IWorkspaceContextService
,
new
TestContextService
());
const
lifecycleService
=
new
TestLifecycleService
();
instantiationService
.
stub
(
ILifecycleService
,
lifecycleService
);
instantiationService
.
stub
(
IContextKeyService
,
<
IContextKeyService
>
instantiationService
.
createInstance
(
MockContextKeyService
));
instantiationService
.
stub
(
IHashService
,
new
TestHashService
());
instantiationService
.
stub
(
IEditorGroupService
,
new
TestEditorGroupService
());
instantiationService
.
stub
(
ITelemetryService
,
NullTelemetryService
);
...
...
src/vs/workbench/test/workbenchTestServices.ts
浏览文件 @
b1a8048c
...
...
@@ -60,6 +60,7 @@ import { IPosition, Position as EditorPosition } from 'vs/editor/common/core/pos
import
{
ICommandAction
}
from
'
vs/platform/actions/common/actions
'
;
import
{
IHashService
}
from
'
vs/workbench/services/hash/common/hashService
'
;
import
{
IContextKeyService
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
MockContextKeyService
}
from
'
vs/platform/keybinding/test/common/mockKeybindingService
'
;
export
function
createFileInput
(
instantiationService
:
IInstantiationService
,
resource
:
URI
):
FileEditorInput
{
return
instantiationService
.
createInstance
(
FileEditorInput
,
resource
,
void
0
);
...
...
@@ -236,6 +237,7 @@ export class TestTextFileService extends TextFileService {
export
function
workbenchInstantiationService
():
IInstantiationService
{
let
instantiationService
=
new
TestInstantiationService
(
new
ServiceCollection
([
ILifecycleService
,
new
TestLifecycleService
()]));
instantiationService
.
stub
(
IContextKeyService
,
<
IContextKeyService
>
instantiationService
.
createInstance
(
MockContextKeyService
));
instantiationService
.
stub
(
IWorkspaceContextService
,
new
TestContextService
(
TestWorkspace
));
const
configService
=
new
TestConfigurationService
();
instantiationService
.
stub
(
IConfigurationService
,
configService
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录