Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
b115d886
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,发现更多精彩内容 >>
提交
b115d886
编写于
11月 19, 2018
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Extract loadingIndicator to class
上级
300f1b8d
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
32 addition
and
24 deletion
+32
-24
extensions/typescript-language-features/src/typescriptServiceClient.ts
...pescript-language-features/src/typescriptServiceClient.ts
+32
-24
未找到文件。
extensions/typescript-language-features/src/typescriptServiceClient.ts
浏览文件 @
b115d886
...
@@ -54,7 +54,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
...
@@ -54,7 +54,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
private
lastStart
:
number
;
private
lastStart
:
number
;
private
numberRestarts
:
number
;
private
numberRestarts
:
number
;
private
isRestarting
:
boolean
=
false
;
private
isRestarting
:
boolean
=
false
;
private
_tsServerLoading
:
{
resolve
:
()
=>
void
,
reject
:
()
=>
void
}
|
undefined
;
private
loadingIndicator
=
new
ServerInitializingIndicator
()
;
public
readonly
telemetryReporter
:
TelemetryReporter
;
public
readonly
telemetryReporter
:
TelemetryReporter
;
/**
/**
...
@@ -150,10 +150,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
...
@@ -150,10 +150,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
this
.
forkedTsServer
.
kill
();
this
.
forkedTsServer
.
kill
();
}
}
if
(
this
.
_tsServerLoading
)
{
this
.
loadingIndicator
.
stop
();
this
.
_tsServerLoading
.
reject
();
this
.
_tsServerLoading
=
undefined
;
}
}
}
public
restartTsServer
():
void
{
public
restartTsServer
():
void
{
...
@@ -322,17 +319,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
...
@@ -322,17 +319,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
this
.
forkedTsServer
=
handle
;
this
.
forkedTsServer
=
handle
;
this
.
_onTsServerStarted
.
fire
(
currentVersion
.
version
);
this
.
_onTsServerStarted
.
fire
(
currentVersion
.
version
);
if
(
this
.
_tsServerLoading
)
{
this
.
loadingIndicator
.
start
(
this
.
_apiVersion
);
this
.
_tsServerLoading
.
reject
();
}
if
(
this
.
_apiVersion
.
gte
(
API
.
v300
))
{
vscode
.
window
.
withProgress
({
location
:
vscode
.
ProgressLocation
.
Window
,
title
:
localize
(
'
serverLoading.progress
'
,
"
Initializing JS/TS language features
"
),
},
()
=>
new
Promise
((
resolve
,
reject
)
=>
{
this
.
_tsServerLoading
=
{
resolve
,
reject
};
}));
}
this
.
serviceStarted
(
resendModels
);
this
.
serviceStarted
(
resendModels
);
...
@@ -437,10 +424,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
...
@@ -437,10 +424,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
}
}
private
serviceExited
(
restart
:
boolean
):
void
{
private
serviceExited
(
restart
:
boolean
):
void
{
if
(
this
.
_tsServerLoading
)
{
this
.
loadingIndicator
.
stop
();
this
.
_tsServerLoading
.
reject
();
this
.
_tsServerLoading
=
undefined
;
}
enum
MessageAction
{
enum
MessageAction
{
reportIssue
reportIssue
...
@@ -611,10 +595,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
...
@@ -611,10 +595,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
case
'
semanticDiag
'
:
case
'
semanticDiag
'
:
case
'
suggestionDiag
'
:
case
'
suggestionDiag
'
:
// This event also roughly signals that project has been loaded successfully
// This event also roughly signals that project has been loaded successfully
if
(
this
.
_tsServerLoading
)
{
this
.
loadingIndicator
.
stop
();
this
.
_tsServerLoading
.
resolve
();
this
.
_tsServerLoading
=
undefined
;
}
const
diagnosticEvent
=
event
as
Proto
.
DiagnosticEvent
;
const
diagnosticEvent
=
event
as
Proto
.
DiagnosticEvent
;
if
(
diagnosticEvent
.
body
&&
diagnosticEvent
.
body
.
diagnostics
)
{
if
(
diagnosticEvent
.
body
&&
diagnosticEvent
.
body
.
diagnostics
)
{
...
@@ -743,3 +724,30 @@ function getDignosticsKind(event: Proto.Event) {
...
@@ -743,3 +724,30 @@ function getDignosticsKind(event: Proto.Event) {
}
}
throw
new
Error
(
'
Unknown dignostics kind
'
);
throw
new
Error
(
'
Unknown dignostics kind
'
);
}
}
class
ServerInitializingIndicator
extends
Disposable
{
private
_tsServerLoading
?:
{
resolve
:
()
=>
void
,
reject
:
()
=>
void
};
public
start
(
apiVersion
:
API
)
{
if
(
this
.
_tsServerLoading
)
{
this
.
_tsServerLoading
.
reject
();
}
if
(
apiVersion
.
gte
(
API
.
v300
))
{
vscode
.
window
.
withProgress
({
location
:
vscode
.
ProgressLocation
.
Window
,
title
:
localize
(
'
serverLoading.progress
'
,
"
Initializing JS/TS language features
"
),
},
()
=>
new
Promise
((
resolve
,
reject
)
=>
{
this
.
_tsServerLoading
=
{
resolve
,
reject
};
}));
}
}
public
stop
()
{
if
(
this
.
_tsServerLoading
)
{
this
.
_tsServerLoading
.
reject
();
this
.
_tsServerLoading
=
undefined
;
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录