提交 7b3929a8 编写于 作者: M Matt Bierner

Fix a few callback casts for strictFunctions

With TS 2.6's strict functions mode, you cannot use a subclass in place of a parent parameter type in a callback
上级 de93fea9
......@@ -86,16 +86,16 @@ suite('Files - FileEditorInput', () => {
resolvedModelA.dispose();
return inputToResolve.resolve(true).then((resolved: TextFileEditorModel) => {
return inputToResolve.resolve(true).then(resolved => {
assert(resolvedModelA !== resolved); // Different instance, because input got disposed
let stat = resolved.getStat();
return inputToResolve.resolve(true).then((resolved: TextFileEditorModel) => {
assert(stat !== resolved.getStat()); // Different stat, because resolve always goes to the server for refresh
let stat = (resolved as TextFileEditorModel).getStat();
return inputToResolve.resolve(true).then(resolved => {
assert(stat !== (resolved as TextFileEditorModel).getStat()); // Different stat, because resolve always goes to the server for refresh
stat = resolved.getStat();
return inputToResolve.resolve(false).then((resolved: TextFileEditorModel) => {
assert(stat === resolved.getStat()); // Same stat, because not refreshed
stat = (resolved as TextFileEditorModel).getStat();
return inputToResolve.resolve(false).then(resolved => {
assert(stat === (resolved as TextFileEditorModel).getStat()); // Same stat, because not refreshed
done();
});
......
......@@ -369,8 +369,8 @@ export class FindInWorkspaceAction extends Action {
}
public run(event?: any): TPromise<any> {
return this.viewletService.openViewlet(Constants.VIEWLET_ID, true).then((viewlet: SearchViewlet) => {
viewlet.searchInFolder(null);
return this.viewletService.openViewlet(Constants.VIEWLET_ID, true).then(viewlet => {
(viewlet as SearchViewlet).searchInFolder(null);
});
}
}
......@@ -406,9 +406,9 @@ export const findInFolderCommand = (accessor: ServicesAccessor, resource?: URI)
}
}
viewletService.openViewlet(Constants.VIEWLET_ID, true).then((viewlet: SearchViewlet) => {
viewletService.openViewlet(Constants.VIEWLET_ID, true).then(viewlet => {
if (resource) {
viewlet.searchInFolder(resource);
(viewlet as SearchViewlet).searchInFolder(resource);
}
}).done(null, errors.onUnexpectedError);
};
......@@ -480,8 +480,8 @@ export class FocusNextSearchResultAction extends Action {
}
public run(): TPromise<any> {
return this.viewletService.openViewlet(Constants.VIEWLET_ID).then((searchViewlet: SearchViewlet) => {
searchViewlet.selectNextMatch();
return this.viewletService.openViewlet(Constants.VIEWLET_ID).then(searchViewlet => {
(searchViewlet as SearchViewlet).selectNextMatch();
});
}
}
......@@ -495,8 +495,8 @@ export class FocusPreviousSearchResultAction extends Action {
}
public run(): TPromise<any> {
return this.viewletService.openViewlet(Constants.VIEWLET_ID).then((searchViewlet: SearchViewlet) => {
searchViewlet.selectPreviousMatch();
return this.viewletService.openViewlet(Constants.VIEWLET_ID).then(searchViewlet => {
(searchViewlet as SearchViewlet).selectPreviousMatch();
});
}
}
......
......@@ -322,15 +322,15 @@ suite('Files - TextFileEditorModelManager', () => {
const resource = toResource('/path/index_something.txt');
manager.loadOrCreate(resource, { encoding: 'utf8' }).done((model: TextFileEditorModel) => {
manager.loadOrCreate(resource, { encoding: 'utf8' }).done(model => {
model.textEditorModel.setValue('make dirty');
manager.disposeModel(model);
manager.disposeModel(model as TextFileEditorModel);
assert.ok(!model.isDisposed());
model.revert(true);
manager.disposeModel(model);
manager.disposeModel(model as TextFileEditorModel);
assert.ok(model.isDisposed());
manager.dispose();
......
......@@ -71,9 +71,9 @@ suite('Workbench - TextModelResolverService', () => {
let resource = URI.from({ scheme: 'test', authority: null, path: 'thePath' });
let input: ResourceEditorInput = instantiationService.createInstance(ResourceEditorInput, 'The Name', 'The Description', resource);
input.resolve().then((model: ResourceEditorModel) => {
input.resolve().then(model => {
assert.ok(model);
assert.equal(model.getValue(), 'Hello Test');
assert.equal((model as ResourceEditorModel).getValue(), 'Hello Test');
let disposed = false;
once(model.onDispose)(() => {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册