Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
50e579f9
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,发现更多精彩内容 >>
提交
50e579f9
编写于
6月 06, 2016
作者:
D
Dirk Baeumer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #7186: Problem with changing languages
上级
3cca0230
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
6 deletion
+19
-6
extensions/typescript/src/features/bufferSyncSupport.ts
extensions/typescript/src/features/bufferSyncSupport.ts
+5
-2
extensions/typescript/src/typescriptMain.ts
extensions/typescript/src/typescriptMain.ts
+14
-4
未找到文件。
extensions/typescript/src/features/bufferSyncSupport.ts
浏览文件 @
50e579f9
...
...
@@ -5,6 +5,7 @@
'
use strict
'
;
import
*
as
fs
from
'
fs
'
;
import
*
as
path
from
'
path
'
;
import
{
workspace
,
TextDocument
,
TextDocumentChangeEvent
,
TextDocumentContentChangeEvent
,
Disposable
}
from
'
vscode
'
;
import
*
as
Proto
from
'
../protocol
'
;
...
...
@@ -78,6 +79,7 @@ export default class BufferSyncSupport {
private
_validate
:
boolean
;
private
modeIds
:
Map
<
boolean
>
;
private
extensions
:
Map
<
boolean
>
;
private
diagnostics
:
Diagnostics
;
private
disposables
:
Disposable
[]
=
[];
private
syncedBuffers
:
Map
<
SyncedBuffer
>
;
...
...
@@ -86,11 +88,12 @@ export default class BufferSyncSupport {
private
pendingDiagnostics
:
{
[
key
:
string
]:
number
;
};
private
diagnosticDelayer
:
Delayer
<
any
>
;
constructor
(
client
:
ITypescriptServiceClient
,
modeIds
:
string
[],
diagnostics
:
Diagnostics
,
validate
:
boolean
=
true
)
{
constructor
(
client
:
ITypescriptServiceClient
,
modeIds
:
string
[],
diagnostics
:
Diagnostics
,
extensions
:
Map
<
boolean
>
,
validate
:
boolean
=
true
)
{
this
.
client
=
client
;
this
.
modeIds
=
Object
.
create
(
null
);
modeIds
.
forEach
(
modeId
=>
this
.
modeIds
[
modeId
]
=
true
);
this
.
diagnostics
=
diagnostics
;
this
.
extensions
=
extensions
;
this
.
_validate
=
validate
;
this
.
pendingDiagnostics
=
Object
.
create
(
null
);
...
...
@@ -173,7 +176,7 @@ export default class BufferSyncSupport {
return
;
}
// If the file still exists on disk keep on validating the file.
if
(
fs
.
existsSync
(
filepath
))
{
if
(
fs
.
existsSync
(
filepath
)
&&
this
.
extensions
[
path
.
extname
(
filepath
)]
)
{
this
.
closedFiles
[
filepath
]
=
true
;
}
else
{
// Ensure we don't have the file in the map and clear all errors.
...
...
extensions/typescript/src/typescriptMain.ts
浏览文件 @
50e579f9
...
...
@@ -16,6 +16,8 @@ import { env, languages, commands, workspace, window, Uri, ExtensionContext, Ind
import
*
as
nls
from
'
vscode-nls
'
;
nls
.
config
({
locale
:
env
.
language
});
import
*
as
path
from
'
path
'
;
import
*
as
Proto
from
'
./protocol
'
;
import
TypeScriptServiceClient
from
'
./typescriptServiceClient
'
;
import
{
ITypescriptServiceClientHost
}
from
'
./typescriptService
'
;
...
...
@@ -39,6 +41,7 @@ interface LanguageDescription {
id
:
string
;
diagnosticSource
:
string
;
modeIds
:
string
[];
extensions
:
string
[];
}
export
function
activate
(
context
:
ExtensionContext
):
void
{
...
...
@@ -51,12 +54,14 @@ export function activate(context: ExtensionContext): void {
{
id
:
'
typescript
'
,
diagnosticSource
:
'
ts
'
,
modeIds
:
[
MODE_ID_TS
,
MODE_ID_TSX
]
modeIds
:
[
MODE_ID_TS
,
MODE_ID_TSX
],
extensions
:
[
'
.ts
'
,
'
.tsx
'
]
},
{
id
:
'
javascript
'
,
diagnosticSource
:
'
js
'
,
modeIds
:
[
MODE_ID_JS
,
MODE_ID_JSX
]
modeIds
:
[
MODE_ID_JS
,
MODE_ID_JSX
],
extensions
:
[
'
.js
'
,
'
.jsx
'
]
}
]);
...
...
@@ -85,6 +90,7 @@ const validateSetting = 'validate.enable';
class
LanguageProvider
{
private
description
:
LanguageDescription
;
private
extensions
:
Map
<
boolean
>
;
private
syntaxDiagnostics
:
Map
<
Diagnostic
[]
>
;
private
currentDiagnostics
:
DiagnosticCollection
;
private
bufferSyncSupport
:
BufferSyncSupport
;
...
...
@@ -96,16 +102,19 @@ class LanguageProvider {
constructor
(
client
:
TypeScriptServiceClient
,
description
:
LanguageDescription
)
{
this
.
description
=
description
;
this
.
extensions
=
Object
.
create
(
null
);
description
.
extensions
.
forEach
(
extension
=>
this
.
extensions
[
extension
]
=
true
);
this
.
_validate
=
true
;
this
.
bufferSyncSupport
=
new
BufferSyncSupport
(
client
,
description
.
modeIds
,
{
delete
:
(
file
:
string
)
=>
{
this
.
currentDiagnostics
.
delete
(
Uri
.
file
(
file
));
}
});
}
,
this
.
extensions
);
this
.
syntaxDiagnostics
=
Object
.
create
(
null
);
this
.
currentDiagnostics
=
languages
.
createDiagnosticCollection
(
description
.
id
);
workspace
.
onDidChangeConfiguration
(
this
.
configurationChanged
,
this
);
this
.
configurationChanged
();
...
...
@@ -220,7 +229,8 @@ class LanguageProvider {
}
public
handles
(
file
:
string
):
boolean
{
return
this
.
bufferSyncSupport
.
handles
(
file
);
let
extension
=
path
.
extname
(
file
);
return
(
extension
&&
this
.
extensions
[
extension
])
||
this
.
bufferSyncSupport
.
handles
(
file
);
}
public
get
id
():
string
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录