Skip to content

Commit dc517c0

Browse files
alexdimaalexdima
committed
Renames (microsoft#37834)
1 parent ad75f5e commit dc517c0

19 files changed

Lines changed: 163 additions & 167 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'use strict';
66

77
import * as assert from 'assert';
8-
import { withMockCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
8+
import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
99
import { Position } from 'vs/editor/common/core/position';
1010
import { Model } from 'vs/editor/common/model/model';
1111
import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
@@ -34,7 +34,7 @@ suite('bracket matching', () => {
3434
let mode = new BracketMode();
3535
let model = Model.createFromString('var x = (3 + (5-7)) + ((5+3)+5);', undefined, mode.getLanguageIdentifier());
3636

37-
withMockCodeEditor(null, { model: model }, (editor, cursor) => {
37+
withTestCodeEditor(null, { model: model }, (editor, cursor) => {
3838
let bracketMatchingController = editor.registerAndInstantiateContribution<BracketMatchingController>(BracketMatchingController);
3939

4040
// start on closing bracket
@@ -66,7 +66,7 @@ suite('bracket matching', () => {
6666
let mode = new BracketMode();
6767
let model = Model.createFromString('var x = (3 + (5-7)); y();', undefined, mode.getLanguageIdentifier());
6868

69-
withMockCodeEditor(null, { model: model }, (editor, cursor) => {
69+
withTestCodeEditor(null, { model: model }, (editor, cursor) => {
7070
let bracketMatchingController = editor.registerAndInstantiateContribution<BracketMatchingController>(BracketMatchingController);
7171

7272
// start position between brackets

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import * as assert from 'assert';
88
import { Position } from 'vs/editor/common/core/position';
99
import { Range } from 'vs/editor/common/core/range';
1010
import { getSelectionSearchString } from 'vs/editor/contrib/find/common/find';
11-
import { withMockCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
11+
import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
1212

1313

1414
suite('Find', () => {
1515

1616
test('search string at position', () => {
17-
withMockCodeEditor([
17+
withTestCodeEditor([
1818
'ABC DEF',
1919
'0123 456'
2020
], {}, (editor, cursor) => {
@@ -37,7 +37,7 @@ suite('Find', () => {
3737
});
3838

3939
test('search string with selection', () => {
40-
withMockCodeEditor([
40+
withTestCodeEditor([
4141
'ABC DEF',
4242
'0123 456'
4343
], {}, (editor, cursor) => {
@@ -61,7 +61,7 @@ suite('Find', () => {
6161
});
6262

6363
test('search string with multiline selection', () => {
64-
withMockCodeEditor([
64+
withTestCodeEditor([
6565
'ABC DEF',
6666
'0123 456'
6767
], {}, (editor, cursor) => {

‎src/vs/editor/contrib/find/test/findController.test.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { Selection } from 'vs/editor/common/core/selection';
1313
import { Range } from 'vs/editor/common/core/range';
1414
import { ICommonCodeEditor } from 'vs/editor/common/editorCommon';
1515
import { CommonFindController, FindStartFocusAction, IFindStartOptions, NextMatchFindAction, StartFindAction } from 'vs/editor/contrib/find/common/findController';
16-
import { withMockCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
16+
import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
1717
import { HistoryNavigator } from 'vs/base/common/history';
1818
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
1919
import { IStorageService } from 'vs/platform/storage/common/storage';
@@ -78,7 +78,7 @@ suite('FindController', () => {
7878
} as IStorageService);
7979

8080
test('issue #1857: F3, Find Next, acts like "Find Under Cursor"', () => {
81-
withMockCodeEditor([
81+
withTestCodeEditor([
8282
'ABC',
8383
'ABC',
8484
'XYZ',
@@ -136,7 +136,7 @@ suite('FindController', () => {
136136
});
137137

138138
test('issue #3090: F3 does not loop with two matches on a single line', () => {
139-
withMockCodeEditor([
139+
withTestCodeEditor([
140140
'import nls = require(\'vs/nls\');'
141141
], { serviceCollection: serviceCollection }, (editor, cursor) => {
142142

@@ -159,7 +159,7 @@ suite('FindController', () => {
159159
});
160160

161161
test('issue #6149: Auto-escape highlighted text for search and replace regex mode', () => {
162-
withMockCodeEditor([
162+
withTestCodeEditor([
163163
'var x = (3 * 5)',
164164
'var y = (3 * 5)',
165165
'var z = (3 * 5)',
@@ -185,7 +185,7 @@ suite('FindController', () => {
185185
});
186186

187187
test('issue #9043: Clear search scope when find widget is hidden', () => {
188-
withMockCodeEditor([
188+
withTestCodeEditor([
189189
'var x = (3 * 5)',
190190
'var y = (3 * 5)',
191191
'var z = (3 * 5)',
@@ -213,7 +213,7 @@ suite('FindController', () => {
213213
});
214214

215215
test('find term is added to history on state change', () => {
216-
withMockCodeEditor([
216+
withTestCodeEditor([
217217
'var x = (3 * 5)',
218218
'var y = (3 * 5)',
219219
'var z = (3 * 5)',
@@ -229,7 +229,7 @@ suite('FindController', () => {
229229
});
230230

231231
test('find term is added with delay', (done) => {
232-
withMockCodeEditor([
232+
withTestCodeEditor([
233233
'var x = (3 * 5)',
234234
'var y = (3 * 5)',
235235
'var z = (3 * 5)',
@@ -249,7 +249,7 @@ suite('FindController', () => {
249249
});
250250

251251
test('show previous find term', () => {
252-
withMockCodeEditor([
252+
withTestCodeEditor([
253253
'var x = (3 * 5)',
254254
'var y = (3 * 5)',
255255
'var z = (3 * 5)',
@@ -266,7 +266,7 @@ suite('FindController', () => {
266266
});
267267

268268
test('show previous find term do not update history', () => {
269-
withMockCodeEditor([
269+
withTestCodeEditor([
270270
'var x = (3 * 5)',
271271
'var y = (3 * 5)',
272272
'var z = (3 * 5)',
@@ -283,7 +283,7 @@ suite('FindController', () => {
283283
});
284284

285285
test('show next find term', () => {
286-
withMockCodeEditor([
286+
withTestCodeEditor([
287287
'var x = (3 * 5)',
288288
'var y = (3 * 5)',
289289
'var z = (3 * 5)',
@@ -303,7 +303,7 @@ suite('FindController', () => {
303303
});
304304

305305
test('show next find term do not update history', () => {
306-
withMockCodeEditor([
306+
withTestCodeEditor([
307307
'var x = (3 * 5)',
308308
'var y = (3 * 5)',
309309
'var z = (3 * 5)',
@@ -323,7 +323,7 @@ suite('FindController', () => {
323323
});
324324

325325
test('issue #18111: Regex replace with single space replaces with no space', () => {
326-
withMockCodeEditor([
326+
withTestCodeEditor([
327327
'HRESULT OnAmbientPropertyChange(DISPID dispid);'
328328
], { serviceCollection: serviceCollection }, (editor, cursor) => {
329329

@@ -348,7 +348,7 @@ suite('FindController', () => {
348348
});
349349

350350
test('issue #24714: Regular expression with ^ in search & replace', () => {
351-
withMockCodeEditor([
351+
withTestCodeEditor([
352352
'',
353353
'line2',
354354
'line3'
@@ -399,7 +399,7 @@ suite('FindController query options persistence', () => {
399399
} as IStorageService);
400400

401401
test('matchCase', () => {
402-
withMockCodeEditor([
402+
withTestCodeEditor([
403403
'abc',
404404
'ABC',
405405
'XYZ',
@@ -426,7 +426,7 @@ suite('FindController query options persistence', () => {
426426
queryState = { 'editor.isRegex': false, 'editor.matchCase': false, 'editor.wholeWord': true };
427427

428428
test('wholeWord', () => {
429-
withMockCodeEditor([
429+
withTestCodeEditor([
430430
'ABC',
431431
'AB',
432432
'XYZ',
@@ -451,7 +451,7 @@ suite('FindController query options persistence', () => {
451451
});
452452

453453
test('toggling options is saved', () => {
454-
withMockCodeEditor([
454+
withTestCodeEditor([
455455
'ABC',
456456
'AB',
457457
'XYZ',

‎src/vs/editor/contrib/find/test/findModel.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import { Range } from 'vs/editor/common/core/range';
1212
import { ICommonCodeEditor } from 'vs/editor/common/editorCommon';
1313
import { FindModelBoundToEditorModel } from 'vs/editor/contrib/find/common/findModel';
1414
import { FindReplaceState } from 'vs/editor/contrib/find/common/findState';
15-
import { withMockCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
15+
import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
1616
import { CoreNavigationCommands } from 'vs/editor/common/controller/coreCommands';
1717

1818
suite('FindModel', () => {
1919

2020
function findTest(testName: string, callback: (editor: ICommonCodeEditor, cursor: Cursor) => void): void {
2121
test(testName, () => {
22-
withMockCodeEditor([
22+
withTestCodeEditor([
2323
'// my cool header',
2424
'#include "cool.h"',
2525
'#include <iostream>',

0 commit comments

Comments
 (0)