Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
ba97287c
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,发现更多精彩内容 >>
提交
ba97287c
编写于
11月 08, 2018
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Strict null check launch service
上级
026df274
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
13 deletion
+19
-13
src/tsconfig.strictNullChecks.json
src/tsconfig.strictNullChecks.json
+5
-2
src/vs/platform/launch/electron-main/launchService.ts
src/vs/platform/launch/electron-main/launchService.ts
+14
-11
未找到文件。
src/tsconfig.strictNullChecks.json
浏览文件 @
ba97287c
...
...
@@ -118,6 +118,7 @@
"./vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner.ts"
,
"./vs/code/electron-main/auth.ts"
,
"./vs/code/electron-main/keyboard.ts"
,
"./vs/code/electron-main/logUploader.ts"
,
"./vs/code/electron-main/sharedProcess.ts"
,
"./vs/code/electron-main/theme.ts"
,
"./vs/code/node/cli.ts"
,
...
...
@@ -400,6 +401,7 @@
"./vs/platform/actions/common/menu.ts"
,
"./vs/platform/actions/common/menuService.ts"
,
"./vs/platform/backup/common/backup.ts"
,
"./vs/platform/backup/electron-main/backupMainService.ts"
,
"./vs/platform/broadcast/electron-browser/broadcastService.ts"
,
"./vs/platform/clipboard/common/clipboardService.ts"
,
"./vs/platform/clipboard/electron-browser/clipboardService.ts"
,
...
...
@@ -409,6 +411,7 @@
"./vs/platform/configuration/common/configurationRegistry.ts"
,
"./vs/platform/contextkey/browser/contextKeyService.ts"
,
"./vs/platform/contextkey/common/contextkey.ts"
,
"./vs/platform/diagnostics/electron-main/diagnosticsService.ts"
,
"./vs/platform/dialogs/common/dialogs.ts"
,
"./vs/platform/dialogs/node/dialogIpc.ts"
,
"./vs/platform/dialogs/node/dialogService.ts"
,
...
...
@@ -454,6 +457,7 @@
"./vs/platform/keybinding/test/common/mockKeybindingService.ts"
,
"./vs/platform/label/common/label.ts"
,
"./vs/platform/label/electron-browser/label.contribution.ts"
,
"./vs/platform/launch/electron-main/launchService.ts"
,
"./vs/platform/lifecycle/common/lifecycle.ts"
,
"./vs/platform/lifecycle/electron-browser/lifecycleService.ts"
,
"./vs/platform/lifecycle/electron-main/lifecycleMain.ts"
,
...
...
@@ -707,8 +711,7 @@
"./vs/workbench/services/themes/common/workbenchThemeService.ts"
,
"./vs/workbench/services/title/common/titleService.ts"
,
"./vs/workbench/services/workspace/common/workspaceEditing.ts"
,
"./vs/workbench/test/electron-browser/api/mock.ts"
,
"./vs/platform/backup/electron-main/backupMainService.ts"
"./vs/workbench/test/electron-browser/api/mock.ts"
],
"exclude"
:
[
"./typings/require-monaco.d.ts"
...
...
src/vs/platform/launch/electron-main/launchService.ts
浏览文件 @
ba97287c
...
...
@@ -19,6 +19,7 @@ import { URI, UriComponents } from 'vs/base/common/uri';
import
{
BrowserWindow
}
from
'
electron
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
hasArgs
}
from
'
vs/platform/environment/node/argv
'
;
import
{
coalesce
}
from
'
vs/base/common/arrays
'
;
export
const
ID
=
'
launchService
'
;
export
const
ILaunchService
=
createDecorator
<
ILaunchService
>
(
ID
);
...
...
@@ -45,15 +46,14 @@ function parseOpenUrl(args: ParsedArgs): URI[] {
if
(
args
[
'
open-url
'
]
&&
args
.
_urls
&&
args
.
_urls
.
length
>
0
)
{
// --open-url must contain -- followed by the url(s)
// process.argv is used over args._ as args._ are resolved to file paths at this point
return
args
.
_urls
return
coalesce
(
args
.
_urls
.
map
(
url
=>
{
try
{
return
URI
.
parse
(
url
);
}
catch
(
err
)
{
return
null
;
}
})
.
filter
(
uri
=>
!!
uri
);
}));
}
return
[];
...
...
@@ -99,7 +99,7 @@ export class LaunchChannel implements ILaunchChannel {
return
this
.
service
.
getLogsPath
();
}
return
undefined
;
throw
new
Error
(
`Call not found:
${
command
}
`
)
;
}
}
...
...
@@ -161,7 +161,7 @@ export class LaunchService implements ILaunchService {
}
});
return
TPromise
.
as
(
null
);
return
TPromise
.
as
(
void
0
);
}
// Otherwise handle in windows service
...
...
@@ -170,7 +170,7 @@ export class LaunchService implements ILaunchService {
private
startOpenWindow
(
args
:
ParsedArgs
,
userEnv
:
IProcessEnvironment
):
TPromise
<
void
>
{
const
context
=
!!
userEnv
[
'
VSCODE_CLI
'
]
?
OpenContext
.
CLI
:
OpenContext
.
DESKTOP
;
let
usedWindows
:
ICodeWindow
[];
let
usedWindows
:
ICodeWindow
[]
=
[]
;
// Special case extension development
if
(
!!
args
.
extensionDevelopmentPath
)
{
...
...
@@ -238,7 +238,7 @@ export class LaunchService implements ILaunchService {
]).
then
(()
=>
void
0
,
()
=>
void
0
);
}
return
TPromise
.
as
(
null
);
return
TPromise
.
as
(
void
0
);
}
getMainProcessId
():
TPromise
<
number
>
{
...
...
@@ -279,10 +279,13 @@ export class LaunchService implements ILaunchService {
if
(
window
.
openedFolderUri
)
{
folderURIs
.
push
(
window
.
openedFolderUri
);
}
else
if
(
window
.
openedWorkspace
)
{
const
rootFolders
=
this
.
workspacesMainService
.
resolveWorkspaceSync
(
window
.
openedWorkspace
.
configPath
).
folders
;
rootFolders
.
forEach
(
root
=>
{
folderURIs
.
push
(
root
.
uri
);
});
const
resolvedWorkspace
=
this
.
workspacesMainService
.
resolveWorkspaceSync
(
window
.
openedWorkspace
.
configPath
);
if
(
resolvedWorkspace
)
{
const
rootFolders
=
resolvedWorkspace
.
folders
;
rootFolders
.
forEach
(
root
=>
{
folderURIs
.
push
(
root
.
uri
);
});
}
}
return
this
.
browserWindowToInfo
(
window
.
win
,
folderURIs
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录