Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
7d884520
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,发现更多精彩内容 >>
提交
7d884520
编写于
3月 05, 2019
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Strict null check mainThreadSaveParticpants
上级
181ab9f3
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
17 addition
and
12 deletion
+17
-12
src/tsconfig.strictNullChecks.json
src/tsconfig.strictNullChecks.json
+1
-0
src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
...rkbench/api/electron-browser/mainThreadSaveParticipant.ts
+8
-8
src/vs/workbench/services/textfile/common/textFileEditorModel.ts
...workbench/services/textfile/common/textFileEditorModel.ts
+2
-2
src/vs/workbench/services/textfile/common/textfiles.ts
src/vs/workbench/services/textfile/common/textfiles.ts
+6
-2
未找到文件。
src/tsconfig.strictNullChecks.json
浏览文件 @
7d884520
...
...
@@ -32,6 +32,7 @@
"./vs/workbench/services/timer/**/*.ts"
],
"files"
:
[
"./vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts"
,
"./vs/monaco.d.ts"
,
"./vs/nls.d.ts"
,
"./vs/nls.mock.ts"
,
...
...
src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
浏览文件 @
7d884520
...
...
@@ -34,7 +34,7 @@ import { ILogService } from 'vs/platform/log/common/log';
import
{
IProgressService2
,
ProgressLocation
}
from
'
vs/platform/progress/common/progress
'
;
import
{
extHostCustomer
}
from
'
vs/workbench/api/electron-browser/extHostCustomers
'
;
import
{
TextFileEditorModel
}
from
'
vs/workbench/services/textfile/common/textFileEditorModel
'
;
import
{
ISaveParticipant
,
ITextFileEditorModel
,
SaveReason
}
from
'
vs/workbench/services/textfile/common/textfiles
'
;
import
{
ISaveParticipant
,
SaveReason
,
IActiveTextFileEditorModel
}
from
'
vs/workbench/services/textfile/common/textfiles
'
;
import
{
ExtHostContext
,
ExtHostDocumentSaveParticipantShape
,
IExtHostContext
}
from
'
../node/extHost.protocol
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
...
...
@@ -51,7 +51,7 @@ class TrimWhitespaceParticipant implements ISaveParticipantParticipant {
// Nothing
}
async
participate
(
model
:
ITextFileEditorModel
,
env
:
{
reason
:
SaveReason
}):
Promise
<
void
>
{
async
participate
(
model
:
I
Active
TextFileEditorModel
,
env
:
{
reason
:
SaveReason
}):
Promise
<
void
>
{
if
(
this
.
configurationService
.
getValue
(
'
files.trimTrailingWhitespace
'
,
{
overrideIdentifier
:
model
.
textEditorModel
.
getLanguageIdentifier
().
language
,
resource
:
model
.
getResource
()
}))
{
this
.
doTrimTrailingWhitespace
(
model
.
textEditorModel
,
env
.
reason
===
SaveReason
.
AUTO
);
}
...
...
@@ -113,7 +113,7 @@ export class FinalNewLineParticipant implements ISaveParticipantParticipant {
// Nothing
}
async
participate
(
model
:
ITextFileEditorModel
,
env
:
{
reason
:
SaveReason
}):
Promise
<
void
>
{
async
participate
(
model
:
I
Active
TextFileEditorModel
,
env
:
{
reason
:
SaveReason
}):
Promise
<
void
>
{
if
(
this
.
configurationService
.
getValue
(
'
files.insertFinalNewline
'
,
{
overrideIdentifier
:
model
.
textEditorModel
.
getLanguageIdentifier
().
language
,
resource
:
model
.
getResource
()
}))
{
this
.
doInsertFinalNewLine
(
model
.
textEditorModel
);
}
...
...
@@ -151,7 +151,7 @@ export class TrimFinalNewLinesParticipant implements ISaveParticipantParticipant
// Nothing
}
async
participate
(
model
:
ITextFileEditorModel
,
env
:
{
reason
:
SaveReason
}):
Promise
<
void
>
{
async
participate
(
model
:
I
Active
TextFileEditorModel
,
env
:
{
reason
:
SaveReason
}):
Promise
<
void
>
{
if
(
this
.
configurationService
.
getValue
(
'
files.trimFinalNewlines
'
,
{
overrideIdentifier
:
model
.
textEditorModel
.
getLanguageIdentifier
().
language
,
resource
:
model
.
getResource
()
}))
{
this
.
doTrimFinalNewLines
(
model
.
textEditorModel
,
env
.
reason
===
SaveReason
.
AUTO
);
}
...
...
@@ -222,7 +222,7 @@ class FormatOnSaveParticipant implements ISaveParticipantParticipant {
// Nothing
}
async
participate
(
editorModel
:
ITextFileEditorModel
,
env
:
{
reason
:
SaveReason
}):
Promise
<
void
>
{
async
participate
(
editorModel
:
I
Active
TextFileEditorModel
,
env
:
{
reason
:
SaveReason
}):
Promise
<
void
>
{
const
model
=
editorModel
.
textEditorModel
;
if
(
env
.
reason
===
SaveReason
.
AUTO
...
...
@@ -293,7 +293,7 @@ class CodeActionOnSaveParticipant implements ISaveParticipant {
@
IConfigurationService
private
readonly
_configurationService
:
IConfigurationService
)
{
}
async
participate
(
editorModel
:
ITextFileEditorModel
,
env
:
{
reason
:
SaveReason
}):
Promise
<
void
>
{
async
participate
(
editorModel
:
I
Active
TextFileEditorModel
,
env
:
{
reason
:
SaveReason
}):
Promise
<
void
>
{
if
(
env
.
reason
===
SaveReason
.
AUTO
)
{
return
undefined
;
}
...
...
@@ -373,7 +373,7 @@ class ExtHostSaveParticipant implements ISaveParticipantParticipant {
this
.
_proxy
=
extHostContext
.
getProxy
(
ExtHostContext
.
ExtHostDocumentSaveParticipant
);
}
async
participate
(
editorModel
:
ITextFileEditorModel
,
env
:
{
reason
:
SaveReason
}):
Promise
<
void
>
{
async
participate
(
editorModel
:
I
Active
TextFileEditorModel
,
env
:
{
reason
:
SaveReason
}):
Promise
<
void
>
{
if
(
!
shouldSynchronizeModel
(
editorModel
.
textEditorModel
))
{
// the model never made it to the extension
...
...
@@ -424,7 +424,7 @@ export class SaveParticipant implements ISaveParticipant {
this
.
_saveParticipants
.
dispose
();
}
async
participate
(
model
:
ITextFileEditorModel
,
env
:
{
reason
:
SaveReason
}):
Promise
<
void
>
{
async
participate
(
model
:
I
Active
TextFileEditorModel
,
env
:
{
reason
:
SaveReason
}):
Promise
<
void
>
{
return
this
.
_progressService
.
withProgress
({
location
:
ProgressLocation
.
Window
},
progress
=>
{
progress
.
report
({
message
:
localize
(
'
saveParticipants
'
,
"
Running Save Participants...
"
)
});
const
promiseFactory
=
this
.
_saveParticipants
.
getValue
().
map
(
p
=>
()
=>
{
...
...
src/vs/workbench/services/textfile/common/textFileEditorModel.ts
浏览文件 @
7d884520
...
...
@@ -12,7 +12,7 @@ import { URI } from 'vs/base/common/uri';
import
{
isUndefinedOrNull
}
from
'
vs/base/common/types
'
;
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
ITextFileService
,
IAutoSaveConfiguration
,
ModelState
,
ITextFileEditorModel
,
ISaveOptions
,
ISaveErrorHandler
,
ISaveParticipant
,
StateChange
,
SaveReason
,
IRawTextContent
,
ILoadOptions
,
LoadReason
}
from
'
vs/workbench/services/textfile/common/textfiles
'
;
import
{
ITextFileService
,
IAutoSaveConfiguration
,
ModelState
,
ITextFileEditorModel
,
ISaveOptions
,
ISaveErrorHandler
,
ISaveParticipant
,
StateChange
,
SaveReason
,
IRawTextContent
,
ILoadOptions
,
LoadReason
,
IActiveTextFileEditorModel
}
from
'
vs/workbench/services/textfile/common/textfiles
'
;
import
{
EncodingMode
}
from
'
vs/workbench/common/editor
'
;
import
{
BaseTextEditorModel
}
from
'
vs/workbench/common/editor/textEditorModel
'
;
import
{
IBackupFileService
}
from
'
vs/workbench/services/backup/common/backup
'
;
...
...
@@ -661,7 +661,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
};
this
.
blockModelContentChange
=
true
;
saveParticipantPromise
=
TextFileEditorModel
.
saveParticipant
.
participate
(
this
,
{
reason
:
options
.
reason
}).
then
(
onCompleteOrError
,
onCompleteOrError
);
saveParticipantPromise
=
TextFileEditorModel
.
saveParticipant
.
participate
(
this
as
IActiveTextFileEditorModel
,
{
reason
:
options
.
reason
}).
then
(
onCompleteOrError
,
onCompleteOrError
);
}
// mark the save participant as current pending save operation
...
...
src/vs/workbench/services/textfile/common/textfiles.ts
浏览文件 @
7d884520
...
...
@@ -10,7 +10,7 @@ import { IEncodingSupport, ConfirmResult, IRevertOptions } from 'vs/workbench/co
import
{
IBaseStat
,
IResolveContentOptions
,
ITextSnapshot
}
from
'
vs/platform/files/common/files
'
;
import
{
createDecorator
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
ITextEditorModel
}
from
'
vs/editor/common/services/resolverService
'
;
import
{
ITextBufferFactory
}
from
'
vs/editor/common/model
'
;
import
{
ITextBufferFactory
,
ITextModel
}
from
'
vs/editor/common/model
'
;
import
{
RawContextKey
}
from
'
vs/platform/contextkey/common/contextkey
'
;
/**
...
...
@@ -29,7 +29,7 @@ export interface ISaveParticipant {
/**
* Participate in a save of a model. Allows to change the model before it is being saved to disk.
*/
participate
(
model
:
ITextFileEditorModel
,
env
:
{
reason
:
SaveReason
}):
Promise
<
void
>
;
participate
(
model
:
I
Active
TextFileEditorModel
,
env
:
{
reason
:
SaveReason
}):
Promise
<
void
>
;
}
/**
...
...
@@ -255,6 +255,10 @@ export interface ITextFileEditorModel extends ITextEditorModel, IEncodingSupport
isDisposed
():
boolean
;
}
export
interface
IActiveTextFileEditorModel
extends
ITextFileEditorModel
{
readonly
textEditorModel
:
ITextModel
;
}
export
interface
IWillMoveEvent
{
oldResource
:
URI
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录