Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
9a9ce669
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,发现更多精彩内容 >>
提交
9a9ce669
编写于
8月 21, 2018
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
compute logs path earlier in the game
fixes #56651
上级
4754feaf
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
44 addition
and
10 deletion
+44
-10
src/main.js
src/main.js
+31
-0
src/vs/platform/environment/node/environmentService.ts
src/vs/platform/environment/node/environmentService.ts
+13
-10
未找到文件。
src/main.js
浏览文件 @
9a9ce669
...
...
@@ -9,6 +9,7 @@ perf.mark('main:started');
Error
.
stackTraceLimit
=
100
;
// increase number of stack frames (from 10, https://github.com/v8/v8/wiki/Stack-Trace-API)
//#region Portable mode
const
fs
=
require
(
'
fs
'
);
const
path
=
require
(
'
path
'
);
const
product
=
require
(
'
../product.json
'
);
...
...
@@ -51,6 +52,7 @@ if (isPortable) {
if
(
isTempPortable
)
{
process
.
env
[
process
.
platform
===
'
win32
'
?
'
TEMP
'
:
'
TMPDIR
'
]
=
portableTempPath
;
}
//#endregion
//#region Add support for using node_modules.asar
(
function
()
{
...
...
@@ -96,6 +98,7 @@ const args = minimist(process.argv, {
]
});
//#region User data path
function
getUserDataPath
()
{
if
(
isPortable
)
{
return
path
.
join
(
portableDataPath
,
'
user-data
'
);
...
...
@@ -108,6 +111,34 @@ const userDataPath = getUserDataPath();
// Set userData path before app 'ready' event and call to process.chdir
app
.
setPath
(
'
userData
'
,
userDataPath
);
//#endregion
//#region Logs
function
pad
(
n
,
l
,
char
=
'
0
'
)
{
let
str
=
''
+
n
;
let
r
=
[
str
];
for
(
let
i
=
str
.
length
;
i
<
l
;
i
++
)
{
r
.
push
(
char
);
}
return
r
.
reverse
().
join
(
''
);
}
function
toLocalISOString
(
date
)
{
return
date
.
getFullYear
()
+
'
-
'
+
pad
(
date
.
getMonth
()
+
1
,
2
)
+
'
-
'
+
pad
(
date
.
getDate
(),
2
)
+
'
T
'
+
pad
(
date
.
getHours
(),
2
)
+
'
:
'
+
pad
(
date
.
getMinutes
(),
2
)
+
'
:
'
+
pad
(
date
.
getSeconds
(),
2
)
+
'
.
'
+
(
date
.
getMilliseconds
()
/
1000
).
toFixed
(
3
).
slice
(
2
,
5
)
+
'
Z
'
;
}
const
logsKey
=
toLocalISOString
(
new
Date
()).
replace
(
/-|:|
\.\d
+Z$/g
,
''
);
process
.
env
[
'
VSCODE_LOGS
'
]
=
path
.
join
(
userDataPath
,
'
logs
'
,
logsKey
);
//#endregion
//#region NLS
function
stripComments
(
content
)
{
...
...
src/vs/platform/environment/node/environmentService.ts
浏览文件 @
9a9ce669
...
...
@@ -11,9 +11,9 @@ import * as path from 'path';
import
{
memoize
}
from
'
vs/base/common/decorators
'
;
import
pkg
from
'
vs/platform/node/package
'
;
import
product
from
'
vs/platform/node/product
'
;
import
{
toLocalISOString
}
from
'
vs/base/common/date
'
;
import
{
isWindows
,
isLinux
}
from
'
vs/base/common/platform
'
;
import
{
getPathFromAmdModule
}
from
'
vs/base/common/amd
'
;
import
{
toLocalISOString
}
from
'
vs/base/common/date
'
;
// Read this before there's any chance it is overwritten
// Related to https://github.com/Microsoft/vscode/issues/30624
...
...
@@ -84,7 +84,17 @@ export class EnvironmentService implements IEnvironmentService {
@
memoize
get
cliPath
():
string
{
return
getCLIPath
(
this
.
execPath
,
this
.
appRoot
,
this
.
isBuilt
);
}
readonly
logsPath
:
string
;
@
memoize
get
logsPath
():
string
{
if
(
!
process
.
env
[
'
VSCODE_LOGS
'
])
{
const
key
=
toLocalISOString
(
new
Date
()).
replace
(
/-|:|
\.\d
+Z$/g
,
''
);
const
logsPath
=
path
.
join
(
this
.
userDataPath
,
'
logs
'
,
key
);
process
.
env
[
'
VSCODE_LOGS
'
]
=
logsPath
;
return
logsPath
;
}
return
process
.
env
[
'
VSCODE_LOGS
'
];
}
@
memoize
get
userHome
():
string
{
return
os
.
homedir
();
}
...
...
@@ -206,14 +216,7 @@ export class EnvironmentService implements IEnvironmentService {
get
driverHandle
():
string
{
return
this
.
_args
[
'
driver
'
];
}
get
driverVerbose
():
boolean
{
return
this
.
_args
[
'
driver-verbose
'
];
}
constructor
(
private
_args
:
ParsedArgs
,
private
_execPath
:
string
)
{
if
(
!
process
.
env
[
'
VSCODE_LOGS
'
])
{
const
key
=
toLocalISOString
(
new
Date
()).
replace
(
/-|:|
\.\d
+Z$/g
,
''
);
process
.
env
[
'
VSCODE_LOGS
'
]
=
path
.
join
(
this
.
userDataPath
,
'
logs
'
,
key
);
}
this
.
logsPath
=
process
.
env
[
'
VSCODE_LOGS
'
];
}
constructor
(
private
_args
:
ParsedArgs
,
private
_execPath
:
string
)
{
}
}
export
function
parseExtensionHostPort
(
args
:
ParsedArgs
,
isBuild
:
boolean
):
IExtensionHostDebugParams
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录