Skip to content

Commit 11e98bd

Browse files
alexdimaalexdima
committed
Simplify types (fixes microsoft#70491)
1 parent ddc39cb commit 11e98bd

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎src/vs/editor/common/services/modelService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export const IModelService = createDecorator<IModelService>('modelService');
1414
export interface IModelService {
1515
_serviceBrand: any;
1616

17-
createModel(value: string | ITextBufferFactory, languageSelection: ILanguageSelection | null, resource: URI | undefined, isForSimpleWidget?: boolean): ITextModel;
17+
createModel(value: string | ITextBufferFactory, languageSelection: ILanguageSelection | null, resource?: URI, isForSimpleWidget?: boolean): ITextModel;
1818

1919
updateModel(model: ITextModel, value: string | ITextBufferFactory): void;
2020

‎src/vs/editor/common/services/modelServiceImpl.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ export class ModelServiceImpl extends Disposable implements IModelService {
190190
};
191191
}
192192

193-
public getCreationOptions(language: string, resource: URI | null | undefined, isForSimpleWidget: boolean): ITextModelCreationOptions {
193+
public getCreationOptions(language: string, resource: URI | undefined, isForSimpleWidget: boolean): ITextModelCreationOptions {
194194
let creationOptions = this._modelCreationOptionsByLanguageAndResource[language + resource];
195195
if (!creationOptions) {
196196
const editor = this._configurationService.getValue<IRawEditorConfig>('editor', { overrideIdentifier: language, resource });
@@ -252,7 +252,7 @@ export class ModelServiceImpl extends Disposable implements IModelService {
252252

253253
// --- begin IModelService
254254

255-
private _createModelData(value: string | ITextBufferFactory, languageIdentifier: LanguageIdentifier, resource: URI | null | undefined, isForSimpleWidget: boolean): ModelData {
255+
private _createModelData(value: string | ITextBufferFactory, languageIdentifier: LanguageIdentifier, resource: URI | undefined, isForSimpleWidget: boolean): ModelData {
256256
// create & save the model
257257
const options = this.getCreationOptions(languageIdentifier.language, resource, isForSimpleWidget);
258258
const model: TextModel = new TextModel(value, options, languageIdentifier, resource);
@@ -343,7 +343,7 @@ export class ModelServiceImpl extends Disposable implements IModelService {
343343
return [EditOperation.replaceMove(oldRange, textBuffer.getValueInRange(newRange, EndOfLinePreference.TextDefined))];
344344
}
345345

346-
public createModel(value: string | ITextBufferFactory, languageSelection: ILanguageSelection | null, resource: URI | null | undefined, isForSimpleWidget: boolean = false): ITextModel {
346+
public createModel(value: string | ITextBufferFactory, languageSelection: ILanguageSelection | null, resource?: URI, isForSimpleWidget: boolean = false): ITextModel {
347347
let modelData: ModelData;
348348

349349
if (languageSelection) {

‎src/vs/editor/test/common/services/modelService.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ suite('ModelService', () => {
3535
});
3636

3737
test('EOL setting respected depending on root', () => {
38-
const model1 = modelService.createModel('farboo', null, null);
38+
const model1 = modelService.createModel('farboo', null);
3939
const model2 = modelService.createModel('farboo', null, URI.file(platform.isWindows ? 'c:\\myroot\\myfile.txt' : '/myroot/myfile.txt'));
4040
const model3 = modelService.createModel('farboo', null, URI.file(platform.isWindows ? 'c:\\other\\myfile.txt' : '/other/myfile.txt'));
4141

‎src/vs/workbench/test/electron-browser/api/mainThreadDocumentsAndEditors.test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ suite('MainThreadDocumentsAndEditors', () => {
9090
test('Model#add', () => {
9191
deltas.length = 0;
9292

93-
modelService.createModel('farboo', null, null);
93+
modelService.createModel('farboo', null);
9494

9595
assert.equal(deltas.length, 1);
9696
const [delta] = deltas;
@@ -105,7 +105,7 @@ suite('MainThreadDocumentsAndEditors', () => {
105105
test('ignore huge model', function () {
106106
this.timeout(1000 * 60); // increase timeout for this one test
107107

108-
const model = modelService.createModel(hugeModelString, null, null);
108+
const model = modelService.createModel(hugeModelString, null);
109109
assert.ok(model.isTooLargeForSyncing());
110110

111111
assert.equal(deltas.length, 1);
@@ -120,7 +120,7 @@ suite('MainThreadDocumentsAndEditors', () => {
120120
test('ignore simple widget model', function () {
121121
this.timeout(1000 * 60); // increase timeout for this one test
122122

123-
const model = modelService.createModel('test', null, null, true);
123+
const model = modelService.createModel('test', null, undefined, true);
124124
assert.ok(model.isForSimpleWidget);
125125

126126
assert.equal(deltas.length, 1);
@@ -135,7 +135,7 @@ suite('MainThreadDocumentsAndEditors', () => {
135135
test('ignore huge model from editor', function () {
136136
this.timeout(1000 * 60); // increase timeout for this one test
137137

138-
const model = modelService.createModel(hugeModelString, null, null);
138+
const model = modelService.createModel(hugeModelString, null);
139139
const editor = myCreateTestCodeEditor(model);
140140

141141
assert.equal(deltas.length, 1);
@@ -161,7 +161,7 @@ suite('MainThreadDocumentsAndEditors', () => {
161161
test('editor with model', () => {
162162
deltas.length = 0;
163163

164-
const model = modelService.createModel('farboo', null, null);
164+
const model = modelService.createModel('farboo', null);
165165
const editor = myCreateTestCodeEditor(model);
166166

167167
assert.equal(deltas.length, 2);
@@ -182,8 +182,8 @@ suite('MainThreadDocumentsAndEditors', () => {
182182
});
183183

184184
test('editor with dispos-ed/-ing model', () => {
185-
modelService.createModel('foobar', null, null);
186-
const model = modelService.createModel('farboo', null, null);
185+
modelService.createModel('foobar', null);
186+
const model = modelService.createModel('farboo', null);
187187
const editor = myCreateTestCodeEditor(model);
188188

189189
// ignore things until now

0 commit comments

Comments
 (0)