Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
徽霖
Vscode
提交
fe69f9ac
V
Vscode
项目概览
徽霖
/
Vscode
通知
9
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,发现更多精彩内容 >>
提交
fe69f9ac
编写于
5月 25, 2017
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Actually save the file this time :'(
上级
4ce3a1e6
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
0 addition
and
15 deletion
+0
-15
extensions/typescript/src/typescriptMain.ts
extensions/typescript/src/typescriptMain.ts
+0
-15
未找到文件。
extensions/typescript/src/typescriptMain.ts
浏览文件 @
fe69f9ac
...
@@ -90,7 +90,6 @@ const standardLanguageDescriptions: LanguageDescription[] = [
...
@@ -90,7 +90,6 @@ const standardLanguageDescriptions: LanguageDescription[] = [
export
function
activate
(
context
:
ExtensionContext
):
void
{
export
function
activate
(
context
:
ExtensionContext
):
void
{
const
plugins
=
getContributedTypeScriptServerPlugins
();
const
plugins
=
getContributedTypeScriptServerPlugins
();
<<<<<<<
HEAD
const
lazyClientHost
=
(()
=>
{
const
lazyClientHost
=
(()
=>
{
let
clientHost
:
TypeScriptServiceClientHost
|
undefined
;
let
clientHost
:
TypeScriptServiceClientHost
|
undefined
;
return
()
=>
{
return
()
=>
{
...
@@ -111,10 +110,6 @@ export function activate(context: ExtensionContext): void {
...
@@ -111,10 +110,6 @@ export function activate(context: ExtensionContext): void {
};
};
})();
})();
=======
const
clientHost
=
new
TypeScriptServiceClientHost
(
standardLanguageDescriptions
,
context
.
storagePath
,
context
.
globalState
,
context
.
workspaceState
,
plugins
);
context
.
subscriptions
.
push
(
clientHost
);
>>>>>>>
a0b779f
...
Move
VersionStatus
into
a
class
context
.
subscriptions
.
push
(
commands
.
registerCommand
(
'
typescript.reloadProjects
'
,
()
=>
{
context
.
subscriptions
.
push
(
commands
.
registerCommand
(
'
typescript.reloadProjects
'
,
()
=>
{
lazyClientHost
().
reloadProjects
();
lazyClientHost
().
reloadProjects
();
...
@@ -150,7 +145,6 @@ export function activate(context: ExtensionContext): void {
...
@@ -150,7 +145,6 @@ export function activate(context: ExtensionContext): void {
const
jsDocCompletionCommand
=
new
TryCompleteJsDocCommand
(()
=>
lazyClientHost
().
serviceClient
);
const
jsDocCompletionCommand
=
new
TryCompleteJsDocCommand
(()
=>
lazyClientHost
().
serviceClient
);
context
.
subscriptions
.
push
(
commands
.
registerCommand
(
TryCompleteJsDocCommand
.
COMMAND_NAME
,
jsDocCompletionCommand
.
tryCompleteJsDoc
,
jsDocCompletionCommand
));
context
.
subscriptions
.
push
(
commands
.
registerCommand
(
TryCompleteJsDocCommand
.
COMMAND_NAME
,
jsDocCompletionCommand
.
tryCompleteJsDoc
,
jsDocCompletionCommand
));
<<<<<<<
HEAD
const
supportedLanguage
=
[].
concat
.
apply
([],
standardLanguageDescriptions
.
map
(
x
=>
x
.
modeIds
).
concat
(
plugins
.
map
(
x
=>
x
.
languages
)));
const
supportedLanguage
=
[].
concat
.
apply
([],
standardLanguageDescriptions
.
map
(
x
=>
x
.
modeIds
).
concat
(
plugins
.
map
(
x
=>
x
.
languages
)));
function
didOpenTextDocument
(
textDocument
:
TextDocument
):
boolean
{
function
didOpenTextDocument
(
textDocument
:
TextDocument
):
boolean
{
if
(
supportedLanguage
.
indexOf
(
textDocument
.
languageId
)
>=
0
)
{
if
(
supportedLanguage
.
indexOf
(
textDocument
.
languageId
)
>=
0
)
{
...
@@ -168,15 +162,6 @@ export function activate(context: ExtensionContext): void {
...
@@ -168,15 +162,6 @@ export function activate(context: ExtensionContext): void {
}
}
}
}
=======
clientHost
.
serviceClient
.
onReady
().
then
(()
=>
{
context
.
subscriptions
.
push
(
ProjectStatus
.
create
(
clientHost
.
serviceClient
,
path
=>
new
Promise
<
boolean
>
(
resolve
=>
setTimeout
(()
=>
resolve
(
clientHost
.
handles
(
path
)),
750
)),
context
.
workspaceState
));
},
()
=>
{
// Nothing to do here. The client did show a message;
});
>>>>>>>
a0b779f
...
Move
VersionStatus
into
a
class
BuildStatus
.
update
({
queueLength
:
0
});
BuildStatus
.
update
({
queueLength
:
0
});
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录