Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

implement tracksEditorViewState and computeEditorViewState #153315

Merged
merged 1 commit into from Jun 27, 2022
Merged

implement tracksEditorViewState and computeEditorViewState #153315

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 42 additions & 6 deletions src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@ import 'vs/css!./media/mergeEditor';
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
import { IEditorOptions as ICodeEditorOptions } from 'vs/editor/common/config/editorOptions';
import { ScrollType } from 'vs/editor/common/editorCommon';
import { ICodeEditorViewState, ScrollType } from 'vs/editor/common/editorCommon';
import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
import { localize } from 'vs/nls';
import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
Expand Down Expand Up @@ -83,7 +83,7 @@ class MergeEditorLayout {
}
}

export class MergeEditor extends AbstractTextEditor<any> {
export class MergeEditor extends AbstractTextEditor<IMergeEditorViewState> {

static readonly ID = 'mergeEditor';

Expand Down Expand Up @@ -282,6 +282,9 @@ export class MergeEditor extends AbstractTextEditor<any> {
this.inputResultView.setModel(viewModel, model.result, localize('result', 'Result',), this._labelService.getUriLabel(model.result.uri, { relative: true }), undefined);
this._ctxBaseResourceScheme.set(model.base.uri.scheme);

const viewState = this.loadEditorViewState(input, context);
this._applyViewState(viewState);

this._sessionDisposables.add(thenIfNotDisposed(model.onInitialized, () => {
const firstConflict = model.modifiedBaseRanges.get().find(r => r.isConflicting);
if (!firstConflict) {
Expand Down Expand Up @@ -439,17 +442,50 @@ export class MergeEditor extends AbstractTextEditor<any> {
this._ctxUsesColumnLayout.set(newValue);
}

// --- view state (TODO@bpasero revisit with https://github.com/microsoft/vscode/issues/150804)
private _applyViewState(state: IMergeEditorViewState | undefined) {
if (!state) {
return;
}
this.inputResultView.editor.restoreViewState(state);
if (state.input1State) {
this.input1View.editor.restoreViewState(state.input1State);
}
if (state.input2State) {
this.input2View.editor.restoreViewState(state.input2State);
}
if (state.focusIndex >= 0) {
[this.input1View.editor, this.input2View.editor, this.inputResultView.editor][state.focusIndex].focus();
}
}

protected computeEditorViewState(resource: URI): undefined {
return undefined;
protected computeEditorViewState(resource: URI): IMergeEditorViewState | undefined {
if (isEqual(this.model?.result.uri, resource)) {
// TODO@bpasero Why not check `input#resource` and don't ask me for "forgein" resources?
return undefined;
}
const result = this.inputResultView.editor.saveViewState();
if (!result) {
return undefined;
}
const input1State = this.input1View.editor.saveViewState() ?? undefined;
const input2State = this.input2View.editor.saveViewState() ?? undefined;
const focusIndex = [this.input1View.editor, this.input2View.editor, this.inputResultView.editor].findIndex(editor => editor.hasWidgetFocus());
return { ...result, input1State, input2State, focusIndex };
}


protected tracksEditorViewState(input: EditorInput): boolean {
return false;
return input instanceof MergeEditorInput;
}
}

type IMergeEditorViewState = ICodeEditorViewState & {
readonly input1State?: ICodeEditorViewState;
readonly input2State?: ICodeEditorViewState;
readonly focusIndex: number;
};


function synchronizeScrolling(scrollingEditor: CodeEditorWidget, targetEditor: CodeEditorWidget, mapping: DocumentMapping | undefined, source: MappingDirection) {
if (!mapping) {
return;
Expand Down