Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
3eda4250
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,发现更多精彩内容 >>
提交
3eda4250
编写于
12月 01, 2017
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
code-ps: rename renderer => window and change cli to "-s, --status" (for #39262)
上级
ec0250d2
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
12 addition
and
11 deletion
+12
-11
src/vs/base/node/ps.ts
src/vs/base/node/ps.ts
+1
-1
src/vs/code/electron-main/diagnostics.ts
src/vs/code/electron-main/diagnostics.ts
+2
-2
src/vs/code/electron-main/main.ts
src/vs/code/electron-main/main.ts
+4
-4
src/vs/code/node/cli.ts
src/vs/code/node/cli.ts
+1
-1
src/vs/platform/environment/common/environment.ts
src/vs/platform/environment/common/environment.ts
+1
-1
src/vs/platform/environment/node/argv.ts
src/vs/platform/environment/node/argv.ts
+3
-2
未找到文件。
src/vs/base/node/ps.ts
浏览文件 @
3eda4250
...
...
@@ -75,7 +75,7 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {
return
'
shared-process
'
;
}
return
`
renderer
`
;
return
`
window
`
;
}
return
matches
[
1
];
}
...
...
src/vs/code/electron-main/diagnostics.ts
浏览文件 @
3eda4250
...
...
@@ -37,7 +37,7 @@ export function printDiagnostics(info: IMainProcessInfo): Promise<any> {
return
;
}
console
.
log
(
`|
Renderer
(
${
window
.
title
}
)`
);
console
.
log
(
`|
Window
(
${
window
.
title
}
)`
);
window
.
folders
.
forEach
(
folder
=>
{
console
.
log
(
`| Folder (
${
basename
(
folder
)}
)`
);
...
...
@@ -156,7 +156,7 @@ function formatProcessItem(mapPidToWindowTitle: Map<number, string>, output: str
}
else
{
name
=
`
${
repeat
(
'
'
,
indent
)}
${
item
.
name
}
`
;
if
(
item
.
name
===
'
renderer
'
)
{
if
(
item
.
name
===
'
window
'
)
{
name
=
`
${
name
}
(
${
mapPidToWindowTitle
.
get
(
item
.
pid
)}
)`
;
}
}
...
...
src/vs/code/electron-main/main.ts
浏览文件 @
3eda4250
...
...
@@ -102,9 +102,9 @@ function setupIPC(accessor: ServicesAccessor): TPromise<Server> {
app
.
dock
.
show
();
// dock might be hidden at this case due to a retry
}
// Print --
p
s usage info
if
(
environmentService
.
args
.
p
s
)
{
console
.
log
(
'
Warning: The --
p
s argument can only be used if Code is already running. Please run it again after Code has started.
'
);
// Print --
statu
s usage info
if
(
environmentService
.
args
.
statu
s
)
{
console
.
log
(
'
Warning: The --
statu
s argument can only be used if Code is already running. Please run it again after Code has started.
'
);
}
return
server
;
...
...
@@ -147,7 +147,7 @@ function setupIPC(accessor: ServicesAccessor): TPromise<Server> {
const
service
=
new
LaunchChannelClient
(
channel
);
// Process Info
if
(
environmentService
.
args
.
p
s
)
{
if
(
environmentService
.
args
.
statu
s
)
{
return
service
.
getMainProcessInfo
().
then
(
info
=>
{
return
printDiagnostics
(
info
).
then
(()
=>
TPromise
.
wrapError
(
new
ExpectedError
()));
});
...
...
src/vs/code/node/cli.ts
浏览文件 @
3eda4250
...
...
@@ -65,7 +65,7 @@ export async function main(argv: string[]): TPromise<any> {
let
processCallbacks
:
((
child
:
ChildProcess
)
=>
Thenable
<
any
>
)[]
=
[];
const
verbose
=
args
.
verbose
||
args
.
p
s
;
const
verbose
=
args
.
verbose
||
args
.
statu
s
;
if
(
verbose
)
{
env
[
'
ELECTRON_ENABLE_LOGGING
'
]
=
'
1
'
;
...
...
src/vs/platform/environment/common/environment.ts
浏览文件 @
3eda4250
...
...
@@ -10,6 +10,7 @@ export interface ParsedArgs {
_
:
string
[];
help
?:
boolean
;
version
?:
boolean
;
status
?:
boolean
;
wait
?:
boolean
;
waitMarkerFilePath
?:
string
;
diff
?:
boolean
;
...
...
@@ -48,7 +49,6 @@ export interface ParsedArgs {
'
disable-updates
'
?:
string
;
'
disable-crash-reporter
'
?:
string
;
'
skip-add-to-recently-opened
'
?:
boolean
;
'
ps
'
?:
boolean
;
}
export
const
IEnvironmentService
=
createDecorator
<
IEnvironmentService
>
(
'
environmentService
'
);
...
...
src/vs/platform/environment/node/argv.ts
浏览文件 @
3eda4250
...
...
@@ -53,7 +53,7 @@ const options: minimist.Opts = {
'
disable-updates
'
,
'
disable-crash-reporter
'
,
'
skip-add-to-recently-opened
'
,
'
p
s
'
'
statu
s
'
],
alias
:
{
add
:
'
a
'
,
...
...
@@ -62,6 +62,7 @@ const options: minimist.Opts = {
wait
:
'
w
'
,
diff
:
'
d
'
,
goto
:
'
g
'
,
status
:
'
s
'
,
'
new-window
'
:
'
n
'
,
'
reuse-window
'
:
'
r
'
,
performance
:
'
p
'
,
...
...
@@ -147,7 +148,7 @@ export const optionsHelp: { [name: string]: string; } = {
'
--enable-proposed-api <extension-id>
'
:
localize
(
'
experimentalApis
'
,
"
Enables proposed api features for an extension.
"
),
'
--disable-extensions
'
:
localize
(
'
disableExtensions
'
,
"
Disable all installed extensions.
"
),
'
--disable-gpu
'
:
localize
(
'
disableGPU
'
,
"
Disable GPU hardware acceleration.
"
),
'
-
-ps
'
:
localize
(
'
p
s
'
,
"
Print process usage and diagnostics information.
"
),
'
-
s, --status
'
:
localize
(
'
statu
s
'
,
"
Print process usage and diagnostics information.
"
),
'
-v, --version
'
:
localize
(
'
version
'
,
"
Print version.
"
),
'
-h, --help
'
:
localize
(
'
help
'
,
"
Print usage.
"
)
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录