Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
ccf4a04d
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,发现更多精彩内容 >>
提交
ccf4a04d
编写于
6月 20, 2019
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
extract server error to own file
上级
7e1f8d4f
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
65 addition
and
70 deletion
+65
-70
extensions/typescript-language-features/src/tsServer/server.ts
...sions/typescript-language-features/src/tsServer/server.ts
+1
-70
extensions/typescript-language-features/src/tsServer/serverError.ts
.../typescript-language-features/src/tsServer/serverError.ts
+64
-0
未找到文件。
extensions/typescript-language-features/src/tsServer/server.ts
浏览文件 @
ccf4a04d
...
@@ -18,82 +18,13 @@ import LogDirectoryProvider from '../utils/logDirectoryProvider';
...
@@ -18,82 +18,13 @@ import LogDirectoryProvider from '../utils/logDirectoryProvider';
import
Logger
from
'
../utils/logger
'
;
import
Logger
from
'
../utils/logger
'
;
import
{
TypeScriptPluginPathsProvider
}
from
'
../utils/pluginPathsProvider
'
;
import
{
TypeScriptPluginPathsProvider
}
from
'
../utils/pluginPathsProvider
'
;
import
{
PluginManager
}
from
'
../utils/plugins
'
;
import
{
PluginManager
}
from
'
../utils/plugins
'
;
import
{
escapeRegExp
}
from
'
../utils/regexp
'
;
import
TelemetryReporter
from
'
../utils/telemetry
'
;
import
TelemetryReporter
from
'
../utils/telemetry
'
;
import
Tracer
from
'
../utils/tracer
'
;
import
Tracer
from
'
../utils/tracer
'
;
import
{
TypeScriptVersion
,
TypeScriptVersionProvider
}
from
'
../utils/versionProvider
'
;
import
{
TypeScriptVersion
,
TypeScriptVersionProvider
}
from
'
../utils/versionProvider
'
;
import
{
Reader
}
from
'
../utils/wireProtocol
'
;
import
{
Reader
}
from
'
../utils/wireProtocol
'
;
import
{
CallbackMap
}
from
'
./callbackMap
'
;
import
{
CallbackMap
}
from
'
./callbackMap
'
;
import
{
RequestItem
,
RequestQueue
,
RequestQueueingType
}
from
'
./requestQueue
'
;
import
{
RequestItem
,
RequestQueue
,
RequestQueueingType
}
from
'
./requestQueue
'
;
import
{
TypeScriptServerError
}
from
'
./serverError
'
;
class
TypeScriptServerError
extends
Error
{
public
static
create
(
version
:
TypeScriptVersion
,
response
:
Proto
.
Response
,
):
TypeScriptServerError
{
const
parsedResult
=
TypeScriptServerError
.
parseErrorText
(
version
,
response
);
return
new
TypeScriptServerError
(
version
,
response
,
parsedResult
?
parsedResult
.
message
:
undefined
,
parsedResult
?
parsedResult
.
stack
:
undefined
);
}
constructor
(
version
:
TypeScriptVersion
,
private
readonly
response
:
Proto
.
Response
,
public
readonly
serverMessage
:
string
|
undefined
,
public
readonly
serverStack
:
string
|
undefined
,
)
{
super
(
`TypeScript Server Error (
${
version
.
versionString
}
)\n
${
serverMessage
}
\n
${
serverStack
}
`
);
}
public
get
serverErrorText
()
{
return
this
.
response
.
message
;
}
public
get
serverCommand
()
{
return
this
.
response
.
command
;
}
/**
* Given a `errorText` from a tsserver request indicating failure in handling a request,
* prepares a payload for telemetry-logging.
*/
private
static
parseErrorText
(
version
:
TypeScriptVersion
,
response
:
Proto
.
Response
,
)
{
const
errorText
=
response
.
message
;
if
(
errorText
)
{
const
errorPrefix
=
'
Error processing request.
'
;
if
(
errorText
.
startsWith
(
errorPrefix
))
{
const
prefixFreeErrorText
=
errorText
.
substr
(
errorPrefix
.
length
);
const
newlineIndex
=
prefixFreeErrorText
.
indexOf
(
'
\n
'
);
if
(
newlineIndex
>=
0
)
{
// Newline expected between message and stack.
return
{
message
:
prefixFreeErrorText
.
substring
(
0
,
newlineIndex
),
stack
:
TypeScriptServerError
.
normalizeMessageStack
(
version
,
prefixFreeErrorText
.
substring
(
newlineIndex
+
1
))
};
}
}
}
return
undefined
;
}
/**
* Try to replace full TS Server paths with 'tsserver.js' so that we don't have to post process the data as much
*/
private
static
normalizeMessageStack
(
version
:
TypeScriptVersion
,
message
:
string
|
undefined
,
)
{
if
(
!
message
)
{
return
''
;
}
return
message
.
replace
(
new
RegExp
(
`
${
escapeRegExp
(
version
.
path
)}
[/\\\\]tsserver.js:`
,
'
gi
'
),
'
tsserver.js:
'
);
}
}
export
class
TypeScriptServerSpawner
{
export
class
TypeScriptServerSpawner
{
public
constructor
(
public
constructor
(
...
...
extensions/typescript-language-features/src/tsServer/serverError.ts
0 → 100644
浏览文件 @
ccf4a04d
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
*
as
Proto
from
'
../protocol
'
;
import
{
escapeRegExp
}
from
'
../utils/regexp
'
;
import
{
TypeScriptVersion
}
from
'
../utils/versionProvider
'
;
export
class
TypeScriptServerError
extends
Error
{
public
static
create
(
version
:
TypeScriptVersion
,
response
:
Proto
.
Response
):
TypeScriptServerError
{
const
parsedResult
=
TypeScriptServerError
.
parseErrorText
(
version
,
response
);
return
new
TypeScriptServerError
(
version
,
response
,
parsedResult
?
parsedResult
.
message
:
undefined
,
parsedResult
?
parsedResult
.
stack
:
undefined
);
}
private
constructor
(
version
:
TypeScriptVersion
,
private
readonly
response
:
Proto
.
Response
,
public
readonly
serverMessage
:
string
|
undefined
,
public
readonly
serverStack
:
string
|
undefined
)
{
super
(
`TypeScript Server Error (
${
version
.
versionString
}
)\n
${
serverMessage
}
\n
${
serverStack
}
`
);
}
public
get
serverErrorText
()
{
return
this
.
response
.
message
;
}
public
get
serverCommand
()
{
return
this
.
response
.
command
;
}
/**
* Given a `errorText` from a tsserver request indicating failure in handling a request,
* prepares a payload for telemetry-logging.
*/
private
static
parseErrorText
(
version
:
TypeScriptVersion
,
response
:
Proto
.
Response
)
{
const
errorText
=
response
.
message
;
if
(
errorText
)
{
const
errorPrefix
=
'
Error processing request.
'
;
if
(
errorText
.
startsWith
(
errorPrefix
))
{
const
prefixFreeErrorText
=
errorText
.
substr
(
errorPrefix
.
length
);
const
newlineIndex
=
prefixFreeErrorText
.
indexOf
(
'
\n
'
);
if
(
newlineIndex
>=
0
)
{
// Newline expected between message and stack.
return
{
message
:
prefixFreeErrorText
.
substring
(
0
,
newlineIndex
),
stack
:
TypeScriptServerError
.
normalizeMessageStack
(
version
,
prefixFreeErrorText
.
substring
(
newlineIndex
+
1
))
};
}
}
}
return
undefined
;
}
/**
* Try to replace full TS Server paths with 'tsserver.js' so that we don't have to post process the data as much
*/
private
static
normalizeMessageStack
(
version
:
TypeScriptVersion
,
message
:
string
|
undefined
)
{
if
(
!
message
)
{
return
''
;
}
return
message
.
replace
(
new
RegExp
(
`
${
escapeRegExp
(
version
.
path
)}
[/\\\\]tsserver.js:`
,
'
gi
'
),
'
tsserver.js:
'
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录