Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
99f55b28
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,发现更多精彩内容 >>
提交
99f55b28
编写于
5月 15, 2017
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Extract TypeScript logger to own file
上级
c1eccca1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
69 addition
and
47 deletion
+69
-47
extensions/typescript/src/typescriptServiceClient.ts
extensions/typescript/src/typescriptServiceClient.ts
+7
-47
extensions/typescript/src/utils/logger.ts
extensions/typescript/src/utils/logger.ts
+62
-0
未找到文件。
extensions/typescript/src/typescriptServiceClient.ts
浏览文件 @
99f55b28
...
...
@@ -13,10 +13,11 @@ import * as os from 'os';
import
*
as
electron
from
'
./utils/electron
'
;
import
{
Reader
}
from
'
./utils/wireProtocol
'
;
import
{
workspace
,
window
,
Uri
,
CancellationToken
,
Disposable
,
OutputChannel
,
Memento
,
MessageItem
,
QuickPickItem
,
EventEmitter
,
Event
,
commands
,
WorkspaceConfiguration
}
from
'
vscode
'
;
import
{
workspace
,
window
,
Uri
,
CancellationToken
,
Disposable
,
Memento
,
MessageItem
,
QuickPickItem
,
EventEmitter
,
Event
,
commands
,
WorkspaceConfiguration
}
from
'
vscode
'
;
import
*
as
Proto
from
'
./protocol
'
;
import
{
ITypescriptServiceClient
,
ITypescriptServiceClientHost
,
API
}
from
'
./typescriptService
'
;
import
{
TypeScriptServerPlugin
}
from
'
./utils/plugins
'
;
import
Logger
from
'
./utils/logger
'
;
import
*
as
VersionStatus
from
'
./utils/versionStatus
'
;
import
*
as
is
from
'
./utils/is
'
;
...
...
@@ -141,7 +142,7 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
private
_checkGlobalTSCVersion
:
boolean
;
private
_experimentalAutoBuild
:
boolean
;
private
trace
:
Trace
;
private
_output
:
OutputChannel
;
private
readonly
logger
:
Logger
=
new
Logger
()
;
private
tsServerLogFile
:
string
|
null
=
null
;
private
tsServerLogLevel
:
TsServerLogLevel
=
TsServerLogLevel
.
Off
;
private
servicePromise
:
Thenable
<
cp
.
ChildProcess
>
|
null
;
...
...
@@ -291,13 +292,6 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
return
this
.
_onTypesInstallerInitializationFailed
.
event
;
}
private
get
output
():
OutputChannel
{
if
(
!
this
.
_output
)
{
this
.
_output
=
window
.
createOutputChannel
(
localize
(
'
channelName
'
,
'
TypeScript
'
));
}
return
this
.
_output
;
}
private
readTrace
():
Trace
{
let
result
:
Trace
=
Trace
.
fromString
(
workspace
.
getConfiguration
().
get
<
string
>
(
'
typescript.tsserver.trace
'
,
'
off
'
));
if
(
result
===
Trace
.
Off
&&
!!
process
.
env
.
TSS_TRACE
)
{
...
...
@@ -331,54 +325,20 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
return
this
.
_onReady
.
promise
;
}
private
data2String
(
data
:
any
):
string
{
if
(
data
instanceof
Error
)
{
if
(
is
.
string
(
data
.
stack
))
{
return
data
.
stack
;
}
return
(
data
as
Error
).
message
;
}
if
(
is
.
boolean
(
data
.
success
)
&&
!
data
.
success
&&
is
.
string
(
data
.
message
))
{
return
data
.
message
;
}
if
(
is
.
string
(
data
))
{
return
data
;
}
return
data
.
toString
();
}
public
info
(
message
:
string
,
data
?:
any
):
void
{
this
.
output
.
appendLine
(
`[Info -
${(
new
Date
().
toLocaleTimeString
())}
]
${
message
}
`
);
if
(
data
)
{
this
.
output
.
appendLine
(
this
.
data2String
(
data
));
}
this
.
logger
.
info
(
message
,
data
);
}
public
warn
(
message
:
string
,
data
?:
any
):
void
{
this
.
output
.
appendLine
(
`[Warn -
${(
new
Date
().
toLocaleTimeString
())}
]
${
message
}
`
);
if
(
data
)
{
this
.
output
.
appendLine
(
this
.
data2String
(
data
));
}
this
.
logger
.
warn
(
message
,
data
);
}
public
error
(
message
:
string
,
data
?:
any
):
void
{
// See https://github.com/Microsoft/TypeScript/issues/10496
if
(
data
&&
data
.
message
===
'
No content available.
'
)
{
return
;
}
this
.
output
.
appendLine
(
`[Error -
${(
new
Date
().
toLocaleTimeString
())}
]
${
message
}
`
);
if
(
data
)
{
this
.
output
.
appendLine
(
this
.
data2String
(
data
));
}
// this.output.show(true);
this
.
logger
.
error
(
message
,
data
);
}
private
logTrace
(
message
:
string
,
data
?:
any
):
void
{
this
.
output
.
appendLine
(
`[Trace -
${(
new
Date
().
toLocaleTimeString
())}
]
${
message
}
`
);
if
(
data
)
{
this
.
output
.
appendLine
(
this
.
data2String
(
data
));
}
// this.output.show(true);
this
.
logger
.
logLevel
(
'
Trace
'
,
message
,
data
);
}
private
get
packageInfo
():
IPackageInfo
|
null
{
...
...
extensions/typescript/src/utils/logger.ts
0 → 100644
浏览文件 @
99f55b28
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
{
OutputChannel
,
window
}
from
"
vscode
"
;
import
*
as
is
from
'
./is
'
;
import
*
as
nls
from
'
vscode-nls
'
;
const
localize
=
nls
.
loadMessageBundle
();
export
default
class
Logger
{
private
_output
:
OutputChannel
;
private
get
output
():
OutputChannel
{
if
(
!
this
.
_output
)
{
this
.
_output
=
window
.
createOutputChannel
(
localize
(
'
channelName
'
,
'
TypeScript
'
));
}
return
this
.
_output
;
}
private
data2String
(
data
:
any
):
string
{
if
(
data
instanceof
Error
)
{
if
(
is
.
string
(
data
.
stack
))
{
return
data
.
stack
;
}
return
(
data
as
Error
).
message
;
}
if
(
is
.
boolean
(
data
.
success
)
&&
!
data
.
success
&&
is
.
string
(
data
.
message
))
{
return
data
.
message
;
}
if
(
is
.
string
(
data
))
{
return
data
;
}
return
data
.
toString
();
}
public
info
(
message
:
string
,
data
?:
any
):
void
{
this
.
logLevel
(
'
Info
'
,
message
,
data
);
}
public
warn
(
message
:
string
,
data
?:
any
):
void
{
this
.
logLevel
(
'
Warn
'
,
message
,
data
);
}
public
error
(
message
:
string
,
data
?:
any
):
void
{
// See https://github.com/Microsoft/TypeScript/issues/10496
if
(
data
&&
data
.
message
===
'
No content available.
'
)
{
return
;
}
this
.
logLevel
(
'
Error
'
,
message
,
data
);
}
public
logLevel
(
level
:
string
,
message
:
string
,
data
?:
any
):
void
{
this
.
output
.
appendLine
(
`[
${
level
}
-
${(
new
Date
().
toLocaleTimeString
())}
]
${
message
}
`
);
if
(
data
)
{
this
.
output
.
appendLine
(
this
.
data2String
(
data
));
}
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录