Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
e7672347
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,发现更多精彩内容 >>
提交
e7672347
编写于
3月 08, 2018
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove ITypeScriptServiceClientHost
Better decouple host from client
上级
a3562fa1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
10 addition
and
12 deletion
+10
-12
extensions/typescript/src/typeScriptServiceClientHost.ts
extensions/typescript/src/typeScriptServiceClientHost.ts
+4
-4
extensions/typescript/src/typescriptService.ts
extensions/typescript/src/typescriptService.ts
+0
-5
extensions/typescript/src/typescriptServiceClient.ts
extensions/typescript/src/typescriptServiceClient.ts
+6
-3
未找到文件。
extensions/typescript/src/typeScriptServiceClientHost.ts
浏览文件 @
e7672347
...
...
@@ -14,7 +14,6 @@ import * as Proto from './protocol';
import
*
as
PConst
from
'
./protocol.const
'
;
import
TypeScriptServiceClient
from
'
./typescriptServiceClient
'
;
import
{
ITypeScriptServiceClientHost
}
from
'
./typescriptService
'
;
import
LanguageProvider
from
'
./languageProvider
'
;
import
TypingsStatus
,
{
AtaProgressReporter
}
from
'
./utils/typingsStatus
'
;
...
...
@@ -36,7 +35,7 @@ const styleCheckDiagnostics = [
7030
// not all code paths return a value
];
export
default
class
TypeScriptServiceClientHost
implements
ITypeScriptServiceClientHost
{
export
default
class
TypeScriptServiceClientHost
{
private
readonly
ataProgressReporter
:
AtaProgressReporter
;
private
readonly
typingsStatus
:
TypingsStatus
;
private
readonly
client
:
TypeScriptServiceClient
;
...
...
@@ -68,12 +67,13 @@ export default class TypeScriptServiceClientHost implements ITypeScriptServiceCl
configFileWatcher
.
onDidDelete
(
handleProjectCreateOrDelete
,
this
,
this
.
disposables
);
configFileWatcher
.
onDidChange
(
handleProjectChange
,
this
,
this
.
disposables
);
this
.
client
=
new
TypeScriptServiceClient
(
this
,
workspaceState
,
version
=>
this
.
versionStatus
.
onDidChangeTypeScriptVersion
(
version
),
plugins
,
logDirectoryProvider
);
this
.
client
=
new
TypeScriptServiceClient
(
workspaceState
,
version
=>
this
.
versionStatus
.
onDidChangeTypeScriptVersion
(
version
),
plugins
,
logDirectoryProvider
);
this
.
disposables
.
push
(
this
.
client
);
this
.
client
.
onSyntaxDiagnosticsReceived
(
diag
=>
this
.
syntaxDiagnosticsReceived
(
diag
),
null
,
this
.
disposables
);
this
.
client
.
onSemanticDiagnosticsReceived
(
diag
=>
this
.
semanticDiagnosticsReceived
(
diag
),
null
,
this
.
disposables
);
this
.
client
.
onConfigDiagnosticsReceived
(
diag
=>
this
.
configFileDiagnosticsReceived
(
diag
),
null
,
this
.
disposables
);
this
.
client
.
onResendModelsRequested
(()
=>
this
.
populateService
(),
null
,
this
.
disposables
);
this
.
versionStatus
=
new
VersionStatus
(
resource
=>
this
.
client
.
normalizePath
(
resource
));
this
.
disposables
.
push
(
this
.
versionStatus
);
...
...
@@ -161,7 +161,7 @@ export default class TypeScriptServiceClientHost implements ITypeScriptServiceCl
}
}
/* internal */
populateService
():
void
{
private
populateService
():
void
{
// See https://github.com/Microsoft/TypeScript/issues/5530
workspace
.
saveAll
(
false
).
then
(()
=>
{
for
(
const
language
of
this
.
languagePerId
.
values
())
{
...
...
extensions/typescript/src/typescriptService.ts
浏览文件 @
e7672347
...
...
@@ -11,11 +11,6 @@ import { TypeScriptServerPlugin } from './utils/plugins';
import
{
TypeScriptServiceConfiguration
}
from
'
./utils/configuration
'
;
import
Logger
from
'
./utils/logger
'
;
export
interface
ITypeScriptServiceClientHost
{
populateService
():
void
;
}
export
interface
ITypeScriptServiceClient
{
normalizePath
(
resource
:
Uri
):
string
|
null
;
asUrl
(
filepath
:
string
):
Uri
;
...
...
extensions/typescript/src/typescriptServiceClient.ts
浏览文件 @
e7672347
...
...
@@ -12,7 +12,7 @@ import { Reader, ICallback } from './utils/wireProtocol';
import
{
workspace
,
window
,
Uri
,
CancellationToken
,
Disposable
,
Memento
,
MessageItem
,
EventEmitter
,
Event
,
commands
,
env
}
from
'
vscode
'
;
import
*
as
Proto
from
'
./protocol
'
;
import
{
ITypeScriptServiceClient
,
ITypeScriptServiceClientHost
}
from
'
./typescriptService
'
;
import
{
ITypeScriptServiceClient
}
from
'
./typescriptService
'
;
import
{
TypeScriptServerPlugin
}
from
'
./utils/plugins
'
;
import
Logger
from
'
./utils/logger
'
;
...
...
@@ -182,7 +182,6 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
private
readonly
disposables
:
Disposable
[]
=
[];
constructor
(
private
readonly
host
:
ITypeScriptServiceClientHost
,
private
readonly
workspaceState
:
Memento
,
private
readonly
onDidChangeTypeScriptVersion
:
(
version
:
TypeScriptVersion
)
=>
void
,
public
readonly
plugins
:
TypeScriptServerPlugin
[],
...
...
@@ -242,6 +241,9 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
private
_onConfigDiagnosticsReceived
=
new
EventEmitter
<
Proto
.
ConfigFileDiagnosticEvent
>
();
public
get
onConfigDiagnosticsReceived
():
Event
<
Proto
.
ConfigFileDiagnosticEvent
>
{
return
this
.
_onConfigDiagnosticsReceived
.
event
;
}
private
_onResendModelsRequested
=
new
EventEmitter
<
void
>
();
public
get
onResendModelsRequested
():
Event
<
void
>
{
return
this
.
_onResendModelsRequested
.
event
;
}
public
get
configuration
()
{
return
this
.
_configuration
;
}
...
...
@@ -257,6 +259,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
this
.
_onSyntaxDiagnosticsReceived
.
dispose
();
this
.
_onSemanticDiagnosticsReceived
.
dispose
();
this
.
_onConfigDiagnosticsReceived
.
dispose
();
this
.
_onResendModelsRequested
.
dispose
();
}
public
restartTsServer
():
void
{
...
...
@@ -499,7 +502,7 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
this
.
execute
(
'
configure
'
,
configureOptions
);
this
.
setCompilerOptionsForInferredProjects
(
this
.
_configuration
);
if
(
resendModels
)
{
this
.
host
.
populateServic
e
();
this
.
_onResendModelsRequested
.
fir
e
();
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录