Class MergeEditor

Hierarchy

BaseWidget
- MergeEditor

Implements

StatefulWidget
SaveableSource
Navigatable
TrackableWidgetProvider

Index

Constructors

Properties

basePane currentMergeRangeObservable currentPaneObservable horizontalSplitPanel labelProvider layoutInitialized layoutModeObservable model resultPane scrollSync selectionInBaseObservable settings side1Pane side2Pane verticalSplitPanel viewZoneComputer visibilityObservable

Accessors

baseUri currentMergeRange currentPane isShowingBase isShowingBaseAtTop isShown layoutKind layoutMode panes resultUri saveable selectionInBase shouldAlignBase shouldAlignResult side1Title side1Uri side2Title side2Uri

Constructors

constructor

new MergeEditor(options?): MergeEditor
Parameters
- Optional options: IOptions
Returns MergeEditor
Inherited from BaseWidget.constructor
- Defined in packages/core/lib/browser/widgets/widget.d.ts:59

Properties

`Readonly` basePane

basePane: MergeEditorBasePane

`Protected` `Readonly` currentMergeRangeObservable

currentMergeRangeObservable: Observable<undefined | MergeRange, unknown> = ...

`Protected` `Readonly` currentPaneObservable

currentPaneObservable: Settable<undefined | MergeEditorPane, void> = ...

`Protected` horizontalSplitPanel

horizontalSplitPanel: SplitPanel

`Protected` `Readonly` labelProvider

labelProvider: LabelProvider

`Protected` layoutInitialized

layoutInitialized: boolean = false

`Protected` `Readonly` layoutModeObservable

layoutModeObservable: Settable<MergeEditorLayoutMode, void> = ...

`Readonly` model

model: MergeEditorModel

`Readonly` resultPane

resultPane: MergeEditorResultPane

`Protected` scrollSync

scrollSync: MergeEditorScrollSync

`Protected` `Readonly` selectionInBaseObservable

selectionInBaseObservable: Observable<undefined | Range[], unknown> = ...

`Protected` `Readonly` settings

settings: MergeEditorSettings

`Readonly` side1Pane

side1Pane: MergeEditorSide1Pane

`Readonly` side2Pane

side2Pane: MergeEditorSide2Pane

`Protected` verticalSplitPanel

verticalSplitPanel: SplitPanel

`Protected` `Readonly` viewZoneComputer

viewZoneComputer: MergeEditorViewZoneComputer

`Protected` `Readonly` visibilityObservable

visibilityObservable: Settable<boolean, void> = ...

Accessors

baseUri

get baseUri(): URI
Returns URI
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:355

currentMergeRange

get currentMergeRange(): undefined | MergeRange
Returns undefined | MergeRange
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:325

currentPane

get currentPane(): undefined | MergeEditorPane
Returns undefined | MergeEditorPane
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:307

isShowingBase

get isShowingBase(): boolean
Returns boolean
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:482

isShowingBaseAtTop

get isShowingBaseAtTop(): boolean
Returns boolean
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:486

isShown

get isShown(): boolean
Returns boolean
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:303

layoutKind

get layoutKind(): MergeEditorLayoutKind
Returns MergeEditorLayoutKind
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:471
set layoutKind(kind): void
Parameters
- kind: MergeEditorLayoutKind
Returns void
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:475

layoutMode

get layoutMode(): MergeEditorLayoutMode
Returns MergeEditorLayoutMode
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:463
set layoutMode(value): void
Parameters
- value: MergeEditorLayoutMode
Returns void
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:467

panes

get panes(): MergeEditorPane[]
Returns MergeEditorPane[]
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:351

resultUri

get resultUri(): URI
Returns URI
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:375

saveable

get saveable(): Saveable
Returns Saveable
Implementation of SaveableSource.saveable
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:416

selectionInBase

get selectionInBase(): undefined | Range[]
Returns undefined | Range[]
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:347

shouldAlignBase

get shouldAlignBase(): boolean
Returns boolean
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:523

shouldAlignResult

get shouldAlignResult(): boolean
Returns boolean
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:519

