Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
11f72446
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,发现更多精彩内容 >>
提交
11f72446
编写于
2月 04, 2019
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
strict null streams, #67775
上级
77b61a1e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
13 deletion
+14
-13
src/tsconfig.strictNullChecks.json
src/tsconfig.strictNullChecks.json
+2
-1
src/vs/workbench/services/files/electron-browser/streams.ts
src/vs/workbench/services/files/electron-browser/streams.ts
+12
-12
未找到文件。
src/tsconfig.strictNullChecks.json
浏览文件 @
11f72446
...
@@ -791,6 +791,7 @@
...
@@ -791,6 +791,7 @@
"./vs/workbench/services/extensions/node/rpcProtocol.ts"
,
"./vs/workbench/services/extensions/node/rpcProtocol.ts"
,
"./vs/workbench/services/extensions/test/node/rpcProtocol.test.ts"
,
"./vs/workbench/services/extensions/test/node/rpcProtocol.test.ts"
,
"./vs/workbench/services/files/electron-browser/encoding.ts"
,
"./vs/workbench/services/files/electron-browser/encoding.ts"
,
"./vs/workbench/services/files/electron-browser/streams.ts"
,
"./vs/workbench/services/files/node/watcher/common.ts"
,
"./vs/workbench/services/files/node/watcher/common.ts"
,
"./vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts"
,
"./vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts"
,
"./vs/workbench/services/files/node/watcher/nsfw/test/nsfwWatcherService.test.ts"
,
"./vs/workbench/services/files/node/watcher/nsfw/test/nsfwWatcherService.test.ts"
,
...
@@ -891,4 +892,4 @@
...
@@ -891,4 +892,4 @@
"exclude"
:
[
"exclude"
:
[
"./typings/require-monaco.d.ts"
"./typings/require-monaco.d.ts"
]
]
}
}
\ No newline at end of file
src/vs/workbench/services/files/electron-browser/streams.ts
浏览文件 @
11f72446
...
@@ -31,7 +31,7 @@ function createSimpleWritable(provider: IFileSystemProvider, resource: URI, opts
...
@@ -31,7 +31,7 @@ function createSimpleWritable(provider: IFileSystemProvider, resource: URI, opts
}
}
end
()
{
end
()
{
// todo@joh - end might have another chunk...
// todo@joh - end might have another chunk...
provider
.
writeFile
(
resource
,
Buffer
.
concat
(
this
.
_chunks
),
opts
).
then
(
_
=>
{
provider
.
writeFile
!
(
resource
,
Buffer
.
concat
(
this
.
_chunks
),
opts
).
then
(
_
=>
{
super
.
end
();
super
.
end
();
},
err
=>
{
},
err
=>
{
this
.
emit
(
'
error
'
,
err
);
this
.
emit
(
'
error
'
,
err
);
...
@@ -50,9 +50,9 @@ function createWritable(provider: IFileSystemProvider, resource: URI, opts: File
...
@@ -50,9 +50,9 @@ function createWritable(provider: IFileSystemProvider, resource: URI, opts: File
async
_write
(
chunk
:
Buffer
,
encoding
,
callback
:
Function
)
{
async
_write
(
chunk
:
Buffer
,
encoding
,
callback
:
Function
)
{
try
{
try
{
if
(
typeof
this
.
_fd
!==
'
number
'
)
{
if
(
typeof
this
.
_fd
!==
'
number
'
)
{
this
.
_fd
=
await
provider
.
open
(
resource
,
{
create
:
true
});
this
.
_fd
=
await
provider
.
open
!
(
resource
,
{
create
:
true
});
}
}
let
bytesWritten
=
await
provider
.
write
(
this
.
_fd
,
this
.
_pos
,
chunk
,
0
,
chunk
.
length
);
let
bytesWritten
=
await
provider
.
write
!
(
this
.
_fd
,
this
.
_pos
,
chunk
,
0
,
chunk
.
length
);
this
.
_pos
+=
bytesWritten
;
this
.
_pos
+=
bytesWritten
;
callback
();
callback
();
}
catch
(
err
)
{
}
catch
(
err
)
{
...
@@ -61,9 +61,9 @@ function createWritable(provider: IFileSystemProvider, resource: URI, opts: File
...
@@ -61,9 +61,9 @@ function createWritable(provider: IFileSystemProvider, resource: URI, opts: File
}
}
_final
(
callback
:
(
err
?:
any
)
=>
any
)
{
_final
(
callback
:
(
err
?:
any
)
=>
any
)
{
if
(
typeof
this
.
_fd
!==
'
number
'
)
{
if
(
typeof
this
.
_fd
!==
'
number
'
)
{
provider
.
open
(
resource
,
{
create
:
true
}).
then
(
fd
=>
provider
.
close
(
fd
)).
finally
(
callback
);
provider
.
open
!
(
resource
,
{
create
:
true
}).
then
(
fd
=>
provider
.
close
!
(
fd
)).
finally
(
callback
);
}
else
{
}
else
{
provider
.
close
(
this
.
_fd
).
finally
(
callback
);
provider
.
close
!
(
this
.
_fd
).
finally
(
callback
);
}
}
}
}
};
};
...
@@ -85,20 +85,20 @@ function createReadable(provider: IFileSystemProvider, resource: URI, position:
...
@@ -85,20 +85,20 @@ function createReadable(provider: IFileSystemProvider, resource: URI, position:
_pos
:
number
=
position
;
_pos
:
number
=
position
;
_reading
:
boolean
=
false
;
_reading
:
boolean
=
false
;
async
_read
(
size
?:
number
)
{
async
_read
(
size
:
number
=
2
**
10
)
{
if
(
this
.
_reading
)
{
if
(
this
.
_reading
)
{
return
;
return
;
}
}
this
.
_reading
=
true
;
this
.
_reading
=
true
;
try
{
try
{
if
(
typeof
this
.
_fd
!==
'
number
'
)
{
if
(
typeof
this
.
_fd
!==
'
number
'
)
{
this
.
_fd
=
await
provider
.
open
(
resource
,
{
create
:
false
});
this
.
_fd
=
await
provider
.
open
!
(
resource
,
{
create
:
false
});
}
}
while
(
this
.
_reading
)
{
while
(
this
.
_reading
)
{
let
buffer
=
Buffer
.
allocUnsafe
(
size
);
let
buffer
=
Buffer
.
allocUnsafe
(
size
);
let
bytesRead
=
await
provider
.
read
(
this
.
_fd
,
this
.
_pos
,
buffer
,
0
,
buffer
.
length
);
let
bytesRead
=
await
provider
.
read
!
(
this
.
_fd
,
this
.
_pos
,
buffer
,
0
,
buffer
.
length
);
if
(
bytesRead
===
0
)
{
if
(
bytesRead
===
0
)
{
await
provider
.
close
(
this
.
_fd
);
await
provider
.
close
!
(
this
.
_fd
);
this
.
_reading
=
false
;
this
.
_reading
=
false
;
this
.
push
(
null
);
this
.
push
(
null
);
}
else
{
}
else
{
...
@@ -113,7 +113,7 @@ function createReadable(provider: IFileSystemProvider, resource: URI, position:
...
@@ -113,7 +113,7 @@ function createReadable(provider: IFileSystemProvider, resource: URI, position:
}
}
_destroy
(
_err
:
any
,
callback
:
(
err
?:
any
)
=>
any
)
{
_destroy
(
_err
:
any
,
callback
:
(
err
?:
any
)
=>
any
)
{
if
(
typeof
this
.
_fd
===
'
number
'
)
{
if
(
typeof
this
.
_fd
===
'
number
'
)
{
provider
.
close
(
this
.
_fd
).
then
(
callback
,
callback
);
provider
.
close
!
(
this
.
_fd
).
then
(
callback
,
callback
);
}
}
}
}
};
};
...
@@ -126,7 +126,7 @@ function createSimpleReadable(provider: IFileSystemProvider, resource: URI, posi
...
@@ -126,7 +126,7 @@ function createSimpleReadable(provider: IFileSystemProvider, resource: URI, posi
if
(
this
.
_readOperation
)
{
if
(
this
.
_readOperation
)
{
return
;
return
;
}
}
this
.
_readOperation
=
provider
.
readFile
(
resource
).
then
(
data
=>
{
this
.
_readOperation
=
provider
.
readFile
!
(
resource
).
then
(
data
=>
{
this
.
push
(
data
.
slice
(
position
));
this
.
push
(
data
.
slice
(
position
));
this
.
push
(
null
);
this
.
push
(
null
);
},
err
=>
{
},
err
=>
{
...
@@ -141,7 +141,7 @@ export function createReadableOfSnapshot(snapshot: ITextSnapshot): Readable {
...
@@ -141,7 +141,7 @@ export function createReadableOfSnapshot(snapshot: ITextSnapshot): Readable {
return
new
Readable
({
return
new
Readable
({
read
:
function
()
{
read
:
function
()
{
try
{
try
{
let
chunk
:
string
;
let
chunk
:
string
|
null
=
null
;
let
canPush
=
true
;
let
canPush
=
true
;
// Push all chunks as long as we can push and as long as
// Push all chunks as long as we can push and as long as
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录