Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
3c2a40f6
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,发现更多精彩内容 >>
提交
3c2a40f6
编写于
12月 12, 2018
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixes #64864
上级
77e4eb5b
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
23 addition
and
8 deletion
+23
-8
src/vs/workbench/parts/scm/electron-browser/scmMenus.ts
src/vs/workbench/parts/scm/electron-browser/scmMenus.ts
+21
-6
src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
+2
-2
未找到文件。
src/vs/workbench/parts/scm/electron-browser/scmMenus.ts
浏览文件 @
3c2a40f6
...
@@ -24,6 +24,11 @@ interface ISCMResourceGroupMenuEntry extends IDisposable {
...
@@ -24,6 +24,11 @@ interface ISCMResourceGroupMenuEntry extends IDisposable {
readonly
group
:
ISCMResourceGroup
;
readonly
group
:
ISCMResourceGroup
;
}
}
interface
ISCMMenus
{
readonly
resourceGroupMenu
:
IMenu
;
readonly
resourceMenu
:
IMenu
;
}
export
function
getSCMResourceContextKey
(
resource
:
ISCMResourceGroup
|
ISCMResource
):
string
{
export
function
getSCMResourceContextKey
(
resource
:
ISCMResourceGroup
|
ISCMResource
):
string
{
return
isSCMResource
(
resource
)
?
resource
.
resourceGroup
.
id
:
resource
.
id
;
return
isSCMResource
(
resource
)
?
resource
.
resourceGroup
.
id
:
resource
.
id
;
}
}
...
@@ -39,7 +44,7 @@ export class SCMMenus implements IDisposable {
...
@@ -39,7 +44,7 @@ export class SCMMenus implements IDisposable {
readonly
onDidChangeTitle
:
Event
<
void
>
=
this
.
_onDidChangeTitle
.
event
;
readonly
onDidChangeTitle
:
Event
<
void
>
=
this
.
_onDidChangeTitle
.
event
;
private
readonly
resourceGroupMenuEntries
:
ISCMResourceGroupMenuEntry
[]
=
[];
private
readonly
resourceGroupMenuEntries
:
ISCMResourceGroupMenuEntry
[]
=
[];
private
readonly
resourceGroupMenus
=
new
Map
<
ISCMResourceGroup
,
I
Menu
>
();
private
readonly
resourceGroupMenus
=
new
Map
<
ISCMResourceGroup
,
I
SCMMenus
>
();
private
readonly
disposables
:
IDisposable
[]
=
[];
private
readonly
disposables
:
IDisposable
[]
=
[];
...
@@ -115,12 +120,20 @@ export class SCMMenus implements IDisposable {
...
@@ -115,12 +120,20 @@ export class SCMMenus implements IDisposable {
return
result
;
return
result
;
}
}
getMenu
(
group
:
ISCMResourceGroup
):
IMenu
{
get
ResourceGroup
Menu
(
group
:
ISCMResourceGroup
):
IMenu
{
if
(
!
this
.
resourceGroupMenus
.
has
(
group
))
{
if
(
!
this
.
resourceGroupMenus
.
has
(
group
))
{
throw
new
Error
(
'
SCM Resource Group menu not found
'
);
throw
new
Error
(
'
SCM Resource Group menu not found
'
);
}
}
return
this
.
resourceGroupMenus
.
get
(
group
)
!
;
return
this
.
resourceGroupMenus
.
get
(
group
)
!
.
resourceGroupMenu
;
}
getResourceMenu
(
group
:
ISCMResourceGroup
):
IMenu
{
if
(
!
this
.
resourceGroupMenus
.
has
(
group
))
{
throw
new
Error
(
'
SCM Resource Group menu not found
'
);
}
return
this
.
resourceGroupMenus
.
get
(
group
)
!
.
resourceMenu
;
}
}
private
onDidSpliceGroups
({
start
,
deleteCount
,
toInsert
}:
ISplice
<
ISCMResourceGroup
>
):
void
{
private
onDidSpliceGroups
({
start
,
deleteCount
,
toInsert
}:
ISplice
<
ISCMResourceGroup
>
):
void
{
...
@@ -129,15 +142,17 @@ export class SCMMenus implements IDisposable {
...
@@ -129,15 +142,17 @@ export class SCMMenus implements IDisposable {
contextKeyService
.
createKey
(
'
scmProvider
'
,
group
.
provider
.
contextValue
);
contextKeyService
.
createKey
(
'
scmProvider
'
,
group
.
provider
.
contextValue
);
contextKeyService
.
createKey
(
'
scmResourceGroup
'
,
getSCMResourceContextKey
(
group
));
contextKeyService
.
createKey
(
'
scmResourceGroup
'
,
getSCMResourceContextKey
(
group
));
const
menu
=
this
.
menuService
.
createMenu
(
MenuId
.
SCMResourceGroupContext
,
contextKeyService
);
const
resourceGroupMenu
=
this
.
menuService
.
createMenu
(
MenuId
.
SCMResourceGroupContext
,
contextKeyService
);
const
resourceMenu
=
this
.
menuService
.
createMenu
(
MenuId
.
SCMResourceContext
,
contextKeyService
);
this
.
resourceGroupMenus
.
set
(
group
,
menu
);
this
.
resourceGroupMenus
.
set
(
group
,
{
resourceGroupMenu
,
resourceMenu
}
);
return
{
return
{
group
,
group
,
dispose
()
{
dispose
()
{
contextKeyService
.
dispose
();
contextKeyService
.
dispose
();
menu
.
dispose
();
resourceGroupMenu
.
dispose
();
resourceMenu
.
dispose
();
}
}
};
};
});
});
...
...
src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
浏览文件 @
3c2a40f6
...
@@ -423,7 +423,7 @@ class ResourceGroupRenderer implements IListRenderer<ISCMResourceGroup, Resource
...
@@ -423,7 +423,7 @@ class ResourceGroupRenderer implements IListRenderer<ISCMResourceGroup, Resource
template
.
actionBar
.
context
=
group
;
template
.
actionBar
.
context
=
group
;
const
disposables
:
IDisposable
[]
=
[];
const
disposables
:
IDisposable
[]
=
[];
disposables
.
push
(
connectPrimaryMenuToInlineActionBar
(
this
.
menus
.
getMenu
(
group
),
template
.
actionBar
));
disposables
.
push
(
connectPrimaryMenuToInlineActionBar
(
this
.
menus
.
get
ResourceGroup
Menu
(
group
),
template
.
actionBar
));
const
updateCount
=
()
=>
template
.
count
.
setCount
(
group
.
elements
.
length
);
const
updateCount
=
()
=>
template
.
count
.
setCount
(
group
.
elements
.
length
);
group
.
onDidSplice
(
updateCount
,
null
,
disposables
);
group
.
onDidSplice
(
updateCount
,
null
,
disposables
);
...
@@ -516,7 +516,7 @@ class ResourceRenderer implements IListRenderer<ISCMResource, ResourceTemplate>
...
@@ -516,7 +516,7 @@ class ResourceRenderer implements IListRenderer<ISCMResource, ResourceTemplate>
template
.
actionBar
.
context
=
resource
;
template
.
actionBar
.
context
=
resource
;
const
disposables
:
IDisposable
[]
=
[];
const
disposables
:
IDisposable
[]
=
[];
disposables
.
push
(
connectPrimaryMenuToInlineActionBar
(
this
.
menus
.
getMenu
(
resource
.
resourceGroup
),
template
.
actionBar
));
disposables
.
push
(
connectPrimaryMenuToInlineActionBar
(
this
.
menus
.
get
Resource
Menu
(
resource
.
resourceGroup
),
template
.
actionBar
));
toggleClass
(
template
.
name
,
'
strike-through
'
,
resource
.
decorations
.
strikeThrough
);
toggleClass
(
template
.
name
,
'
strike-through
'
,
resource
.
decorations
.
strikeThrough
);
toggleClass
(
template
.
element
,
'
faded
'
,
resource
.
decorations
.
faded
);
toggleClass
(
template
.
element
,
'
faded
'
,
resource
.
decorations
.
faded
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录