side1Title

get side1Title(): string
Returns string
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:363

side1Uri

get side1Uri(): URI
Returns URI
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:359

side2Title

get side2Title(): string
Returns string
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:371

side2Uri

get side2Uri(): URI
Returns URI
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:367

Methods

`Protected` applyLayoutMode

applyLayoutMode(layoutMode): void
Parameters
- layoutMode: MergeEditorLayoutMode
Returns void
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:528

`Protected` createCurrentMergeRangeObservable

createCurrentMergeRangeObservable(): Observable<undefined | MergeRange, unknown>
Returns Observable<undefined | MergeRange, unknown>
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:311

createMoveToUri

createMoveToUri(resourceUri): undefined | URI
Parameters
- resourceUri: URI
Returns undefined | URI
Implementation of Navigatable.createMoveToUri
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:424

`Protected` createScrollSynchronizer

createScrollSynchronizer(): MergeEditorScrollSync
Returns MergeEditorScrollSync
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:206

`Protected` createSelectionInBaseObservable

createSelectionInBaseObservable(): Observable<undefined | Range[], unknown>
Returns Observable<undefined | Range[], unknown>
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:329

`Protected` createViewZones

createViewZones(): Disposable
Returns Disposable
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:566

`Protected` doInitializeLayout

doInitializeLayout(): void
Returns void
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:231

`Protected` ensureLayoutInitialized

ensureLayoutInitialized(): void
Returns void
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:223

getResourceUri

getResourceUri(): undefined | URI
Returns undefined | URI
Implementation of Navigatable.getResourceUri
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:420

getTrackableWidgets

getTrackableWidgets(): Widget[]
Returns Widget[]
Implementation of ApplicationShell.TrackableWidgetProvider.getTrackableWidgets
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:429

goToFirstMergeRange

goToFirstMergeRange(predicate?): void
Parameters
- predicate: ((mergeRange) => boolean) = ...
  - - (mergeRange): boolean
    - Parameters
      mergeRange: MergeRange
      Returns boolean
Returns void
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:433

goToNextMergeRange

goToNextMergeRange(predicate?): void
Parameters
- predicate: ((mergeRange) => boolean) = ...
  - - (mergeRange): boolean
    - Parameters
      mergeRange: MergeRange
      Returns boolean
Returns void
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:441

goToPreviousMergeRange

goToPreviousMergeRange(predicate?): void
Parameters
- predicate: ((mergeRange) => boolean) = ...
  - - (mergeRange): boolean
    - Parameters
      mergeRange: MergeRange
      Returns boolean
Returns void
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:452

`Protected` init

init(): void
Returns void
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:157

`Protected` initCurrentPaneTracker

initCurrentPaneTracker(): void
Returns void
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:210

`Protected` onActivateRequest

onActivateRequest(msg): void
Parameters
- msg: Message
Returns void
Overrides BaseWidget.onActivateRequest
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:604

`Protected` onAfterShow

onAfterShow(msg): void
Parameters
- msg: Message
Returns void
Overrides BaseWidget.onAfterShow
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:600

`Protected` onBeforeHide

onBeforeHide(msg): void
Parameters
- msg: Message
Returns void
Overrides BaseWidget.onBeforeHide
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:596

`Protected` onLayoutInitialized

onLayoutInitialized(): void
Returns void
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:280

`Protected` onResize

onResize(msg): void
Parameters
- msg: ResizeMessage
Returns void
Overrides BaseWidget.onResize
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:294

restoreState

restoreState(state): void
Parameters
- state: MergeEditorWidgetState
Returns void
Implementation of StatefulWidget.restoreState
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:392

storeState

storeState(): MergeEditorWidgetState
Returns MergeEditorWidgetState
Implementation of StatefulWidget.storeState
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:379

toggleShowBase

toggleShowBase(): void
Returns void
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:491

toggleShowBaseCenter

toggleShowBaseCenter(): void
Returns void
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:509

toggleShowBaseTop

toggleShowBaseTop(): void
Returns void
- Defined in packages/scm/src/browser/merge-editor/merge-editor.ts:499