Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d72847cf
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,发现更多精彩内容 >>
提交
d72847cf
编写于
6月 06, 2019
作者:
M
Miguel Solorio
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of github.com:Microsoft/vscode
上级
0f976fca
9460a519
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
18 addition
and
18 deletion
+18
-18
src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
+1
-1
src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.ts
...kbench/contrib/callHierarchy/browser/callHierarchyPeek.ts
+13
-13
src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
+4
-4
未找到文件。
src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
浏览文件 @
d72847cf
...
...
@@ -252,7 +252,7 @@ export class MarkerNavigationWidget extends PeekViewWidget {
container
.
appendChild
(
this
.
_container
);
this
.
_message
=
new
MessageWidget
(
this
.
_container
,
this
.
editor
,
related
=>
this
.
_onDidSelectRelatedInformation
.
fire
(
related
));
this
.
_disposables
.
push
(
this
.
_message
);
this
.
_disposables
.
add
(
this
.
_message
);
}
show
(
where
:
Position
,
heightInLines
:
number
):
void
{
...
...
src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.ts
浏览文件 @
d72847cf
...
...
@@ -117,7 +117,7 @@ export class CallHierarchyTreePeekWidget extends PeekViewWidget {
this
.
create
();
this
.
_peekViewService
.
addExclusiveWidget
(
editor
,
this
);
this
.
_applyTheme
(
themeService
.
getTheme
());
th
emeService
.
onThemeChange
(
this
.
_applyTheme
,
this
,
this
.
_disposables
);
th
is
.
_disposables
.
add
(
themeService
.
onThemeChange
(
this
.
_applyTheme
,
this
)
);
}
dispose
():
void
{
...
...
@@ -230,18 +230,18 @@ export class CallHierarchyTreePeekWidget extends PeekViewWidget {
}
},
Sizing
.
Distribute
);
this
.
_splitView
.
onDidSashChange
(()
=>
{
this
.
_
disposables
.
add
(
this
.
_
splitView
.
onDidSashChange
(()
=>
{
if
(
this
.
_dim
.
width
)
{
this
.
_layoutInfo
.
ratio
=
this
.
_splitView
.
getViewSize
(
0
)
/
this
.
_dim
.
width
;
}
}
,
undefined
,
this
.
_disposables
);
}
)
);
// session state
let
localDispose
:
IDisposable
[]
=
[];
this
.
_disposables
.
push
({
dispose
()
{
dispose
(
localDispose
);
}
});
this
.
_disposables
.
add
({
dispose
()
{
dispose
(
localDispose
);
}
});
// update editor
this
.
_tree
.
onDidChangeFocus
(
e
=>
{
this
.
_
disposables
.
add
(
this
.
_
tree
.
onDidChangeFocus
(
e
=>
{
const
[
element
]
=
e
.
elements
;
if
(
element
&&
isNonEmptyArray
(
element
.
locations
))
{
...
...
@@ -287,9 +287,9 @@ export class CallHierarchyTreePeekWidget extends PeekViewWidget {
}
this
.
setMetaTitle
(
localize
(
'
meta
'
,
"
– {0}
"
,
names
.
join
(
'
→
'
)));
}
}
,
undefined
,
this
.
_disposables
);
}
)
);
this
.
_editor
.
onMouseDown
(
e
=>
{
this
.
_
disposables
.
add
(
this
.
_
editor
.
onMouseDown
(
e
=>
{
const
{
event
,
target
}
=
e
;
if
(
event
.
detail
!==
2
)
{
return
;
...
...
@@ -304,9 +304,9 @@ export class CallHierarchyTreePeekWidget extends PeekViewWidget {
options
:
{
selection
:
target
.
range
!
}
});
}
,
undefined
,
this
.
_disposables
);
}
)
);
this
.
_tree
.
onMouseDblClick
(
e
=>
{
this
.
_
disposables
.
add
(
this
.
_
tree
.
onMouseDblClick
(
e
=>
{
if
(
e
.
element
&&
isNonEmptyArray
(
e
.
element
.
locations
))
{
this
.
dispose
();
this
.
_editorService
.
openEditor
({
...
...
@@ -314,9 +314,9 @@ export class CallHierarchyTreePeekWidget extends PeekViewWidget {
options
:
{
selection
:
e
.
element
.
locations
[
0
].
range
}
});
}
}
,
undefined
,
this
.
_disposables
);
}
)
);
this
.
_tree
.
onDidChangeSelection
(
e
=>
{
this
.
_
disposables
.
add
(
this
.
_
tree
.
onDidChangeSelection
(
e
=>
{
const
[
element
]
=
e
.
elements
;
// don't close on click
if
(
element
&&
isNonEmptyArray
(
element
.
locations
)
&&
e
.
browserEvent
instanceof
KeyboardEvent
)
{
...
...
@@ -326,7 +326,7 @@ export class CallHierarchyTreePeekWidget extends PeekViewWidget {
options
:
{
selection
:
element
.
locations
[
0
].
range
}
});
}
}
,
undefined
,
this
.
_disposables
);
}
)
);
}
showLoading
():
void
{
...
...
@@ -380,7 +380,7 @@ export class CallHierarchyTreePeekWidget extends PeekViewWidget {
}
};
this
.
_changeDirectionAction
=
new
ChangeHierarchyDirectionAction
(
this
.
_direction
,
changeDirection
);
this
.
_disposables
.
push
(
this
.
_changeDirectionAction
);
this
.
_disposables
.
add
(
this
.
_changeDirectionAction
);
this
.
_actionbarWidget
.
push
(
this
.
_changeDirectionAction
,
{
icon
:
true
,
label
:
false
});
}
}
...
...
src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
浏览文件 @
d72847cf
...
...
@@ -184,7 +184,7 @@ class DirtyDiffWidget extends PeekViewWidget {
)
{
super
(
editor
,
{
isResizeable
:
true
,
frameWidth
:
1
,
keepEditorSelection
:
true
});
th
emeService
.
onThemeChange
(
this
.
_applyTheme
,
this
,
this
.
_disposables
);
th
is
.
_disposables
.
add
(
themeService
.
onThemeChange
(
this
.
_applyTheme
,
this
)
);
this
.
_applyTheme
(
themeService
.
getTheme
());
this
.
contextKeyService
=
contextKeyService
.
createScoped
();
...
...
@@ -199,7 +199,7 @@ class DirtyDiffWidget extends PeekViewWidget {
}
this
.
setTitle
(
this
.
title
);
model
.
onDidChange
(
this
.
renderTitle
,
this
,
this
.
_disposables
);
this
.
_disposables
.
add
(
model
.
onDidChange
(
this
.
renderTitle
,
this
)
);
}
showChange
(
index
:
number
):
void
{
...
...
@@ -253,8 +253,8 @@ class DirtyDiffWidget extends PeekViewWidget {
const
previous
=
this
.
instantiationService
.
createInstance
(
UIEditorAction
,
this
.
editor
,
new
ShowPreviousChangeAction
(),
'
show-previous-change chevron-up
'
);
const
next
=
this
.
instantiationService
.
createInstance
(
UIEditorAction
,
this
.
editor
,
new
ShowNextChangeAction
(),
'
show-next-change chevron-down
'
);
this
.
_disposables
.
push
(
previous
);
this
.
_disposables
.
push
(
next
);
this
.
_disposables
.
add
(
previous
);
this
.
_disposables
.
add
(
next
);
this
.
_actionbarWidget
.
push
([
previous
,
next
],
{
label
:
false
,
icon
:
true
});
const
actions
:
IAction
[]
=
[];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录