Skip to content

Commit 147f417

Browse files
alexdimaalexdima
committed
Avoid using TextModel.createFromString
1 parent 691c4b1 commit 147f417

50 files changed

Lines changed: 236 additions & 210 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import * as assert from 'assert';
66
import { Position } from 'vs/editor/common/core/position';
77
import { Selection } from 'vs/editor/common/core/selection';
8-
import { TextModel } from 'vs/editor/common/model/textModel';
8+
import { createTextModel } from 'vs/editor/test/common/editorTestUtils';
99
import { LanguageIdentifier } from 'vs/editor/common/modes';
1010
import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
1111
import { BracketMatchingController } from 'vs/editor/contrib/bracketMatching/bracketMatching';
@@ -31,7 +31,7 @@ suite('bracket matching', () => {
3131

3232
test('issue #183: jump to matching bracket position', () => {
3333
let mode = new BracketMode();
34-
let model = TextModel.createFromString('var x = (3 + (5-7)) + ((5+3)+5);', undefined, mode.getLanguageIdentifier());
34+
let model = createTextModel('var x = (3 + (5-7)) + ((5+3)+5);', undefined, mode.getLanguageIdentifier());
3535

3636
withTestCodeEditor(null, { model: model }, (editor, cursor) => {
3737
let bracketMatchingController = editor.registerAndInstantiateContribution<BracketMatchingController>(BracketMatchingController.ID, BracketMatchingController);
@@ -63,7 +63,7 @@ suite('bracket matching', () => {
6363

6464
test('Jump to next bracket', () => {
6565
let mode = new BracketMode();
66-
let model = TextModel.createFromString('var x = (3 + (5-7)); y();', undefined, mode.getLanguageIdentifier());
66+
let model = createTextModel('var x = (3 + (5-7)); y();', undefined, mode.getLanguageIdentifier());
6767

6868
withTestCodeEditor(null, { model: model }, (editor, cursor) => {
6969
let bracketMatchingController = editor.registerAndInstantiateContribution<BracketMatchingController>(BracketMatchingController.ID, BracketMatchingController);
@@ -100,7 +100,7 @@ suite('bracket matching', () => {
100100

101101
test('Select to next bracket', () => {
102102
let mode = new BracketMode();
103-
let model = TextModel.createFromString('var x = (3 + (5-7)); y();', undefined, mode.getLanguageIdentifier());
103+
let model = createTextModel('var x = (3 + (5-7)); y();', undefined, mode.getLanguageIdentifier());
104104

105105
withTestCodeEditor(null, { model: model }, (editor, cursor) => {
106106
let bracketMatchingController = editor.registerAndInstantiateContribution<BracketMatchingController>(BracketMatchingController.ID, BracketMatchingController);
@@ -152,7 +152,7 @@ suite('bracket matching', () => {
152152
'};',
153153
].join('\n');
154154
const mode = new BracketMode();
155-
const model = TextModel.createFromString(text, undefined, mode.getLanguageIdentifier());
155+
const model = createTextModel(text, undefined, mode.getLanguageIdentifier());
156156

157157
withTestCodeEditor(null, { model: model }, (editor, cursor) => {
158158
const bracketMatchingController = editor.registerAndInstantiateContribution<BracketMatchingController>(BracketMatchingController.ID, BracketMatchingController);
@@ -177,7 +177,7 @@ suite('bracket matching', () => {
177177
'};',
178178
].join('\n');
179179
const mode = new BracketMode();
180-
const model = TextModel.createFromString(text, undefined, mode.getLanguageIdentifier());
180+
const model = createTextModel(text, undefined, mode.getLanguageIdentifier());
181181

182182
withTestCodeEditor(null, { model: model }, (editor, cursor) => {
183183
const bracketMatchingController = editor.registerAndInstantiateContribution<BracketMatchingController>(BracketMatchingController.ID, BracketMatchingController);
@@ -195,7 +195,7 @@ suite('bracket matching', () => {
195195

196196
test('issue #45369: Select to Bracket with multicursor', () => {
197197
let mode = new BracketMode();
198-
let model = TextModel.createFromString('{ } { } { }', undefined, mode.getLanguageIdentifier());
198+
let model = createTextModel('{ } { } { }', undefined, mode.getLanguageIdentifier());
199199

200200
withTestCodeEditor(null, { model: model }, (editor, cursor) => {
201201
let bracketMatchingController = editor.registerAndInstantiateContribution<BracketMatchingController>(BracketMatchingController.ID, BracketMatchingController);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { CodeActionKind } from 'vs/editor/contrib/codeAction/types';
1313
import { IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
1414
import { CancellationToken } from 'vs/base/common/cancellation';
1515
import { Progress } from 'vs/platform/progress/common/progress';
16+
import { createTextModel } from 'vs/editor/test/common/editorTestUtils';
1617

1718
function staticCodeActionProvider(...actions: modes.CodeAction[]): modes.CodeActionProvider {
1819
return new class implements modes.CodeActionProvider {
@@ -93,7 +94,7 @@ suite('CodeAction', () => {
9394

9495
setup(function () {
9596
disposables.clear();
96-
model = TextModel.createFromString('test1\ntest2\ntest3', undefined, langId, uri);
97+
model = createTextModel('test1\ntest2\ntest3', undefined, langId, uri);
9798
disposables.add(model);
9899
});
99100

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { CodeActionModel, CodeActionsState } from 'vs/editor/contrib/codeAction/
1515
import { createTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
1616
import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
1717
import { MarkerService } from 'vs/platform/markers/common/markerService';
18+
import { createTextModel } from 'vs/editor/test/common/editorTestUtils';
1819

1920
const testProvider = {
2021
provideCodeActions(): modes.CodeActionList {
@@ -38,7 +39,7 @@ suite('CodeActionModel', () => {
3839
setup(() => {
3940
disposables.clear();
4041
markerService = new MarkerService();
41-
model = TextModel.createFromString('foobar foo bar\nfarboo far boo', undefined, languageIdentifier, uri);
42+
model = createTextModel('foobar foo bar\nfarboo far boo', undefined, languageIdentifier, uri);
4243
editor = createTestCodeEditor({ model: model });
4344
editor.setPosition({ lineNumber: 1, column: 1 });
4445
});

‎src/vs/editor/contrib/documentSymbols/test/outlineModel.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import { OutlineElement, OutlineGroup, OutlineModel } from '../outlineModel';
88
import { SymbolKind, DocumentSymbol, DocumentSymbolProviderRegistry } from 'vs/editor/common/modes';
99
import { Range } from 'vs/editor/common/core/range';
1010
import { IMarker, MarkerSeverity } from 'vs/platform/markers/common/markers';
11-
import { TextModel } from 'vs/editor/common/model/textModel';
11+
import { createTextModel } from 'vs/editor/test/common/editorTestUtils';
1212
import { URI } from 'vs/base/common/uri';
1313
import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
1414

1515
suite('OutlineModel', function () {
1616

1717
test('OutlineModel#create, cached', async function () {
1818

19-
let model = TextModel.createFromString('foo', undefined, undefined, URI.file('/fome/path.foo'));
19+
let model = createTextModel('foo', undefined, undefined, URI.file('/fome/path.foo'));
2020
let count = 0;
2121
let reg = DocumentSymbolProviderRegistry.register({ pattern: '**/path.foo' }, {
2222
provideDocumentSymbols() {
@@ -42,7 +42,7 @@ suite('OutlineModel', function () {
4242

4343
test('OutlineModel#create, cached/cancel', async function () {
4444

45-
let model = TextModel.createFromString('foo', undefined, undefined, URI.file('/fome/path.foo'));
45+
let model = createTextModel('foo', undefined, undefined, URI.file('/fome/path.foo'));
4646
let isCancelled = false;
4747

4848
let reg = DocumentSymbolProviderRegistry.register({ pattern: '**/path.foo' }, {

‎src/vs/editor/contrib/folding/test/foldingModel.test.ts‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
*--------------------------------------------------------------------------------------------*/
55
import * as assert from 'assert';
66
import { FoldingModel, setCollapseStateAtLevel, setCollapseStateLevelsDown, setCollapseStateLevelsUp, setCollapseStateForMatchingLines, setCollapseStateUp } from 'vs/editor/contrib/folding/foldingModel';
7-
import { TextModel, ModelDecorationOptions } from 'vs/editor/common/model/textModel';
7+
import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
8+
import { createTextModel } from 'vs/editor/test/common/editorTestUtils';
89
import { computeRanges } from 'vs/editor/contrib/folding/indentRangeProvider';
910
import { TrackedRangeStickiness, IModelDeltaDecoration, ITextModel, IModelDecorationsChangeAccessor } from 'vs/editor/common/model';
1011
import { EditOperation } from 'vs/editor/common/core/editOperation';
@@ -92,7 +93,7 @@ suite('Folding Model', () => {
9293
/* 7*/ ' }',
9394
/* 8*/ '}'];
9495

95-
let textModel = TextModel.createFromString(lines.join('\n'));
96+
let textModel = createTextModel(lines.join('\n'));
9697
try {
9798
let foldingModel = new FoldingModel(textModel, new TestDecorationProvider(textModel));
9899

@@ -131,7 +132,7 @@ suite('Folding Model', () => {
131132
/* 7*/ ' }',
132133
/* 8*/ '}'];
133134

134-
let textModel = TextModel.createFromString(lines.join('\n'));
135+
let textModel = createTextModel(lines.join('\n'));
135136
try {
136137
let foldingModel = new FoldingModel(textModel, new TestDecorationProvider(textModel));
137138

@@ -177,7 +178,7 @@ suite('Folding Model', () => {
177178
/* 7*/ ' }',
178179
/* 8*/ '}'];
179180

180-
let textModel = TextModel.createFromString(lines.join('\n'));
181+
let textModel = createTextModel(lines.join('\n'));
181182
try {
182183
let foldingModel = new FoldingModel(textModel, new TestDecorationProvider(textModel));
183184

@@ -217,7 +218,7 @@ suite('Folding Model', () => {
217218
/* 12*/ ' }',
218219
/* 13*/ '}'];
219220

220-
let textModel = TextModel.createFromString(lines.join('\n'));
221+
let textModel = createTextModel(lines.join('\n'));
221222
try {
222223
let foldingModel = new FoldingModel(textModel, new TestDecorationProvider(textModel));
223224

@@ -254,7 +255,7 @@ suite('Folding Model', () => {
254255
/* 7*/ ' }',
255256
/* 8*/ '}'];
256257

257-
let textModel = TextModel.createFromString(lines.join('\n'));
258+
let textModel = createTextModel(lines.join('\n'));
258259
try {
259260
let foldingModel = new FoldingModel(textModel, new TestDecorationProvider(textModel));
260261

@@ -295,7 +296,7 @@ suite('Folding Model', () => {
295296
/* 11*/ ' }',
296297
/* 12*/ '}'];
297298

298-
let textModel = TextModel.createFromString(lines.join('\n'));
299+
let textModel = createTextModel(lines.join('\n'));
299300
try {
300301

301302
let foldingModel = new FoldingModel(textModel, new TestDecorationProvider(textModel));
@@ -346,7 +347,7 @@ suite('Folding Model', () => {
346347
/* 10*/ '//#endregion',
347348
/* 11*/ ''];
348349

349-
let textModel = TextModel.createFromString(lines.join('\n'));
350+
let textModel = createTextModel(lines.join('\n'));
350351
try {
351352
let foldingModel = new FoldingModel(textModel, new TestDecorationProvider(textModel));
352353

@@ -392,7 +393,7 @@ suite('Folding Model', () => {
392393
/* 12*/ ' }',
393394
/* 13*/ '}'];
394395

395-
let textModel = TextModel.createFromString(lines.join('\n'));
396+
let textModel = createTextModel(lines.join('\n'));
396397
try {
397398
let foldingModel = new FoldingModel(textModel, new TestDecorationProvider(textModel));
398399

@@ -448,7 +449,7 @@ suite('Folding Model', () => {
448449
/* 15*/ ' //#endregion',
449450
/* 16*/ '}'];
450451

451-
let textModel = TextModel.createFromString(lines.join('\n'));
452+
let textModel = createTextModel(lines.join('\n'));
452453
try {
453454
let foldingModel = new FoldingModel(textModel, new TestDecorationProvider(textModel));
454455

@@ -504,7 +505,7 @@ suite('Folding Model', () => {
504505
/* 12*/ ' }',
505506
/* 13*/ '}'];
506507

507-
let textModel = TextModel.createFromString(lines.join('\n'));
508+
let textModel = createTextModel(lines.join('\n'));
508509
try {
509510
let foldingModel = new FoldingModel(textModel, new TestDecorationProvider(textModel));
510511

@@ -556,7 +557,7 @@ suite('Folding Model', () => {
556557
/* 12*/ ' }',
557558
/* 13*/ '}'];
558559

559-
let textModel = TextModel.createFromString(lines.join('\n'));
560+
let textModel = createTextModel(lines.join('\n'));
560561
try {
561562
let foldingModel = new FoldingModel(textModel, new TestDecorationProvider(textModel));
562563

@@ -603,7 +604,7 @@ suite('Folding Model', () => {
603604
/* 12*/ ' }',
604605
/* 13*/ '}'];
605606

606-
let textModel = TextModel.createFromString(lines.join('\n'));
607+
let textModel = createTextModel(lines.join('\n'));
607608
try {
608609
let foldingModel = new FoldingModel(textModel, new TestDecorationProvider(textModel));
609610

@@ -648,7 +649,7 @@ suite('Folding Model', () => {
648649
/* 12*/ ' }',
649650
/* 13*/ '}'];
650651

651-
let textModel = TextModel.createFromString(lines.join('\n'));
652+
let textModel = createTextModel(lines.join('\n'));
652653
try {
653654
let foldingModel = new FoldingModel(textModel, new TestDecorationProvider(textModel));
654655

‎src/vs/editor/contrib/folding/test/foldingRanges.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import * as assert from 'assert';
7-
import { TextModel } from 'vs/editor/common/model/textModel';
7+
import { createTextModel } from 'vs/editor/test/common/editorTestUtils';
88
import { computeRanges } from 'vs/editor/contrib/folding/indentRangeProvider';
99
import { FoldingMarkers } from 'vs/editor/common/modes/languageConfiguration';
1010
import { MAX_FOLDING_REGIONS } from 'vs/editor/contrib/folding/foldingRanges';
@@ -26,7 +26,7 @@ suite('FoldingRanges', () => {
2626
for (let i = 0; i < nRegions; i++) {
2727
lines.push('#endregion');
2828
}
29-
let model = TextModel.createFromString(lines.join('\n'));
29+
let model = createTextModel(lines.join('\n'));
3030
let actual = computeRanges(model, false, markers, MAX_FOLDING_REGIONS);
3131
assert.equal(actual.length, nRegions, 'len');
3232
for (let i = 0; i < nRegions; i++) {
@@ -53,7 +53,7 @@ suite('FoldingRanges', () => {
5353
/* 12*/ ' }',
5454
/* 13*/ '}'];
5555

56-
let textModel = TextModel.createFromString(lines.join('\n'));
56+
let textModel = createTextModel(lines.join('\n'));
5757
try {
5858
let actual = computeRanges(textModel, false, markers);
5959
// let r0 = r(1, 2);
@@ -91,7 +91,7 @@ suite('FoldingRanges', () => {
9191
for (let i = 0; i < nRegions; i++) {
9292
lines.push('#endregion');
9393
}
94-
let model = TextModel.createFromString(lines.join('\n'));
94+
let model = createTextModel(lines.join('\n'));
9595
let actual = computeRanges(model, false, markers, MAX_FOLDING_REGIONS);
9696
assert.equal(actual.length, nRegions, 'len');
9797
for (let i = 0; i < nRegions; i++) {

‎src/vs/editor/contrib/folding/test/hiddenRangeModel.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55
import * as assert from 'assert';
66
import { FoldingModel } from 'vs/editor/contrib/folding/foldingModel';
7-
import { TextModel } from 'vs/editor/common/model/textModel';
7+
import { createTextModel } from 'vs/editor/test/common/editorTestUtils';
88
import { computeRanges } from 'vs/editor/contrib/folding/indentRangeProvider';
99
import { TestDecorationProvider } from './foldingModel.test';
1010
import { HiddenRangeModel } from 'vs/editor/contrib/folding/hiddenRangeModel';
@@ -38,7 +38,7 @@ suite('Hidden Range Model', () => {
3838
/* 9*/ ' }',
3939
/* 10*/ '}'];
4040

41-
let textModel = TextModel.createFromString(lines.join('\n'));
41+
let textModel = createTextModel(lines.join('\n'));
4242
let foldingModel = new FoldingModel(textModel, new TestDecorationProvider(textModel));
4343
let hiddenRangeModel = new HiddenRangeModel(foldingModel);
4444

‎src/vs/editor/contrib/folding/test/indentFold.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55
import * as assert from 'assert';
66
import { computeRanges } from 'vs/editor/contrib/folding/indentRangeProvider';
7-
import { TextModel } from 'vs/editor/common/model/textModel';
7+
import { createTextModel } from 'vs/editor/test/common/editorTestUtils';
88

99
interface IndentRange {
1010
start: number;
@@ -47,7 +47,7 @@ suite('Indentation Folding', () => {
4747
let r8 = r(13, 14);//4
4848
let r9 = r(15, 16);//0
4949

50-
let model = TextModel.createFromString(lines.join('\n'));
50+
let model = createTextModel(lines.join('\n'));
5151

5252
function assertLimit(maxEntries: number, expectedRanges: IndentRange[], message: string) {
5353
let indentRanges = computeRanges(model, true, undefined, maxEntries);

‎src/vs/editor/contrib/folding/test/indentRangeProvider.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import * as assert from 'assert';
7-
import { TextModel } from 'vs/editor/common/model/textModel';
7+
import { createTextModel } from 'vs/editor/test/common/editorTestUtils';
88
import { computeRanges } from 'vs/editor/contrib/folding/indentRangeProvider';
99
import { FoldingMarkers } from 'vs/editor/common/modes/languageConfiguration';
1010

@@ -15,7 +15,7 @@ interface ExpectedIndentRange {
1515
}
1616

1717
function assertRanges(lines: string[], expected: ExpectedIndentRange[], offside: boolean, markers?: FoldingMarkers): void {
18-
let model = TextModel.createFromString(lines.join('\n'));
18+
let model = createTextModel(lines.join('\n'));
1919
let actual = computeRanges(model, offside, markers);
2020

2121
let actualRanges: ExpectedIndentRange[] = [];

‎src/vs/editor/contrib/folding/test/syntaxFold.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55
import * as assert from 'assert';
6-
import { TextModel } from 'vs/editor/common/model/textModel';
6+
import { createTextModel } from 'vs/editor/test/common/editorTestUtils';
77
import { SyntaxRangeProvider } from 'vs/editor/contrib/folding/syntaxRangeProvider';
88
import { FoldingRangeProvider, FoldingRange, FoldingContext, ProviderResult } from 'vs/editor/common/modes';
99
import { ITextModel } from 'vs/editor/common/model';
@@ -69,7 +69,7 @@ suite('Syntax folding', () => {
6969
let r8 = r(14, 15); //6
7070
let r9 = r(22, 23); //0
7171

72-
let model = TextModel.createFromString(lines.join('\n'));
72+
let model = createTextModel(lines.join('\n'));
7373
let ranges = [r1, r2, r3, r4, r5, r6, r7, r8, r9];
7474
let providers = [new TestFoldingRangeProvider(model, ranges)];
7575

0 commit comments

Comments
 (0)