Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
37670732
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,发现更多精彩内容 >>
提交
37670732
编写于
10月 28, 2019
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debt - reduce usage of || undefined
上级
bba6ee1c
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
10 addition
and
10 deletion
+10
-10
src/vs/workbench/browser/parts/compositePart.ts
src/vs/workbench/browser/parts/compositePart.ts
+1
-1
src/vs/workbench/browser/parts/editor/editorActions.ts
src/vs/workbench/browser/parts/editor/editorActions.ts
+1
-1
src/vs/workbench/browser/parts/editor/editorStatus.ts
src/vs/workbench/browser/parts/editor/editorStatus.ts
+3
-3
src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
+1
-1
src/vs/workbench/contrib/files/browser/fileCommands.ts
src/vs/workbench/contrib/files/browser/fileCommands.ts
+4
-4
未找到文件。
src/vs/workbench/browser/parts/compositePart.ts
浏览文件 @
37670732
...
@@ -285,7 +285,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
...
@@ -285,7 +285,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
if
(
this
.
activeComposite
&&
this
.
activeComposite
.
getId
()
===
compositeId
)
{
if
(
this
.
activeComposite
&&
this
.
activeComposite
.
getId
()
===
compositeId
)
{
// Title
// Title
this
.
updateTitle
(
this
.
activeComposite
.
getId
(),
this
.
activeComposite
.
getTitle
()
||
undefined
);
this
.
updateTitle
(
this
.
activeComposite
.
getId
(),
this
.
activeComposite
.
getTitle
());
// Actions
// Actions
const
actionsBinding
=
this
.
collectCompositeActions
(
this
.
activeComposite
);
const
actionsBinding
=
this
.
collectCompositeActions
(
this
.
activeComposite
);
...
...
src/vs/workbench/browser/parts/editor/editorActions.ts
浏览文件 @
37670732
...
@@ -425,7 +425,7 @@ export class OpenToSideFromQuickOpenAction extends Action {
...
@@ -425,7 +425,7 @@ export class OpenToSideFromQuickOpenAction extends Action {
const
input
=
entry
.
getInput
();
const
input
=
entry
.
getInput
();
if
(
input
)
{
if
(
input
)
{
if
(
input
instanceof
EditorInput
)
{
if
(
input
instanceof
EditorInput
)
{
return
this
.
editorService
.
openEditor
(
input
,
entry
.
getOptions
()
||
undefined
,
SIDE_GROUP
);
return
this
.
editorService
.
openEditor
(
input
,
entry
.
getOptions
(),
SIDE_GROUP
);
}
}
const
resourceInput
=
input
as
IResourceInput
;
const
resourceInput
=
input
as
IResourceInput
;
...
...
src/vs/workbench/browser/parts/editor/editorStatus.ts
浏览文件 @
37670732
...
@@ -659,7 +659,7 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
...
@@ -659,7 +659,7 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
const
textModel
=
editorWidget
.
getModel
();
const
textModel
=
editorWidget
.
getModel
();
if
(
textModel
)
{
if
(
textModel
)
{
const
modeId
=
textModel
.
getLanguageIdentifier
().
language
;
const
modeId
=
textModel
.
getLanguageIdentifier
().
language
;
info
=
{
mode
:
this
.
modeService
.
getLanguageName
(
modeId
)
||
undefined
};
info
=
{
mode
:
withNullAsUndefined
(
this
.
modeService
.
getLanguageName
(
modeId
))
};
}
}
}
}
...
@@ -832,7 +832,7 @@ function isWritableCodeEditor(codeEditor: ICodeEditor | undefined): boolean {
...
@@ -832,7 +832,7 @@ function isWritableCodeEditor(codeEditor: ICodeEditor | undefined): boolean {
}
}
function
isWritableBaseEditor
(
e
:
IBaseEditor
):
boolean
{
function
isWritableBaseEditor
(
e
:
IBaseEditor
):
boolean
{
return
e
&&
isWritableCodeEditor
(
getCodeEditor
(
e
.
getControl
())
||
undefined
);
return
e
&&
isWritableCodeEditor
(
withNullAsUndefined
(
getCodeEditor
(
e
.
getControl
()))
);
}
}
export
class
ShowLanguageExtensionsAction
extends
Action
{
export
class
ShowLanguageExtensionsAction
extends
Action
{
...
@@ -893,7 +893,7 @@ export class ChangeModeAction extends Action {
...
@@ -893,7 +893,7 @@ export class ChangeModeAction extends Action {
let
modeId
:
string
|
undefined
;
let
modeId
:
string
|
undefined
;
if
(
textModel
)
{
if
(
textModel
)
{
modeId
=
textModel
.
getLanguageIdentifier
().
language
;
modeId
=
textModel
.
getLanguageIdentifier
().
language
;
currentModeId
=
this
.
modeService
.
getLanguageName
(
modeId
)
||
undefined
;
currentModeId
=
withNullAsUndefined
(
this
.
modeService
.
getLanguageName
(
modeId
))
;
}
}
// All languages are valid picks
// All languages are valid picks
...
...
src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
浏览文件 @
37670732
...
@@ -265,7 +265,7 @@ export class NoTabsTitleControl extends TitleControl {
...
@@ -265,7 +265,7 @@ export class NoTabsTitleControl extends TitleControl {
title
=
''
;
// dont repeat what is already shown
title
=
''
;
// dont repeat what is already shown
}
}
editorLabel
.
setResource
({
name
,
description
,
resource
:
resource
||
undefined
},
{
title
:
typeof
title
===
'
string
'
?
title
:
undefined
,
italic
:
!
isEditorPinned
,
extraClasses
:
[
'
no-tabs
'
,
'
title-label
'
]
});
editorLabel
.
setResource
({
name
,
description
,
resource
},
{
title
:
typeof
title
===
'
string
'
?
title
:
undefined
,
italic
:
!
isEditorPinned
,
extraClasses
:
[
'
no-tabs
'
,
'
title-label
'
]
});
if
(
isGroupActive
)
{
if
(
isGroupActive
)
{
editorLabel
.
element
.
style
.
color
=
this
.
getColor
(
TAB_ACTIVE_FOREGROUND
);
editorLabel
.
element
.
style
.
color
=
this
.
getColor
(
TAB_ACTIVE_FOREGROUND
);
}
else
{
}
else
{
...
...
src/vs/workbench/contrib/files/browser/fileCommands.ts
浏览文件 @
37670732
...
@@ -42,7 +42,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
...
@@ -42,7 +42,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import
{
IWorkbenchEnvironmentService
}
from
'
vs/workbench/services/environment/common/environmentService
'
;
import
{
IWorkbenchEnvironmentService
}
from
'
vs/workbench/services/environment/common/environmentService
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
UNTITLED_WORKSPACE_NAME
}
from
'
vs/platform/workspaces/common/workspaces
'
;
import
{
UNTITLED_WORKSPACE_NAME
}
from
'
vs/platform/workspaces/common/workspaces
'
;
import
{
withUndefinedAsNull
}
from
'
vs/base/common/types
'
;
import
{
withUndefinedAsNull
,
withNullAsUndefined
}
from
'
vs/base/common/types
'
;
// Commands
// Commands
...
@@ -138,12 +138,12 @@ async function doSaveAs(
...
@@ -138,12 +138,12 @@ async function doSaveAs(
editorGroupService
:
IEditorGroupsService
,
editorGroupService
:
IEditorGroupsService
,
environmentService
:
IWorkbenchEnvironmentService
environmentService
:
IWorkbenchEnvironmentService
):
Promise
<
boolean
>
{
):
Promise
<
boolean
>
{
let
viewStateOfSource
:
IEditorViewState
|
null
=
null
;
let
viewStateOfSource
:
IEditorViewState
|
undefined
=
undefined
;
const
activeTextEditorWidget
=
getCodeEditor
(
editorService
.
activeTextEditorWidget
);
const
activeTextEditorWidget
=
getCodeEditor
(
editorService
.
activeTextEditorWidget
);
if
(
activeTextEditorWidget
)
{
if
(
activeTextEditorWidget
)
{
const
activeResource
=
toResource
(
editorService
.
activeEditor
,
{
supportSideBySide
:
SideBySideEditor
.
MASTER
});
const
activeResource
=
toResource
(
editorService
.
activeEditor
,
{
supportSideBySide
:
SideBySideEditor
.
MASTER
});
if
(
activeResource
&&
(
fileService
.
canHandleResource
(
activeResource
)
||
resource
.
scheme
===
Schemas
.
untitled
)
&&
isEqual
(
activeResource
,
resource
))
{
if
(
activeResource
&&
(
fileService
.
canHandleResource
(
activeResource
)
||
resource
.
scheme
===
Schemas
.
untitled
)
&&
isEqual
(
activeResource
,
resource
))
{
viewStateOfSource
=
activeTextEditorWidget
.
saveViewState
(
);
viewStateOfSource
=
withNullAsUndefined
(
activeTextEditorWidget
.
saveViewState
()
);
}
}
}
}
...
@@ -174,7 +174,7 @@ async function doSaveAs(
...
@@ -174,7 +174,7 @@ async function doSaveAs(
resource
:
target
,
resource
:
target
,
options
:
{
options
:
{
pinned
:
true
,
pinned
:
true
,
viewState
:
viewStateOfSource
||
undefined
viewState
:
viewStateOfSource
}
}
};
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录