Skip to content

Commit 806ac7c

Browse files
mjbvzmjbvz
committed
Fix more instances of using push instead of add 
1 parent d6f88e2 commit 806ac7c

7 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎src/vs/base/browser/ui/sash/sash.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export class Sash extends Disposable {
102102
this.orthogonalStartSashDisposables.clear();
103103

104104
if (sash) {
105-
this.orthogonalStartSashDisposables.push(sash.onDidEnablementChange(this.onOrthogonalStartSashEnablementChange, this));
105+
this.orthogonalStartSashDisposables.add(sash.onDidEnablementChange(this.onOrthogonalStartSashEnablementChange, this));
106106
this.onOrthogonalStartSashEnablementChange(sash.state);
107107
} else {
108108
this.onOrthogonalStartSashEnablementChange(SashState.Disabled);
@@ -118,7 +118,7 @@ export class Sash extends Disposable {
118118
this.orthogonalEndSashDisposables.clear();
119119

120120
if (sash) {
121-
this.orthogonalEndSashDisposables.push(sash.onDidEnablementChange(this.onOrthogonalEndSashEnablementChange, this));
121+
this.orthogonalEndSashDisposables.add(sash.onDidEnablementChange(this.onOrthogonalEndSashEnablementChange, this));
122122
this.onOrthogonalEndSashEnablementChange(sash.state);
123123
} else {
124124
this.onOrthogonalEndSashEnablementChange(SashState.Disabled);

‎src/vs/editor/contrib/codeAction/test/codeAction.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ suite('CodeAction', () => {
8181
setup(function () {
8282
disposables.clear();
8383
model = TextModel.createFromString('test1\ntest2\ntest3', undefined, langId, uri);
84-
disposables.push(model);
84+
disposables.add(model);
8585
});
8686

8787
teardown(function () {
@@ -103,7 +103,7 @@ suite('CodeAction', () => {
103103
}
104104
};
105105

106-
disposables.push(CodeActionProviderRegistry.register('fooLang', provider));
106+
disposables.add(CodeActionProviderRegistry.register('fooLang', provider));
107107

108108
const expected = [
109109
// CodeActions with a diagnostics array are shown first ordered by diagnostics.message
@@ -133,7 +133,7 @@ suite('CodeAction', () => {
133133
}
134134
};
135135

136-
disposables.push(CodeActionProviderRegistry.register('fooLang', provider));
136+
disposables.add(CodeActionProviderRegistry.register('fooLang', provider));
137137

138138
{
139139
const { actions } = await getCodeActions(model, new Range(1, 1, 2, 1), { type: 'auto', filter: { kind: new CodeActionKind('a') } }, CancellationToken.None);
@@ -163,7 +163,7 @@ suite('CodeAction', () => {
163163
}
164164
};
165165

166-
disposables.push(CodeActionProviderRegistry.register('fooLang', provider));
166+
disposables.add(CodeActionProviderRegistry.register('fooLang', provider));
167167

168168
const { actions } = await getCodeActions(model, new Range(1, 1, 2, 1), { type: 'auto', filter: { kind: new CodeActionKind('a') } }, CancellationToken.None);
169169
assert.equal(actions.length, 1);
@@ -180,7 +180,7 @@ suite('CodeAction', () => {
180180
}
181181
};
182182

183-
disposables.push(CodeActionProviderRegistry.register('fooLang', provider));
183+
disposables.add(CodeActionProviderRegistry.register('fooLang', provider));
184184

185185
{
186186
const { actions } = await getCodeActions(model, new Range(1, 1, 2, 1), { type: 'auto' }, CancellationToken.None);
@@ -206,7 +206,7 @@ suite('CodeAction', () => {
206206
providedCodeActionKinds = [CodeActionKind.Refactor.value];
207207
};
208208

209-
disposables.push(CodeActionProviderRegistry.register('fooLang', provider));
209+
disposables.add(CodeActionProviderRegistry.register('fooLang', provider));
210210

211211
const { actions } = await getCodeActions(model, new Range(1, 1, 2, 1), {
212212
type: 'auto',

‎src/vs/editor/contrib/codeAction/test/codeActionModel.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ suite('CodeAction', () => {
4545

4646
test('Orcale -> marker added', done => {
4747
const reg = CodeActionProviderRegistry.register(languageIdentifier.language, testProvider);
48-
disposables.push(reg);
48+
disposables.add(reg);
4949

5050
const oracle = new CodeActionOracle(editor, markerService, (e: CodeActionsState.Triggered) => {
5151
assert.equal(e.trigger.type, 'auto');
@@ -71,7 +71,7 @@ suite('CodeAction', () => {
7171

7272
test('Orcale -> position changed', () => {
7373
const reg = CodeActionProviderRegistry.register(languageIdentifier.language, testProvider);
74-
disposables.push(reg);
74+
disposables.add(reg);
7575

7676
markerService.changeOne('fake', uri, [{
7777
startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 6,
@@ -105,7 +105,7 @@ suite('CodeAction', () => {
105105
return [];
106106
}
107107
});
108-
disposables.push(reg);
108+
disposables.add(reg);
109109

110110
editor.getModel()!.setValue('// @ts-check\n2\ncon\n');
111111

@@ -139,7 +139,7 @@ suite('CodeAction', () => {
139139

140140
test('Orcale -> should only auto trigger once for cursor and marker update right after each other', done => {
141141
const reg = CodeActionProviderRegistry.register(languageIdentifier.language, testProvider);
142-
disposables.push(reg);
142+
disposables.add(reg);
143143

144144
let triggerCount = 0;
145145
const oracle = new CodeActionOracle(editor, markerService, (e: CodeActionsState.Triggered) => {

‎src/vs/workbench/contrib/preferences/browser/preferencesActions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ export class OpenWorkspaceSettingsAction extends Action {
174174
) {
175175
super(id, label);
176176
this.update();
177-
this.disposables.push(this.workspaceContextService.onDidChangeWorkbenchState(() => this.update(), this));
177+
this.disposables.add(this.workspaceContextService.onDidChangeWorkbenchState(() => this.update(), this));
178178
}
179179

180180
private update(): void {

‎src/vs/workbench/contrib/preferences/common/preferencesContribution.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,13 @@ export class PreferencesContribution implements IWorkbenchContribution {
130130
const languageSelection = this.modeService.create('jsonc');
131131
const model = this.modelService.createModel(modelContent, languageSelection, uri);
132132
const disposables = new DisposableStore();
133-
disposables.push(schemaRegistry.onDidChangeSchema(schemaUri => {
133+
disposables.add(schemaRegistry.onDidChangeSchema(schemaUri => {
134134
if (schemaUri === uri.toString()) {
135135
schema = schemaRegistry.getSchemaContributions().schemas[uri.toString()];
136136
model.setValue(JSON.stringify(schema));
137137
}
138138
}));
139-
disposables.push(model.onWillDispose(() => disposables.dispose()));
139+
disposables.add(model.onWillDispose(() => disposables.dispose()));
140140

141141
return model;
142142
}

‎src/vs/workbench/services/textfile/test/textFileService.io.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ suite('Files - TextFileService i/o', () => {
8888
const fileService = new FileService(logService);
8989

9090
const fileProvider = new DiskFileSystemProvider(logService);
91-
disposables.push(fileService.registerProvider(Schemas.file, fileProvider));
92-
disposables.push(fileProvider);
91+
disposables.add(fileService.registerProvider(Schemas.file, fileProvider));
92+
disposables.add(fileProvider);
9393

9494
const collection = new ServiceCollection();
9595
collection.set(IFileService, fileService);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ export function extensionResultIsMatch(data: vscode.TextSearchResult): data is v
6363

6464
suite('ExtHostSearch', () => {
6565
async function registerTestTextSearchProvider(provider: vscode.TextSearchProvider, scheme = 'file'): Promise<void> {
66-
disposables.push(extHostSearch.registerTextSearchProvider(scheme, provider));
66+
disposables.add(extHostSearch.registerTextSearchProvider(scheme, provider));
6767
await rpcProtocol.sync();
6868
}
6969

7070
async function registerTestFileSearchProvider(provider: vscode.FileSearchProvider, scheme = 'file'): Promise<void> {
71-
disposables.push(extHostSearch.registerFileSearchProvider(scheme, provider));
71+
disposables.add(extHostSearch.registerFileSearchProvider(scheme, provider));
7272
await rpcProtocol.sync();
7373
}
7474

0 commit comments

Comments
 (0)