Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a7ef42a9
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,发现更多精彩内容 >>
提交
a7ef42a9
编写于
2月 11, 2019
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix strict null errors related to getActivePanel
上级
8d077769
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
5 addition
and
4 deletion
+5
-4
src/vs/workbench/browser/actions/navigationActions.ts
src/vs/workbench/browser/actions/navigationActions.ts
+1
-1
src/vs/workbench/browser/panel.ts
src/vs/workbench/browser/panel.ts
+1
-1
src/vs/workbench/contrib/terminal/electron-browser/terminalInstance.ts
...nch/contrib/terminal/electron-browser/terminalInstance.ts
+1
-1
src/vs/workbench/services/timer/electron-browser/timerService.ts
...workbench/services/timer/electron-browser/timerService.ts
+2
-1
未找到文件。
src/vs/workbench/browser/actions/navigationActions.ts
浏览文件 @
a7ef42a9
...
@@ -68,7 +68,7 @@ abstract class BaseNavigationAction extends Action {
...
@@ -68,7 +68,7 @@ abstract class BaseNavigationAction extends Action {
return
false
;
return
false
;
}
}
const
activePanelId
=
this
.
panelService
.
getActivePanel
().
getId
();
const
activePanelId
=
this
.
panelService
.
getActivePanel
()
!
.
getId
();
return
this
.
panelService
.
openPanel
(
activePanelId
,
true
);
return
this
.
panelService
.
openPanel
(
activePanelId
,
true
);
}
}
...
...
src/vs/workbench/browser/panel.ts
浏览文件 @
a7ef42a9
...
@@ -95,7 +95,7 @@ export abstract class TogglePanelAction extends Action {
...
@@ -95,7 +95,7 @@ export abstract class TogglePanelAction extends Action {
private
isPanelActive
():
boolean
{
private
isPanelActive
():
boolean
{
const
activePanel
=
this
.
panelService
.
getActivePanel
();
const
activePanel
=
this
.
panelService
.
getActivePanel
();
return
activePanel
&&
activePanel
.
getId
()
===
this
.
panelId
;
return
!!
activePanel
&&
activePanel
.
getId
()
===
this
.
panelId
;
}
}
private
isPanelFocused
():
boolean
{
private
isPanelFocused
():
boolean
{
...
...
src/vs/workbench/contrib/terminal/electron-browser/terminalInstance.ts
浏览文件 @
a7ef42a9
...
@@ -924,7 +924,7 @@ export class TerminalInstance implements ITerminalInstance {
...
@@ -924,7 +924,7 @@ export class TerminalInstance implements ITerminalInstance {
private
_refreshSelectionContextKey
()
{
private
_refreshSelectionContextKey
()
{
const
activePanel
=
this
.
_panelService
.
getActivePanel
();
const
activePanel
=
this
.
_panelService
.
getActivePanel
();
const
isActive
=
activePanel
&&
activePanel
.
getId
()
===
TERMINAL_PANEL_ID
;
const
isActive
=
!!
activePanel
&&
activePanel
.
getId
()
===
TERMINAL_PANEL_ID
;
this
.
_terminalHasTextContextKey
.
set
(
isActive
&&
this
.
hasSelection
());
this
.
_terminalHasTextContextKey
.
set
(
isActive
&&
this
.
hasSelection
());
}
}
...
...
src/vs/workbench/services/timer/electron-browser/timerService.ts
浏览文件 @
a7ef42a9
...
@@ -378,6 +378,7 @@ class TimerService implements ITimerService {
...
@@ -378,6 +378,7 @@ class TimerService implements ITimerService {
}
}
const
activeViewlet
=
this
.
_viewletService
.
getActiveViewlet
();
const
activeViewlet
=
this
.
_viewletService
.
getActiveViewlet
();
const
activePanel
=
this
.
_panelService
.
getActivePanel
();
return
{
return
{
version
:
2
,
version
:
2
,
ellapsed
:
perf
.
getDuration
(
startMark
,
'
didStartWorkbench
'
),
ellapsed
:
perf
.
getDuration
(
startMark
,
'
didStartWorkbench
'
),
...
@@ -389,7 +390,7 @@ class TimerService implements ITimerService {
...
@@ -389,7 +390,7 @@ class TimerService implements ITimerService {
windowCount
:
await
this
.
_windowsService
.
getWindowCount
(),
windowCount
:
await
this
.
_windowsService
.
getWindowCount
(),
viewletId
:
activeViewlet
?
activeViewlet
.
getId
()
:
undefined
,
viewletId
:
activeViewlet
?
activeViewlet
.
getId
()
:
undefined
,
editorIds
:
this
.
_editorService
.
visibleEditors
.
map
(
input
=>
input
.
getTypeId
()),
editorIds
:
this
.
_editorService
.
visibleEditors
.
map
(
input
=>
input
.
getTypeId
()),
panelId
:
this
.
_panelService
.
getActivePanel
()
?
this
.
_panelService
.
getActivePanel
()
.
getId
()
:
undefined
,
panelId
:
activePanel
?
activePanel
.
getId
()
:
undefined
,
// timers
// timers
timers
:
{
timers
:
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录