Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-02 06:21:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Extract model types out of editorCommon.ts

Browse Source
This commit is contained in:
Alex Dima
2018-01-04 16:27:08 +02:00
parent 85c2a6e57e
commit 0721df783d
186 changed files with 1815 additions and 1730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/vs/workbench/api/electron-browser/mainThreadEditor.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import EditorCommon = require('vs/editor/common/editorCommon');
import * as editorCommon from 'vs/editor/common/editorCommon';
import Event, { Emitter } from 'vs/base/common/event';
import { IEditor } from 'vs/platform/editor/common/editor';
import { IModelService } from 'vs/editor/common/services/modelService';
@@ -17,6 +17,7 @@ import { TextEditorCursorStyle, cursorStyleToString, RenderLineNumbersType } fro
import { ICursorSelectionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
import { IResolvedTextEditorConfiguration, ISelectionChangeEvent, ITextEditorConfigurationUpdate, TextEditorRevealType, IApplyEditsOptions, IUndoStopOptions } from 'vs/workbench/api/node/extHost.protocol';
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
import { IModel, ISingleEditOperation, EndOfLineSequence, IIdentifiedSingleEditOperation, ITextModelUpdateOptions } from 'vs/editor/common/model/model';
function configurationsEqual(a: IResolvedTextEditorConfiguration, b: IResolvedTextEditorConfiguration) {
if (a && !b || !a && b) {
@@ -43,7 +44,7 @@ export interface IFocusTracker {
export class MainThreadTextEditor {
private _id: string;
private _model: EditorCommon.IModel;
private _model: IModel;
private _modelService: IModelService;
private _modelListeners: IDisposable[];
private _codeEditor: ICodeEditor;
@@ -58,7 +59,7 @@ export class MainThreadTextEditor {
constructor(
id: string,
model: EditorCommon.IModel,
model: IModel,
codeEditor: ICodeEditor,
focusTracker: IFocusTracker,
modelService: IModelService
@@ -94,7 +95,7 @@ export class MainThreadTextEditor {
return this._id;
}
public getModel(): EditorCommon.IModel {
public getModel(): IModel {
return this._model;
}
@@ -196,7 +197,7 @@ export class MainThreadTextEditor {
return;
}
let newOpts: EditorCommon.ITextModelUpdateOptions = {};
let newOpts: ITextModelUpdateOptions = {};
if (typeof newConfiguration.insertSpaces !== 'undefined') {
newOpts.insertSpaces = newConfiguration.insertSpaces;
}
@@ -238,7 +239,7 @@ export class MainThreadTextEditor {
}
}
public setDecorations(key: string, ranges: EditorCommon.IDecorationOptions[]): void {
public setDecorations(key: string, ranges: editorCommon.IDecorationOptions[]): void {
if (!this._codeEditor) {
return;
}
@@ -262,16 +263,16 @@ export class MainThreadTextEditor {
}
switch (revealType) {
case TextEditorRevealType.Default:
this._codeEditor.revealRange(range, EditorCommon.ScrollType.Smooth);
this._codeEditor.revealRange(range, editorCommon.ScrollType.Smooth);
break;
case TextEditorRevealType.InCenter:
this._codeEditor.revealRangeInCenter(range, EditorCommon.ScrollType.Smooth);
this._codeEditor.revealRangeInCenter(range, editorCommon.ScrollType.Smooth);
break;
case TextEditorRevealType.InCenterIfOutsideViewport:
this._codeEditor.revealRangeInCenterIfOutsideViewport(range, EditorCommon.ScrollType.Smooth);
this._codeEditor.revealRangeInCenterIfOutsideViewport(range, editorCommon.ScrollType.Smooth);
break;
case TextEditorRevealType.AtTop:
this._codeEditor.revealRangeAtTop(range, EditorCommon.ScrollType.Smooth);
this._codeEditor.revealRangeAtTop(range, editorCommon.ScrollType.Smooth);
break;
default:
console.warn(`Unknown revealType: ${revealType}`);
@@ -279,7 +280,7 @@ export class MainThreadTextEditor {
}
}
private _readConfiguration(model: EditorCommon.IModel, codeEditor: ICodeEditor): IResolvedTextEditorConfiguration {
private _readConfiguration(model: IModel, codeEditor: ICodeEditor): IResolvedTextEditorConfiguration {
if (model.isDisposed()) {
// shutdown time
return this._configuration;
@@ -334,7 +335,7 @@ export class MainThreadTextEditor {
return editor.getControl() === this._codeEditor;
}
public applyEdits(versionIdCheck: number, edits: EditorCommon.ISingleEditOperation[], opts: IApplyEditsOptions): boolean {
public applyEdits(versionIdCheck: number, edits: ISingleEditOperation[], opts: IApplyEditsOptions): boolean {
if (this._model.getVersionId() !== versionIdCheck) {
// throw new Error('Model has changed in the meantime!');
// model changed in the meantime
@@ -347,12 +348,12 @@ export class MainThreadTextEditor {
}
if (opts.setEndOfLine === EndOfLine.CRLF) {
this._model.setEOL(EditorCommon.EndOfLineSequence.CRLF);
this._model.setEOL(EndOfLineSequence.CRLF);
} else if (opts.setEndOfLine === EndOfLine.LF) {
this._model.setEOL(EditorCommon.EndOfLineSequence.LF);
this._model.setEOL(EndOfLineSequence.LF);
}
let transformedEdits = edits.map((edit): EditorCommon.IIdentifiedSingleEditOperation => {
let transformedEdits = edits.map((edit): IIdentifiedSingleEditOperation => {
return {
identifier: null,
range: Range.lift(edit.range),