Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
24689696
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,发现更多精彩内容 >>
提交
24689696
编写于
10月 15, 2019
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix scm resource folder actions
related to #82264
上级
4a819203
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
18 addition
and
11 deletion
+18
-11
src/vs/workbench/contrib/scm/browser/repositoryPanel.ts
src/vs/workbench/contrib/scm/browser/repositoryPanel.ts
+18
-11
未找到文件。
src/vs/workbench/contrib/scm/browser/repositoryPanel.ts
浏览文件 @
24689696
...
...
@@ -185,7 +185,8 @@ class ResourceRenderer implements ICompressibleTreeRenderer<ISCMResource | IReso
const
elementDisposables
=
new
DisposableStore
();
const
resourceOrFolder
=
node
.
element
;
const
theme
=
this
.
themeService
.
getTheme
();
const
icon
=
!
ResourceTree
.
isResourceNode
(
resourceOrFolder
)
&&
(
theme
.
type
===
LIGHT
?
resourceOrFolder
.
decorations
.
icon
:
resourceOrFolder
.
decorations
.
iconDark
);
const
iconResource
=
ResourceTree
.
isResourceNode
(
resourceOrFolder
)
?
resourceOrFolder
.
element
:
resourceOrFolder
;
const
icon
=
iconResource
&&
(
theme
.
type
===
LIGHT
?
iconResource
.
decorations
.
icon
:
iconResource
.
decorations
.
iconDark
);
const
uri
=
ResourceTree
.
isResourceNode
(
resourceOrFolder
)
?
resourceOrFolder
.
uri
:
resourceOrFolder
.
sourceUri
;
const
fileKind
=
ResourceTree
.
isResourceNode
(
resourceOrFolder
)
?
FileKind
.
FOLDER
:
FileKind
.
FILE
;
...
...
@@ -202,9 +203,15 @@ class ResourceRenderer implements ICompressibleTreeRenderer<ISCMResource | IReso
template
.
actionBar
.
context
=
resourceOrFolder
;
if
(
ResourceTree
.
isResourceNode
(
resourceOrFolder
))
{
elementDisposables
.
add
(
connectPrimaryMenuToInlineActionBar
(
this
.
menus
.
getResourceFolderMenu
(
resourceOrFolder
.
context
),
template
.
actionBar
));
removeClass
(
template
.
name
,
'
strike-through
'
);
removeClass
(
template
.
element
,
'
faded
'
);
if
(
resourceOrFolder
.
element
)
{
elementDisposables
.
add
(
connectPrimaryMenuToInlineActionBar
(
this
.
menus
.
getResourceMenu
(
resourceOrFolder
.
element
.
resourceGroup
),
template
.
actionBar
));
toggleClass
(
template
.
name
,
'
strike-through
'
,
resourceOrFolder
.
element
.
decorations
.
strikeThrough
);
toggleClass
(
template
.
element
,
'
faded
'
,
resourceOrFolder
.
element
.
decorations
.
faded
);
}
else
{
elementDisposables
.
add
(
connectPrimaryMenuToInlineActionBar
(
this
.
menus
.
getResourceFolderMenu
(
resourceOrFolder
.
context
),
template
.
actionBar
));
removeClass
(
template
.
name
,
'
strike-through
'
);
removeClass
(
template
.
element
,
'
faded
'
);
}
}
else
{
elementDisposables
.
add
(
connectPrimaryMenuToInlineActionBar
(
this
.
menus
.
getResourceMenu
(
resourceOrFolder
.
resourceGroup
),
template
.
actionBar
));
toggleClass
(
template
.
name
,
'
strike-through
'
,
resourceOrFolder
.
decorations
.
strikeThrough
);
...
...
@@ -378,14 +385,10 @@ function groupItemAsTreeElement(item: IGroupItem, mode: ViewModelMode): ICompres
}
function
asTreeElement
(
node
:
IResourceNode
<
ISCMResource
,
ISCMResourceGroup
>
,
forceIncompressible
:
boolean
):
ICompressedTreeElement
<
TreeElement
>
{
if
(
node
.
childrenCount
===
0
&&
node
.
element
)
{
return
{
element
:
node
.
element
,
incompressible
:
true
};
}
return
{
element
:
node
,
element
:
(
node
.
childrenCount
===
0
&&
node
.
element
)
?
node
.
element
:
node
,
children
:
Iterator
.
map
(
node
.
children
,
node
=>
asTreeElement
(
node
,
false
)),
incompressible
:
forceIncompressible
incompressible
:
!!
node
.
element
||
forceIncompressible
};
}
...
...
@@ -897,7 +900,11 @@ export class RepositoryPanel extends ViewletPanel {
if
(
isSCMResourceGroup
(
element
))
{
actions
=
this
.
menus
.
getResourceGroupContextActions
(
element
);
}
else
if
(
ResourceTree
.
isResourceNode
(
element
))
{
actions
=
this
.
menus
.
getResourceFolderContextActions
(
element
.
context
);
if
(
element
.
element
)
{
actions
=
this
.
menus
.
getResourceContextActions
(
element
.
element
);
}
else
{
actions
=
this
.
menus
.
getResourceFolderContextActions
(
element
.
context
);
}
}
else
{
actions
=
this
.
menus
.
getResourceContextActions
(
element
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录