Skip to content

Commit 58aa111

Browse files
alexdimaalexdima
committed
Remove TextModel.createFromString
1 parent 147f417 commit 58aa111

4 files changed

Lines changed: 17 additions & 29 deletions

File tree

‎src/vs/editor/common/model/textModel.ts‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ import { Color } from 'vs/base/common/color';
3737
import { Constants } from 'vs/base/common/uint';
3838
import { EditorTheme } from 'vs/editor/common/view/viewContext';
3939
import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
40-
import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService';
41-
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
42-
import { NoOpNotification, INotificationService } from 'vs/platform/notification/common/notification';
4340

4441
function createTextBufferBuilder() {
4542
return new PieceTreeTextBufferBuilder();
@@ -191,27 +188,6 @@ export class TextModel extends Disposable implements model.ITextModel {
191188
largeFileOptimizations: EDITOR_MODEL_DEFAULTS.largeFileOptimizations,
192189
};
193190

194-
public static createFromString(text: string, options: model.ITextModelCreationOptions = TextModel.DEFAULT_CREATION_OPTIONS, languageIdentifier: LanguageIdentifier | null = null, uri: URI | null = null): TextModel {
195-
const dialogService = new class implements IDialogService {
196-
_serviceBrand: undefined;
197-
confirm() { return Promise.resolve({ confirmed: false }); }
198-
show() { return Promise.resolve({ choice: 0 }); }
199-
about() { return Promise.resolve(); }
200-
};
201-
const noop = new NoOpNotification();
202-
const notificationService = new class implements INotificationService {
203-
_serviceBrand: undefined;
204-
info() { return noop; }
205-
warn() { return noop; }
206-
error() { return noop; }
207-
notify() { return noop; }
208-
prompt() { return noop; }
209-
status() { return Disposable.None; }
210-
setFilter() { }
211-
};
212-
return new TextModel(text, options, languageIdentifier, uri, new UndoRedoService(dialogService, notificationService));
213-
}
214-
215191
public static resolveOptions(textBuffer: model.ITextBuffer, options: model.ITextModelCreationOptions): model.TextModelResolvedOptions {
216192
if (options.detectIndentation) {
217193
const guessedIndentation = guessIndentation(textBuffer, options.tabSize, options.insertSpaces);

‎src/vs/editor/contrib/gotoSymbol/peek/referencesWidget.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import * as peekView from 'vs/editor/contrib/peekView/peekView';
3333
import { FileReferences, OneReference, ReferencesModel } from '../referencesModel';
3434
import { FuzzyScore } from 'vs/base/common/filters';
3535
import { SplitView, Sizing } from 'vs/base/browser/ui/splitview/splitview';
36+
import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
3637

3738

3839
class DecorationsManager implements IDisposable {
@@ -215,7 +216,8 @@ export class ReferenceWidget extends peekView.PeekViewWidget {
215216
@ITextModelService private readonly _textModelResolverService: ITextModelService,
216217
@IInstantiationService private readonly _instantiationService: IInstantiationService,
217218
@peekView.IPeekViewService private readonly _peekViewService: peekView.IPeekViewService,
218-
@ILabelService private readonly _uriLabel: ILabelService
219+
@ILabelService private readonly _uriLabel: ILabelService,
220+
@IUndoRedoService private readonly _undoRedoService: IUndoRedoService,
219221
) {
220222
super(editor, { showFrame: false, showArrow: true, isResizeable: true, isAccessible: true });
221223

@@ -304,7 +306,7 @@ export class ReferenceWidget extends peekView.PeekViewWidget {
304306
};
305307
this._preview = this._instantiationService.createInstance(EmbeddedCodeEditorWidget, this._previewContainer, options, this.editor);
306308
dom.hide(this._previewContainer);
307-
this._previewNotAvailableMessage = TextModel.createFromString(nls.localize('missingPreviewMessage', "no preview available"));
309+
this._previewNotAvailableMessage = new TextModel(nls.localize('missingPreviewMessage', "no preview available"), TextModel.DEFAULT_CREATION_OPTIONS, null, null, this._undoRedoService);
308310

309311
// tree
310312
this._treeContainer = dom.append(containerElement, dom.$('div.ref-tree.inline'));

‎src/vs/editor/test/common/editorTestUtils.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ import { URI } from 'vs/base/common/uri';
77
import { DefaultEndOfLine, ITextModelCreationOptions } from 'vs/editor/common/model';
88
import { TextModel } from 'vs/editor/common/model/textModel';
99
import { LanguageIdentifier } from 'vs/editor/common/modes';
10+
import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogService';
11+
import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
12+
import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService';
1013

1114
export function withEditorModel(text: string[], callback: (model: TextModel) => void): void {
1215
let model = createTextModel(text.join('\n'));
@@ -36,5 +39,8 @@ export function createTextModel(text: string, _options: IRelaxedTextModelCreatio
3639
isForSimpleWidget: (typeof _options.isForSimpleWidget === 'undefined' ? TextModel.DEFAULT_CREATION_OPTIONS.isForSimpleWidget : _options.isForSimpleWidget),
3740
largeFileOptimizations: (typeof _options.largeFileOptimizations === 'undefined' ? TextModel.DEFAULT_CREATION_OPTIONS.largeFileOptimizations : _options.largeFileOptimizations),
3841
};
39-
return TextModel.createFromString(text, options, languageIdentifier, uri);
42+
const dialogService = new TestDialogService();
43+
const notificationService = new TestNotificationService();
44+
const undoRedoService = new UndoRedoService(dialogService, notificationService);
45+
return new TextModel(text, options, languageIdentifier, uri, undoRedoService);
4046
}

‎src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import { ThemeIcon } from 'vs/platform/theme/common/themeService';
2626
import { WorkspaceFileEdit } from 'vs/editor/common/modes';
2727
import { compare } from 'vs/base/common/strings';
2828
import { URI } from 'vs/base/common/uri';
29+
import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
2930

3031
// --- VIEW MODEL
3132

@@ -174,7 +175,10 @@ export class BulkEditDataSource implements IAsyncDataSource<BulkFileOperations,
174175

175176
public groupByFile: boolean = true;
176177

177-
constructor(@ITextModelService private readonly _textModelService: ITextModelService) { }
178+
constructor(
179+
@ITextModelService private readonly _textModelService: ITextModelService,
180+
@IUndoRedoService private readonly _undoRedoService: IUndoRedoService,
181+
) { }
178182

179183
hasChildren(element: BulkFileOperations | BulkEditElement): boolean {
180184
if (element instanceof FileElement) {
@@ -210,7 +214,7 @@ export class BulkEditDataSource implements IAsyncDataSource<BulkFileOperations,
210214
textModel = ref.object.textEditorModel;
211215
textModelDisposable = ref;
212216
} catch {
213-
textModel = TextModel.createFromString('');
217+
textModel = new TextModel('', TextModel.DEFAULT_CREATION_OPTIONS, null, null, this._undoRedoService);
214218
textModelDisposable = textModel;
215219
}
216220

0 commit comments

Comments
 (0)