Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
c25b7499
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,发现更多精彩内容 >>
提交
c25b7499
编写于
12月 07, 2018
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Strict null checking inputbox
上级
a626cc19
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
37 addition
and
34 deletion
+37
-34
src/tsconfig.strictNullChecks.json
src/tsconfig.strictNullChecks.json
+1
-0
src/vs/base/browser/ui/contextview/contextview.ts
src/vs/base/browser/ui/contextview/contextview.ts
+1
-1
src/vs/base/browser/ui/inputbox/inputBox.ts
src/vs/base/browser/ui/inputbox/inputBox.ts
+35
-33
未找到文件。
src/tsconfig.strictNullChecks.json
浏览文件 @
c25b7499
...
...
@@ -36,6 +36,7 @@
"./vs/base/browser/ui/grid/gridview.ts"
,
"./vs/base/browser/ui/highlightedlabel/highlightedLabel.ts"
,
"./vs/base/browser/ui/iconLabel/iconLabel.ts"
,
"./vs/base/browser/ui/inputbox/inputBox.ts"
,
"./vs/base/browser/ui/keybindingLabel/keybindingLabel.ts"
,
"./vs/base/browser/ui/list/list.ts"
,
"./vs/base/browser/ui/list/listPaging.ts"
,
...
...
src/vs/base/browser/ui/contextview/contextview.ts
浏览文件 @
c25b7499
...
...
@@ -25,7 +25,7 @@ export const enum AnchorPosition {
export
interface
IDelegate
{
getAnchor
():
HTMLElement
|
IAnchor
;
render
(
container
:
HTMLElement
):
IDisposable
;
render
(
container
:
HTMLElement
):
IDisposable
|
null
;
focus
?():
void
;
layout
?():
void
;
anchorAlignment
?:
AnchorAlignment
;
// default: left
...
...
src/vs/base/browser/ui/inputbox/inputBox.ts
浏览文件 @
c25b7499
...
...
@@ -83,32 +83,32 @@ const defaultOpts = {
};
export
class
InputBox
extends
Widget
{
private
contextViewProvider
:
IContextViewProvider
;
private
contextViewProvider
?
:
IContextViewProvider
;
element
:
HTMLElement
;
private
input
:
HTMLInputElement
;
private
mirror
:
HTMLElement
;
private
actionbar
:
ActionBar
;
private
actionbar
?
:
ActionBar
;
private
options
:
IInputOptions
;
private
message
:
IMessage
;
private
message
:
IMessage
|
null
;
private
placeholder
:
string
;
private
ariaLabel
:
string
;
private
validation
:
IInputValidator
;
private
state
=
'
idle
'
;
private
cachedHeight
:
number
;
private
inputBackground
:
Color
;
private
inputForeground
:
Color
;
private
inputBorder
:
Color
;
private
inputValidationInfoBorder
:
Color
;
private
inputValidationInfoBackground
:
Color
;
private
inputValidationInfoForeground
:
Color
;
private
inputValidationWarningBorder
:
Color
;
private
inputValidationWarningBackground
:
Color
;
private
inputValidationWarningForeground
:
Color
;
private
inputValidationErrorBorder
:
Color
;
private
inputValidationErrorBackground
:
Color
;
private
inputValidationErrorForeground
:
Color
;
private
validation
?
:
IInputValidator
;
private
state
:
string
|
null
=
'
idle
'
;
private
cachedHeight
:
number
|
null
;
private
inputBackground
?
:
Color
;
private
inputForeground
?
:
Color
;
private
inputBorder
?
:
Color
;
private
inputValidationInfoBorder
?
:
Color
;
private
inputValidationInfoBackground
?
:
Color
;
private
inputValidationInfoForeground
?
:
Color
;
private
inputValidationWarningBorder
?
:
Color
;
private
inputValidationWarningBackground
?
:
Color
;
private
inputValidationWarningForeground
?
:
Color
;
private
inputValidationErrorBorder
?
:
Color
;
private
inputValidationErrorBackground
?
:
Color
;
private
inputValidationErrorForeground
?
:
Color
;
private
_onDidChange
=
this
.
_register
(
new
Emitter
<
string
>
());
public
readonly
onDidChange
:
Event
<
string
>
=
this
.
_onDidChange
.
event
;
...
...
@@ -361,7 +361,7 @@ export class InputBox extends Widget {
return
!
errorMsg
;
}
private
stylesForType
(
type
:
MessageType
):
{
border
:
Color
;
background
:
Color
;
foreground
:
Color
}
{
private
stylesForType
(
type
:
MessageType
|
undefined
):
{
border
:
Color
|
undefined
;
background
:
Color
|
undefined
;
foreground
:
Color
|
undefined
}
{
switch
(
type
)
{
case
MessageType
.
INFO
:
return
{
border
:
this
.
inputValidationInfoBorder
,
background
:
this
.
inputValidationInfoBackground
,
foreground
:
this
.
inputValidationInfoForeground
};
case
MessageType
.
WARNING
:
return
{
border
:
this
.
inputValidationWarningBorder
,
background
:
this
.
inputValidationWarningBackground
,
foreground
:
this
.
inputValidationWarningForeground
};
...
...
@@ -369,7 +369,7 @@ export class InputBox extends Widget {
}
}
private
classForType
(
type
:
MessageType
):
string
{
private
classForType
(
type
:
MessageType
|
undefined
):
string
{
switch
(
type
)
{
case
MessageType
.
INFO
:
return
'
info
'
;
case
MessageType
.
WARNING
:
return
'
warning
'
;
...
...
@@ -391,6 +391,10 @@ export class InputBox extends Widget {
getAnchor
:
()
=>
this
.
element
,
anchorAlignment
:
AnchorAlignment
.
RIGHT
,
render
:
(
container
:
HTMLElement
)
=>
{
if
(
!
this
.
message
)
{
return
null
;
}
div
=
dom
.
append
(
container
,
$
(
'
.monaco-inputbox-container
'
));
layout
();
...
...
@@ -433,7 +437,7 @@ export class InputBox extends Widget {
this
.
validate
();
this
.
updateMirror
();
if
(
this
.
state
===
'
open
'
)
{
if
(
this
.
state
===
'
open
'
&&
this
.
contextViewProvider
)
{
this
.
contextViewProvider
.
layout
();
}
}
...
...
@@ -509,15 +513,13 @@ export class InputBox extends Widget {
public
dispose
():
void
{
this
.
_hideMessage
();
this
.
element
=
null
;
this
.
input
=
null
;
this
.
contextViewProvider
=
null
;
this
.
element
=
null
!
;
// StrictNullOverride: nulling out ok in dispose
this
.
input
=
null
!
;
// StrictNullOverride: nulling out ok in dispose
this
.
contextViewProvider
=
undefined
;
this
.
message
=
null
;
this
.
placeholder
=
null
;
this
.
ariaLabel
=
null
;
this
.
validation
=
null
;
this
.
validation
=
undefined
;
this
.
state
=
null
;
this
.
actionbar
=
null
;
this
.
actionbar
=
undefined
;
super
.
dispose
();
}
...
...
@@ -582,7 +584,7 @@ export class HistoryInputBox extends InputBox implements IHistoryNavigationWidge
this
.
history
.
clear
();
}
private
getCurrentValue
():
string
{
private
getCurrentValue
():
string
|
null
{
let
currentValue
=
this
.
history
.
current
();
if
(
!
currentValue
)
{
currentValue
=
this
.
history
.
last
();
...
...
@@ -591,11 +593,11 @@ export class HistoryInputBox extends InputBox implements IHistoryNavigationWidge
return
currentValue
;
}
private
getPreviousValue
():
string
{
private
getPreviousValue
():
string
|
null
{
return
this
.
history
.
previous
()
||
this
.
history
.
first
();
}
private
getNextValue
():
string
{
private
getNextValue
():
string
|
null
{
return
this
.
history
.
next
()
||
this
.
history
.
last
();
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录