Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
66b2e181
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,体验更适合开发者的 AI 搜索 >>
提交
66b2e181
编写于
4月 16, 2019
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
files2 - first cut ITextFileService.read()
上级
cc7ec60f
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
116 addition
and
25 deletion
+116
-25
src/vs/editor/common/model/textModel.ts
src/vs/editor/common/model/textModel.ts
+19
-7
src/vs/platform/files/common/files.ts
src/vs/platform/files/common/files.ts
+2
-2
src/vs/workbench/contrib/files/common/files.ts
src/vs/workbench/contrib/files/common/files.ts
+1
-1
src/vs/workbench/contrib/welcome/walkThrough/common/walkThroughContentProvider.ts
.../welcome/walkThrough/common/walkThroughContentProvider.ts
+2
-2
src/vs/workbench/services/textfile/common/textFileEditorModel.ts
...workbench/services/textfile/common/textFileEditorModel.ts
+1
-1
src/vs/workbench/services/textfile/common/textFileService.ts
src/vs/workbench/services/textfile/common/textFileService.ts
+29
-1
src/vs/workbench/services/textfile/common/textfiles.ts
src/vs/workbench/services/textfile/common/textfiles.ts
+5
-0
src/vs/workbench/services/textfile/node/textFileService.ts
src/vs/workbench/services/textfile/node/textFileService.ts
+5
-1
src/vs/workbench/services/textfile/test/fixtures/binary.txt
src/vs/workbench/services/textfile/test/fixtures/binary.txt
+0
-0
src/vs/workbench/services/textfile/test/textFileService.io.test.ts
...rkbench/services/textfile/test/textFileService.io.test.ts
+48
-10
src/vs/workbench/test/workbenchTestServices.ts
src/vs/workbench/test/workbenchTestServices.ts
+4
-0
未找到文件。
src/vs/editor/common/model/textModel.ts
浏览文件 @
66b2e181
...
...
@@ -33,6 +33,7 @@ import { BracketsUtils, RichEditBracket, RichEditBrackets } from 'vs/editor/comm
import
{
IStringStream
,
ITextSnapshot
}
from
'
vs/platform/files/common/files
'
;
import
{
ITheme
,
ThemeColor
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
withUndefinedAsNull
}
from
'
vs/base/common/types
'
;
import
{
VSBufferReadableStream
,
VSBuffer
}
from
'
vs/base/common/buffer
'
;
const
CHEAP_TOKENIZATION_LENGTH_LIMIT
=
2048
;
...
...
@@ -46,30 +47,41 @@ export function createTextBufferFactory(text: string): model.ITextBufferFactory
return
builder
.
finish
();
}
export
function
createTextBufferFactoryFromStream
(
stream
:
IStringStream
,
filter
?:
(
chunk
:
string
)
=>
string
):
Promise
<
model
.
ITextBufferFactory
>
{
return
new
Promise
<
model
.
ITextBufferFactory
>
((
c
,
e
)
=>
{
export
function
createTextBufferFactoryFromStream
(
stream
:
IStringStream
,
filter
?:
(
chunk
:
string
)
=>
string
,
validator
?:
(
chunk
:
string
)
=>
Error
|
undefined
):
Promise
<
model
.
ITextBufferFactory
>
;
export
function
createTextBufferFactoryFromStream
(
stream
:
VSBufferReadableStream
,
filter
?:
(
chunk
:
VSBuffer
)
=>
VSBuffer
,
validator
?:
(
chunk
:
VSBuffer
)
=>
Error
|
undefined
):
Promise
<
model
.
ITextBufferFactory
>
;
export
function
createTextBufferFactoryFromStream
(
stream
:
IStringStream
|
VSBufferReadableStream
,
filter
?:
(
chunk
:
any
)
=>
string
|
VSBuffer
,
validator
?:
(
chunk
:
any
)
=>
Error
|
undefined
):
Promise
<
model
.
ITextBufferFactory
>
{
return
new
Promise
<
model
.
ITextBufferFactory
>
((
resolve
,
reject
)
=>
{
const
builder
=
createTextBufferBuilder
();
let
done
=
false
;
let
builder
=
createTextBufferBuilder
();
stream
.
on
(
'
data
'
,
(
chunk
)
=>
{
stream
.
on
(
'
data
'
,
(
chunk
:
string
|
VSBuffer
)
=>
{
if
(
validator
)
{
const
error
=
validator
(
chunk
);
if
(
error
)
{
done
=
true
;
reject
(
error
);
}
}
if
(
filter
)
{
chunk
=
filter
(
chunk
);
}
builder
.
acceptChunk
(
chunk
);
builder
.
acceptChunk
(
(
typeof
chunk
===
'
string
'
)
?
chunk
:
chunk
.
toString
()
);
});
stream
.
on
(
'
error
'
,
(
error
)
=>
{
if
(
!
done
)
{
done
=
true
;
e
(
error
);
reject
(
error
);
}
});
stream
.
on
(
'
end
'
,
()
=>
{
if
(
!
done
)
{
done
=
true
;
c
(
builder
.
finish
());
resolve
(
builder
.
finish
());
}
});
});
...
...
src/vs/platform/files/common/files.ts
浏览文件 @
66b2e181
...
...
@@ -656,8 +656,8 @@ export interface IContentData {
* A Stream emitting strings.
*/
export
interface
IStringStream
{
on
(
event
:
'
data
'
,
callback
:
(
chunk
:
string
)
=>
void
):
void
;
on
(
event
:
'
error
'
,
callback
:
(
err
:
any
)
=>
void
):
void
;
on
(
event
:
'
data
'
,
callback
:
(
data
:
string
)
=>
void
):
void
;
on
(
event
:
'
error
'
,
callback
:
(
err
:
Error
)
=>
void
):
void
;
on
(
event
:
'
end
'
,
callback
:
()
=>
void
):
void
;
on
(
event
:
string
,
callback
:
any
):
void
;
}
...
...
src/vs/workbench/contrib/files/common/files.ts
浏览文件 @
66b2e181
...
...
@@ -176,7 +176,7 @@ export class FileOnDiskContentProvider implements ITextModelContentProvider {
private
resolveEditorModel
(
resource
:
URI
,
createAsNeeded
:
boolean
=
true
):
Promise
<
ITextModel
|
null
>
{
const
savedFileResource
=
toLocalResource
(
resource
,
this
.
environmentService
.
configuration
.
remoteAuthority
);
return
this
.
textFileService
.
r
ead
(
savedFileResource
).
then
(
content
=>
{
return
this
.
textFileService
.
legacyR
ead
(
savedFileResource
).
then
(
content
=>
{
let
codeEditorModel
=
this
.
modelService
.
getModel
(
resource
);
if
(
codeEditorModel
)
{
this
.
modelService
.
updateModel
(
codeEditorModel
,
content
.
value
);
...
...
src/vs/workbench/contrib/welcome/walkThrough/common/walkThroughContentProvider.ts
浏览文件 @
66b2e181
...
...
@@ -35,7 +35,7 @@ export class WalkThroughContentProvider implements ITextModelContentProvider, IW
reject
(
err
);
}
});
})
:
this
.
textFileService
.
r
ead
(
URI
.
file
(
resource
.
fsPath
)).
then
(
content
=>
content
.
value
));
})
:
this
.
textFileService
.
legacyR
ead
(
URI
.
file
(
resource
.
fsPath
)).
then
(
content
=>
content
.
value
));
return
content
.
then
(
content
=>
{
let
codeEditorModel
=
this
.
modelService
.
getModel
(
resource
);
if
(
!
codeEditorModel
)
{
...
...
@@ -61,7 +61,7 @@ export class WalkThroughSnippetContentProvider implements ITextModelContentProvi
}
public
provideTextContent
(
resource
:
URI
):
Promise
<
ITextModel
>
{
return
this
.
textFileService
.
r
ead
(
URI
.
file
(
resource
.
fsPath
)).
then
(
content
=>
{
return
this
.
textFileService
.
legacyR
ead
(
URI
.
file
(
resource
.
fsPath
)).
then
(
content
=>
{
let
codeEditorModel
=
this
.
modelService
.
getModel
(
resource
);
if
(
!
codeEditorModel
)
{
const
j
=
parseInt
(
resource
.
fragment
);
...
...
src/vs/workbench/services/textfile/common/textFileEditorModel.ts
浏览文件 @
66b2e181
...
...
@@ -306,7 +306,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
// Resolve Content
try
{
const
content
=
await
this
.
textFileService
.
r
ead
(
this
.
resource
,
{
acceptTextOnly
:
!
allowBinary
,
etag
,
encoding
:
this
.
preferredEncoding
});
const
content
=
await
this
.
textFileService
.
legacyR
ead
(
this
.
resource
,
{
acceptTextOnly
:
!
allowBinary
,
etag
,
encoding
:
this
.
preferredEncoding
});
// Clear orphaned state when loading was successful
this
.
setOrphaned
(
false
);
...
...
src/vs/workbench/services/textfile/common/textFileService.ts
浏览文件 @
66b2e181
...
...
@@ -37,6 +37,7 @@ import { IModeService } from 'vs/editor/common/services/modeService';
import
{
IEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
coalesce
}
from
'
vs/base/common/arrays
'
;
import
{
trim
}
from
'
vs/base/common/strings
'
;
import
{
VSBuffer
}
from
'
vs/base/common/buffer
'
;
/**
* The workbench file service implementation implements the raw file service spec and adds additional methods on top.
...
...
@@ -366,9 +367,36 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
//#endregion
//#region primitives (re
solve
, create, move, delete, update)
//#region primitives (re
ad
, create, move, delete, update)
async
read
(
resource
:
URI
,
options
?:
IReadTextFileOptions
):
Promise
<
ITextFileContent
>
{
const
stream
=
await
this
.
fileService
.
readFileStream
(
resource
,
options
);
// in case of acceptTextOnly: true, we check the first
// chunk for possibly being binary by looking for 0-bytes
let
checkedForBinary
=
false
;
const
throwOnBinary
=
(
data
:
VSBuffer
):
Error
|
undefined
=>
{
if
(
!
checkedForBinary
)
{
checkedForBinary
=
true
;
for
(
let
i
=
0
;
i
<
data
.
byteLength
&&
i
<
512
;
i
++
)
{
if
(
data
.
readUint8
(
i
)
===
0
)
{
throw
new
FileOperationError
(
nls
.
localize
(
'
fileBinaryError
'
,
"
File seems to be binary and cannot be opened as text
"
),
FileOperationResult
.
FILE_IS_BINARY
,
options
);
}
}
}
return
undefined
;
};
return
{
...
stream
,
encoding
:
'
utf8
'
,
value
:
await
createTextBufferFactoryFromStream
(
stream
.
value
,
undefined
,
options
&&
options
.
acceptTextOnly
?
throwOnBinary
:
undefined
)
};
}
async
legacyRead
(
resource
:
URI
,
options
?:
IReadTextFileOptions
):
Promise
<
ITextFileContent
>
{
const
streamContent
=
await
this
.
fileService
.
resolveStreamContent
(
resource
,
options
);
const
value
=
await
createTextBufferFactoryFromStream
(
streamContent
.
value
);
...
...
src/vs/workbench/services/textfile/common/textfiles.ts
浏览文件 @
66b2e181
...
...
@@ -100,6 +100,11 @@ export interface ITextFileService extends IDisposable {
*/
create
(
resource
:
URI
,
contents
?:
string
|
ITextSnapshot
,
options
?:
{
overwrite
?:
boolean
}):
Promise
<
IFileStatWithMetadata
>
;
/**
* @deprecated use read() instead
*/
legacyRead
(
resource
:
URI
,
options
?:
IReadTextFileOptions
):
Promise
<
ITextFileContent
>
;
/**
* Read the contents of a file identified by the resource.
*/
...
...
src/vs/workbench/services/textfile/node/textFileService.ts
浏览文件 @
66b2e181
...
...
@@ -6,7 +6,7 @@
import
{
tmpdir
}
from
'
os
'
;
import
{
localize
}
from
'
vs/nls
'
;
import
{
TextFileService
}
from
'
vs/workbench/services/textfile/common/textFileService
'
;
import
{
ITextFileService
}
from
'
vs/workbench/services/textfile/common/textfiles
'
;
import
{
ITextFileService
,
ITextFileContent
}
from
'
vs/workbench/services/textfile/common/textfiles
'
;
import
{
registerSingleton
}
from
'
vs/platform/instantiation/common/extensions
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
ITextSnapshot
,
IWriteTextFileOptions
,
IFileStatWithMetadata
,
IResourceEncoding
,
IReadTextFileOptions
,
stringToSnapshot
,
ICreateFileOptions
,
FileOperationError
,
FileOperationResult
,
IResourceEncodings
}
from
'
vs/platform/files/common/files
'
;
...
...
@@ -37,6 +37,10 @@ export class NodeTextFileService extends TextFileService {
return
this
.
_encoding
;
}
async
read
(
resource
:
URI
,
options
?:
IReadTextFileOptions
):
Promise
<
ITextFileContent
>
{
return
super
.
read
(
resource
,
options
);
}
protected
async
doCreate
(
resource
:
URI
,
value
?:
string
,
options
?:
ICreateFileOptions
):
Promise
<
IFileStatWithMetadata
>
{
// check for encoding
...
...
src/vs/workbench/services/textfile/test/fixtures/binary.txt
0 → 100644
浏览文件 @
66b2e181
文件已添加
src/vs/workbench/services/textfile/test/textFileService.io.test.ts
浏览文件 @
66b2e181
...
...
@@ -9,7 +9,7 @@ import { workbenchInstantiationService, TestLifecycleService, TestTextFileServic
import
{
IWindowsService
}
from
'
vs/platform/windows/common/windows
'
;
import
{
ITextFileService
}
from
'
vs/workbench/services/textfile/common/textfiles
'
;
import
{
IUntitledEditorService
}
from
'
vs/workbench/services/untitled/common/untitledEditorService
'
;
import
{
IFileService
,
ITextSnapshot
,
snapshotToString
}
from
'
vs/platform/files/common/files
'
;
import
{
IFileService
,
ITextSnapshot
,
snapshotToString
,
FileOperationError
,
FileOperationResult
}
from
'
vs/platform/files/common/files
'
;
import
{
TextFileEditorModelManager
}
from
'
vs/workbench/services/textfile/common/textFileEditorModelManager
'
;
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IModelService
}
from
'
vs/editor/common/services/modelService
'
;
...
...
@@ -24,7 +24,7 @@ import { getRandomTestPath } from 'vs/base/test/node/testUtils';
import
{
tmpdir
}
from
'
os
'
;
import
{
DiskFileSystemProvider
}
from
'
vs/workbench/services/files2/node/diskFileSystemProvider
'
;
import
{
generateUuid
}
from
'
vs/base/common/uuid
'
;
import
{
join
}
from
'
vs/base/common/path
'
;
import
{
join
,
basename
}
from
'
vs/base/common/path
'
;
import
{
getPathFromAmdModule
}
from
'
vs/base/common/amd
'
;
import
{
detectEncodingByBOM
,
UTF16be
,
UTF16le
,
UTF8_with_bom
,
UTF8
}
from
'
vs/base/node/encoding
'
;
import
{
NodeTextFileService
,
EncodingOracle
,
IEncodingOverride
}
from
'
vs/workbench/services/textfile/node/textFileService
'
;
...
...
@@ -32,6 +32,7 @@ import { LegacyFileService } from 'vs/workbench/services/files/node/fileService'
import
{
DefaultEndOfLine
}
from
'
vs/editor/common/model
'
;
import
{
TextModel
}
from
'
vs/editor/common/model/textModel
'
;
import
{
isWindows
}
from
'
vs/base/common/platform
'
;
import
{
readFileSync
,
statSync
}
from
'
fs
'
;
class
ServiceAccessor
{
constructor
(
...
...
@@ -246,7 +247,7 @@ suite('Files - TextFileService i/o', () => {
const
detectedEncoding
=
await
detectEncodingByBOM
(
resource
.
fsPath
);
assert
.
equal
(
detectedEncoding
,
encoding
);
const
resolved
=
await
service
.
r
ead
(
resource
);
const
resolved
=
await
service
.
legacyR
ead
(
resource
);
assert
.
equal
(
resolved
.
encoding
,
encoding
);
assert
.
equal
(
snapshotToString
(
resolved
.
value
.
create
(
isWindows
?
DefaultEndOfLine
.
CRLF
:
DefaultEndOfLine
.
LF
).
createSnapshot
(
false
)),
expectedContent
);
...
...
@@ -273,18 +274,18 @@ suite('Files - TextFileService i/o', () => {
});
async
function
testEncodingKeepsData
(
resource
:
URI
,
encoding
:
string
,
expected
:
string
)
{
let
resolved
=
await
service
.
r
ead
(
resource
,
{
encoding
});
let
resolved
=
await
service
.
legacyR
ead
(
resource
,
{
encoding
});
const
content
=
snapshotToString
(
resolved
.
value
.
create
(
isWindows
?
DefaultEndOfLine
.
CRLF
:
DefaultEndOfLine
.
LF
).
createSnapshot
(
false
));
assert
.
equal
(
content
,
expected
);
await
service
.
write
(
resource
,
content
,
{
encoding
});
resolved
=
await
service
.
r
ead
(
resource
,
{
encoding
});
resolved
=
await
service
.
legacyR
ead
(
resource
,
{
encoding
});
assert
.
equal
(
snapshotToString
(
resolved
.
value
.
create
(
DefaultEndOfLine
.
CRLF
).
createSnapshot
(
false
)),
content
);
await
service
.
write
(
resource
,
TextModel
.
createFromString
(
content
).
createSnapshot
(),
{
encoding
});
resolved
=
await
service
.
r
ead
(
resource
,
{
encoding
});
resolved
=
await
service
.
legacyR
ead
(
resource
,
{
encoding
});
assert
.
equal
(
snapshotToString
(
resolved
.
value
.
create
(
DefaultEndOfLine
.
CRLF
).
createSnapshot
(
false
)),
content
);
}
...
...
@@ -295,7 +296,7 @@ suite('Files - TextFileService i/o', () => {
await
service
.
write
(
resource
,
content
);
const
resolved
=
await
service
.
r
ead
(
resource
);
const
resolved
=
await
service
.
legacyR
ead
(
resource
);
assert
.
equal
(
snapshotToString
(
resolved
.
value
.
create
(
isWindows
?
DefaultEndOfLine
.
CRLF
:
DefaultEndOfLine
.
LF
).
createSnapshot
(
false
)),
content
);
});
...
...
@@ -306,14 +307,14 @@ suite('Files - TextFileService i/o', () => {
await
service
.
write
(
resource
,
TextModel
.
createFromString
(
content
).
createSnapshot
());
const
resolved
=
await
service
.
r
ead
(
resource
);
const
resolved
=
await
service
.
legacyR
ead
(
resource
);
assert
.
equal
(
snapshotToString
(
resolved
.
value
.
create
(
isWindows
?
DefaultEndOfLine
.
CRLF
:
DefaultEndOfLine
.
LF
).
createSnapshot
(
false
)),
content
);
});
test
(
'
write - encoding preserved (UTF 16 LE) - content as string
'
,
async
()
=>
{
const
resource
=
URI
.
file
(
join
(
testDir
,
'
some_utf16le.css
'
));
const
resolved
=
await
service
.
r
ead
(
resource
);
const
resolved
=
await
service
.
legacyR
ead
(
resource
);
assert
.
equal
(
resolved
.
encoding
,
UTF16le
);
await
testEncoding
(
URI
.
file
(
join
(
testDir
,
'
some_utf16le.css
'
)),
UTF16le
,
'
Hello
\n
World
'
,
'
Hello
\n
World
'
);
...
...
@@ -322,7 +323,7 @@ suite('Files - TextFileService i/o', () => {
test
(
'
write - encoding preserved (UTF 16 LE) - content as snapshot
'
,
async
()
=>
{
const
resource
=
URI
.
file
(
join
(
testDir
,
'
some_utf16le.css
'
));
const
resolved
=
await
service
.
r
ead
(
resource
);
const
resolved
=
await
service
.
legacyR
ead
(
resource
);
assert
.
equal
(
resolved
.
encoding
,
UTF16le
);
await
testEncoding
(
URI
.
file
(
join
(
testDir
,
'
some_utf16le.css
'
)),
UTF16le
,
TextModel
.
createFromString
(
'
Hello
\n
World
'
).
createSnapshot
(),
'
Hello
\n
World
'
);
...
...
@@ -412,4 +413,41 @@ suite('Files - TextFileService i/o', () => {
let
detectedEncoding
=
await
detectEncodingByBOM
(
resource
.
fsPath
);
assert
.
equal
(
detectedEncoding
,
UTF8
);
});
test
(
'
read - small text
'
,
async
()
=>
{
const
resource
=
URI
.
file
(
join
(
testDir
,
'
small.txt
'
));
await
testReadFile
(
resource
);
});
test
(
'
read - large text
'
,
async
()
=>
{
const
resource
=
URI
.
file
(
join
(
testDir
,
'
lorem.txt
'
));
await
testReadFile
(
resource
);
});
async
function
testReadFile
(
resource
:
URI
):
Promise
<
void
>
{
const
result
=
await
service
.
read
(
resource
);
assert
.
equal
(
result
.
name
,
basename
(
resource
.
fsPath
));
assert
.
equal
(
result
.
size
,
statSync
(
resource
.
fsPath
).
size
);
assert
.
equal
(
snapshotToString
(
result
.
value
.
create
(
DefaultEndOfLine
.
LF
).
createSnapshot
(
false
)),
readFileSync
(
resource
.
fsPath
));
}
test
(
'
read - FILE_IS_BINARY
'
,
async
()
=>
{
const
resource
=
URI
.
file
(
join
(
testDir
,
'
binary.txt
'
));
let
error
:
FileOperationError
|
undefined
=
undefined
;
try
{
await
service
.
read
(
resource
,
{
acceptTextOnly
:
true
});
}
catch
(
err
)
{
error
=
err
;
}
assert
.
ok
(
error
);
assert
.
equal
(
error
!
.
fileOperationResult
,
FileOperationResult
.
FILE_IS_BINARY
);
const
result
=
await
service
.
read
(
URI
.
file
(
join
(
testDir
,
'
small.txt
'
)),
{
acceptTextOnly
:
true
});
assert
.
equal
(
result
.
name
,
'
small.txt
'
);
});
});
src/vs/workbench/test/workbenchTestServices.ts
浏览文件 @
66b2e181
...
...
@@ -235,6 +235,10 @@ export class TestTextFileService extends BrowserTextFileService {
this
.
resolveTextContentError
=
error
;
}
public
legacyRead
(
resource
:
URI
,
options
?:
IReadTextFileOptions
):
Promise
<
ITextFileContent
>
{
return
this
.
read
(
resource
,
options
);
}
public
read
(
resource
:
URI
,
options
?:
IReadTextFileOptions
):
Promise
<
ITextFileContent
>
{
if
(
this
.
resolveTextContentError
)
{
const
error
=
this
.
resolveTextContentError
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录