Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 12:04:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

adopt ITextEditorOptions

Browse Source
This commit is contained in:
Benjamin Pasero
2016-07-08 07:48:05 +02:00
parent 273159c1d0
commit 9b18dc5035
3 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/vs/workbench/services/history/browser/history.ts
View File

@@ -10,12 +10,12 @@ import platform = require('vs/base/common/platform');
import nls = require('vs/nls');
import {EventType} from 'vs/base/common/events';
import {IEditor as IBaseEditor} from 'vs/platform/editor/common/editor';
import {TextEditorOptions, EditorInput, IGroupEvent, IEditorRegistry, Extensions} from 'vs/workbench/common/editor';
import {EditorInput, IGroupEvent, IEditorRegistry, Extensions} from 'vs/workbench/common/editor';
import {BaseTextEditor} from 'vs/workbench/browser/parts/editor/textEditor';
import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
import {IHistoryService} from 'vs/workbench/services/history/common/history';
import {Selection} from 'vs/editor/common/core/selection';
import {Position, IEditorInput} from 'vs/platform/editor/common/editor';
import {Position, IEditorInput, ITextEditorOptions} from 'vs/platform/editor/common/editor';
import {IEventService} from 'vs/platform/event/common/event';
import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace';
import {IDisposable, dispose} from 'vs/base/common/lifecycle';
@@ -207,7 +207,7 @@ export abstract class BaseHistoryService {
interface IStackEntry {
input: IEditorInput;
options?: TextEditorOptions;
options?: ITextEditorOptions;
}
export class HistoryService extends BaseHistoryService implements IHistoryService {
@@ -441,10 +441,12 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic
if (!this.currentFileEditorState || this.currentFileEditorState.justifiesNewPushState(stateCandidate)) {
this.currentFileEditorState = stateCandidate;
let options: TextEditorOptions;
let options: ITextEditorOptions;
if (storeSelection) {
options = new TextEditorOptions();
options.selection(editor.getSelection().startLineNumber, editor.getSelection().startColumn);
const selection = editor.getSelection();
options = {
selection: { startLineNumber: selection.startLineNumber, startColumn: selection.startColumn }
};
}
this.addToStack(editor.input, options);
@@ -460,7 +462,7 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic
this.addToStack(editor.input);
}
private addToStack(input: IEditorInput, options?: TextEditorOptions): void {
private addToStack(input: IEditorInput, options?: ITextEditorOptions): void {
// Overwrite an entry in the stack if we have a matching input that comes
// with editor options to indicate that this entry is more specific.