Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
5bb7f2e0
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,发现更多精彩内容 >>
提交
5bb7f2e0
编写于
7月 05, 2016
作者:
D
Dirk Baeumer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #8719: Closing a file without saving is not cleaning markers
上级
e1880326
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
2 addition
and
34 deletion
+2
-34
extensions/typescript/src/features/bufferSyncSupport.ts
extensions/typescript/src/features/bufferSyncSupport.ts
+1
-34
extensions/typescript/src/typescriptService.ts
extensions/typescript/src/typescriptService.ts
+1
-0
未找到文件。
extensions/typescript/src/features/bufferSyncSupport.ts
浏览文件 @
5bb7f2e0
...
@@ -4,9 +4,6 @@
...
@@ -4,9 +4,6 @@
*--------------------------------------------------------------------------------------------*/
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
'
use strict
'
;
import
*
as
fs
from
'
fs
'
;
import
*
as
path
from
'
path
'
;
import
{
workspace
,
TextDocument
,
TextDocumentChangeEvent
,
TextDocumentContentChangeEvent
,
Disposable
}
from
'
vscode
'
;
import
{
workspace
,
TextDocument
,
TextDocumentChangeEvent
,
TextDocumentContentChangeEvent
,
Disposable
}
from
'
vscode
'
;
import
*
as
Proto
from
'
../protocol
'
;
import
*
as
Proto
from
'
../protocol
'
;
import
{
ITypescriptServiceClient
}
from
'
../typescriptService
'
;
import
{
ITypescriptServiceClient
}
from
'
../typescriptService
'
;
...
@@ -83,7 +80,6 @@ export default class BufferSyncSupport {
...
@@ -83,7 +80,6 @@ export default class BufferSyncSupport {
private
diagnostics
:
Diagnostics
;
private
diagnostics
:
Diagnostics
;
private
disposables
:
Disposable
[]
=
[];
private
disposables
:
Disposable
[]
=
[];
private
syncedBuffers
:
Map
<
SyncedBuffer
>
;
private
syncedBuffers
:
Map
<
SyncedBuffer
>
;
private
closedFiles
:
Map
<
boolean
>
;
private
projectValidationRequested
:
boolean
;
private
projectValidationRequested
:
boolean
;
...
@@ -104,7 +100,6 @@ export default class BufferSyncSupport {
...
@@ -104,7 +100,6 @@ export default class BufferSyncSupport {
this
.
diagnosticDelayer
=
new
Delayer
<
any
>
(
100
);
this
.
diagnosticDelayer
=
new
Delayer
<
any
>
(
100
);
this
.
syncedBuffers
=
Object
.
create
(
null
);
this
.
syncedBuffers
=
Object
.
create
(
null
);
this
.
closedFiles
=
Object
.
create
(
null
);
}
}
public
listen
():
void
{
public
listen
():
void
{
...
@@ -112,19 +107,6 @@ export default class BufferSyncSupport {
...
@@ -112,19 +107,6 @@ export default class BufferSyncSupport {
workspace
.
onDidCloseTextDocument
(
this
.
onDidCloseTextDocument
,
this
,
this
.
disposables
);
workspace
.
onDidCloseTextDocument
(
this
.
onDidCloseTextDocument
,
this
,
this
.
disposables
);
workspace
.
onDidChangeTextDocument
(
this
.
onDidChangeTextDocument
,
this
,
this
.
disposables
);
workspace
.
onDidChangeTextDocument
(
this
.
onDidChangeTextDocument
,
this
,
this
.
disposables
);
workspace
.
textDocuments
.
forEach
(
this
.
onDidOpenTextDocument
,
this
);
workspace
.
textDocuments
.
forEach
(
this
.
onDidOpenTextDocument
,
this
);
workspace
.
createFileSystemWatcher
(
'
**/*
'
,
true
,
true
,
false
).
onDidDelete
((
resource
)
=>
{
let
filepath
=
this
.
client
.
asAbsolutePath
(
resource
);
if
(
!
filepath
)
{
return
;
}
if
(
!
this
.
syncedBuffers
[
filepath
])
{
// The file is not synced (open in an editor) and got
// removed from disk. Make sure it is not in the closedFiles
// list since we shouldn't revalidate it.
delete
this
.
closedFiles
[
filepath
];
this
.
diagnostics
.
delete
(
filepath
);
}
});
}
}
public
get
validate
():
boolean
{
public
get
validate
():
boolean
{
...
@@ -165,7 +147,6 @@ export default class BufferSyncSupport {
...
@@ -165,7 +147,6 @@ export default class BufferSyncSupport {
}
}
let
syncedBuffer
=
new
SyncedBuffer
(
document
,
filepath
,
this
,
this
.
client
);
let
syncedBuffer
=
new
SyncedBuffer
(
document
,
filepath
,
this
,
this
.
client
);
this
.
syncedBuffers
[
filepath
]
=
syncedBuffer
;
this
.
syncedBuffers
[
filepath
]
=
syncedBuffer
;
delete
this
.
closedFiles
[
filepath
];
syncedBuffer
.
open
();
syncedBuffer
.
open
();
this
.
requestDiagnostic
(
filepath
);
this
.
requestDiagnostic
(
filepath
);
}
}
...
@@ -179,14 +160,7 @@ export default class BufferSyncSupport {
...
@@ -179,14 +160,7 @@ export default class BufferSyncSupport {
if
(
!
syncedBuffer
)
{
if
(
!
syncedBuffer
)
{
return
;
return
;
}
}
// If the file still exists on disk keep on validating the file.
this
.
diagnostics
.
delete
(
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.
delete
this
.
closedFiles
[
filepath
];
this
.
diagnostics
.
delete
(
filepath
);
}
delete
this
.
syncedBuffers
[
filepath
];
delete
this
.
syncedBuffers
[
filepath
];
syncedBuffer
.
close
();
syncedBuffer
.
close
();
}
}
...
@@ -246,13 +220,6 @@ export default class BufferSyncSupport {
...
@@ -246,13 +220,6 @@ export default class BufferSyncSupport {
}
}
});
});
// Now add all files that we have requested diagnostics for but are now
// closed. Otherwise it might be confusing that interfile dependent markers
// don't get fixed.
Object
.
keys
(
this
.
closedFiles
).
forEach
((
file
)
=>
{
files
.
push
(
file
);
});
let
args
:
Proto
.
GeterrRequestArgs
=
{
let
args
:
Proto
.
GeterrRequestArgs
=
{
delay
:
0
,
delay
:
0
,
files
:
files
files
:
files
...
...
extensions/typescript/src/typescriptService.ts
浏览文件 @
5bb7f2e0
...
@@ -41,5 +41,6 @@ export interface ITypescriptServiceClient {
...
@@ -41,5 +41,6 @@ export interface ITypescriptServiceClient {
execute
(
command
:
'
occurrences
'
,
args
:
Proto
.
FileLocationRequestArgs
,
token
?:
CancellationToken
):
Promise
<
Proto
.
OccurrencesResponse
>
;
execute
(
command
:
'
occurrences
'
,
args
:
Proto
.
FileLocationRequestArgs
,
token
?:
CancellationToken
):
Promise
<
Proto
.
OccurrencesResponse
>
;
execute
(
command
:
'
projectInfo
'
,
args
:
Proto
.
ProjectInfoRequestArgs
,
token
?:
CancellationToken
):
Promise
<
Proto
.
ProjectInfoResponse
>
;
execute
(
command
:
'
projectInfo
'
,
args
:
Proto
.
ProjectInfoRequestArgs
,
token
?:
CancellationToken
):
Promise
<
Proto
.
ProjectInfoResponse
>
;
execute
(
command
:
'
reloadProjects
'
,
args
:
any
,
expectedResult
:
boolean
,
token
?:
CancellationToken
):
Promise
<
any
>
;
execute
(
command
:
'
reloadProjects
'
,
args
:
any
,
expectedResult
:
boolean
,
token
?:
CancellationToken
):
Promise
<
any
>
;
execute
(
command
:
'
reload
'
,
args
:
Proto
.
ReloadRequestArgs
,
expectedResult
:
boolean
,
token
?:
CancellationToken
):
Promise
<
any
>
;
execute
(
command
:
string
,
args
:
any
,
expectedResult
:
boolean
|
CancellationToken
,
token
?:
CancellationToken
):
Promise
<
any
>
;
execute
(
command
:
string
,
args
:
any
,
expectedResult
:
boolean
|
CancellationToken
,
token
?:
CancellationToken
):
Promise
<
any
>
;
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录