Class MergeEditorModel

Implements

Disposable

Index

Constructors

Constructors

constructor

new MergeEditorModel(): MergeEditorModel
Returns MergeEditorModel

Properties

`Protected`_onInitialized

_onInitialized: Promise<void>

`Protected` `Readonly`baseToResultLineRangeMapObservable

baseToResultLineRangeMapObservable: Observable<DocumentLineRangeMap, void> = ...

`Protected` `Readonly`baseToResultRangeMapObservable

baseToResultRangeMapObservable: Observable<DocumentRangeMap, void> = ...

`Protected` `Readonly`baseToSide1LineRangeMapObservable

baseToSide1LineRangeMapObservable: Observable<DocumentLineRangeMap, void> = ...

`Protected` `Readonly`baseToSide1RangeMapObservable

baseToSide1RangeMapObservable: Observable<DocumentRangeMap, void> = ...

#endregion #region Range Mapping

`Protected` `Readonly`baseToSide2LineRangeMapObservable

baseToSide2LineRangeMapObservable: Observable<DocumentLineRangeMap, void> = ...

`Protected` `Readonly`baseToSide2RangeMapObservable

baseToSide2RangeMapObservable: Observable<DocumentRangeMap, void> = ...

`Protected` `Readonly`diffComputer

diffComputer: DiffComputer

`Protected` `Readonly`diffComputingStateForSidesObservable

diffComputingStateForSidesObservable: Observable<DiffComputingState, void> = ...

`Protected` `Readonly`diffComputingStateObservable

diffComputingStateObservable: Observable<DiffComputingState, void> = ...

#endregion

`Readonly`isUpToDateObservable

isUpToDateObservable: Observable<boolean, void> = ...

`Protected` `Readonly`mergeRangesDataObservable

mergeRangesDataObservable: Observable<Map<MergeRange, MergeRangeData>, void> = ...

`Protected` `Readonly`mergeRangesObservable

mergeRangesObservable: Observable<MergeRange[], void> = ...

`Protected` `Readonly`props

props: MergeEditorModelProps

`Protected`resultLiveDiff

resultLiveDiff: LiveDiff

`Protected` `Readonly`resultToBaseLineRangeMapObservable

resultToBaseLineRangeMapObservable: Observable<DocumentLineRangeMap, void> = ...

`Protected` `Readonly`resultToBaseRangeMapObservable

resultToBaseRangeMapObservable: Observable<DocumentRangeMap, void> = ...

`Protected` `Readonly`resultToSide1LineRangeMapObservable

resultToSide1LineRangeMapObservable: Observable<DocumentLineRangeMap, void> = ...

`Protected` `Readonly`resultToSide2LineRangeMapObservable

resultToSide2LineRangeMapObservable: Observable<DocumentLineRangeMap, void> = ...

`Protected`shouldRecomputeHandledState

shouldRecomputeHandledState: boolean = true

`Protected`side1LiveDiff

side1LiveDiff: LiveDiff

`Protected` `Readonly`side1ToBaseLineRangeMapObservable

side1ToBaseLineRangeMapObservable: Observable<DocumentLineRangeMap, void> = ...

`Protected` `Readonly`side1ToBaseRangeMapObservable

side1ToBaseRangeMapObservable: Observable<DocumentRangeMap, void> = ...

`Protected` `Readonly`side1ToResultLineRangeMapObservable

side1ToResultLineRangeMapObservable: Observable<DocumentLineRangeMap, void> = ...

#region Line Range Mapping

`Protected`side2LiveDiff

side2LiveDiff: LiveDiff

`Protected` `Readonly`side2ToBaseLineRangeMapObservable

side2ToBaseLineRangeMapObservable: Observable<DocumentLineRangeMap, void> = ...

`Protected` `Readonly`side2ToBaseRangeMapObservable

side2ToBaseRangeMapObservable: Observable<DocumentRangeMap, void> = ...

`Protected` `Readonly`side2ToResultLineRangeMapObservable

side2ToResultLineRangeMapObservable: Observable<DocumentLineRangeMap, void> = ...

`Protected` `Readonly`toDispose

toDispose: DisposableCollection = ...

`Protected` `Readonly`unhandledMergeRangesCountObservable

unhandledMergeRangesCountObservable: Observable<number, void> = ...

Accessors

baseDocument

get baseDocument(): MonacoEditorModel
Returns MonacoEditorModel
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:198

baseToResultLineRangeMap

get baseToResultLineRangeMap(): DocumentLineRangeMap
Returns DocumentLineRangeMap
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:126

baseToResultRangeMap

get baseToResultRangeMap(): DocumentRangeMap
Returns DocumentRangeMap
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:164

baseToSide1LineRangeMap

get baseToSide1LineRangeMap(): DocumentLineRangeMap
Returns DocumentLineRangeMap
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:106

baseToSide1RangeMap

get baseToSide1RangeMap(): DocumentRangeMap
Returns DocumentRangeMap
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:140

baseToSide2LineRangeMap

get baseToSide2LineRangeMap(): DocumentLineRangeMap
Returns DocumentLineRangeMap
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:116

baseToSide2RangeMap

get baseToSide2RangeMap(): DocumentRangeMap
Returns DocumentRangeMap
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:152

mergeRanges

get mergeRanges(): readonly MergeRange[]
Returns readonly MergeRange[]
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:72

onInitialized

get onInitialized(): Promise<void>
Returns Promise<void>
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:194

resultChanges

get resultChanges(): readonly DetailedLineRangeMapping[]
Returns readonly DetailedLineRangeMapping[]
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:226

resultDocument

get resultDocument(): MonacoEditorModel
Returns MonacoEditorModel
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:210

`Protected`resultEditor

get resultEditor(): MonacoEditor
Returns MonacoEditor
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:214

resultToBaseLineRangeMap

get resultToBaseLineRangeMap(): DocumentLineRangeMap
Returns DocumentLineRangeMap
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:131

resultToBaseRangeMap

get resultToBaseRangeMap(): DocumentRangeMap
Returns DocumentRangeMap
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:169

resultToSide1LineRangeMap

get resultToSide1LineRangeMap(): DocumentLineRangeMap
Returns DocumentLineRangeMap
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:89

resultToSide2LineRangeMap

get resultToSide2LineRangeMap(): DocumentLineRangeMap
Returns DocumentLineRangeMap
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:101

side1Changes

get side1Changes(): readonly DetailedLineRangeMapping[]
Returns readonly DetailedLineRangeMapping[]
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:218

side1Document

get side1Document(): MonacoEditorModel
Returns MonacoEditorModel
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:202

side1ToBaseLineRangeMap

get side1ToBaseLineRangeMap(): DocumentLineRangeMap
Returns DocumentLineRangeMap
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:111

side1ToBaseRangeMap

get side1ToBaseRangeMap(): DocumentRangeMap
Returns DocumentRangeMap
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:145

side1ToResultLineRangeMap

get side1ToResultLineRangeMap(): DocumentLineRangeMap
Returns DocumentLineRangeMap
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:84

side2Changes

get side2Changes(): readonly DetailedLineRangeMapping[]
Returns readonly DetailedLineRangeMapping[]
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:222

side2Document

get side2Document(): MonacoEditorModel
Returns MonacoEditorModel
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:206

side2ToBaseLineRangeMap

get side2ToBaseLineRangeMap(): DocumentLineRangeMap
Returns DocumentLineRangeMap
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:121

side2ToBaseRangeMap

get side2ToBaseRangeMap(): DocumentRangeMap
Returns DocumentRangeMap
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:157

side2ToResultLineRangeMap

get side2ToResultLineRangeMap(): DocumentLineRangeMap
Returns DocumentLineRangeMap
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:96

unhandledMergeRangesCount

get unhandledMergeRangesCount(): number
Returns number
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:189

Methods

applyMergeRangeAcceptedState

applyMergeRangeAcceptedState(
mergeRange: MergeRange,
state: MergeRangeAcceptedState,
): void
Parameters
- mergeRange: MergeRange
- state: MergeRangeAcceptedState
Returns void
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:451

`Protected`computeAutoMergedResult

computeAutoMergedResult(): string
Returns string
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:395

`Protected`computeMergeRanges

computeMergeRanges(): MergeRange[]
Returns MergeRange[]
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:431

`Protected`computeMergeRangeStateFromResult

computeMergeRangeStateFromResult(mergeRange: MergeRange): MergeRangeResultState
Parameters
- mergeRange: MergeRange
Returns MergeRangeResultState
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:344

`Protected`computeSideToResultDiff

computeSideToResultDiff(
sideChanges: readonly LineRangeMapping[],
resultChanges: readonly LineRangeMapping[],
): readonly LineRangeMapping[]
Parameters
- sideChanges: readonly LineRangeMapping[]
- resultChanges: readonly LineRangeMapping[]
Returns readonly LineRangeMapping[]
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:579

dispose

dispose(): void
Dispose this object.

Returns void
Implementation of Disposable.dispose
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:380

`Protected`doInit

doInit(): Promise<void>
Returns Promise<void>
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:374

`Protected`getDiffComputingState

getDiffComputingState(...liveDiffs: LiveDiff[]): DiffComputingState
Parameters
- ...liveDiffs: LiveDiff[]
Returns DiffComputingState
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:599

getLineRangeInResult

getLineRangeInResult(mergeRange: MergeRange): LineRange
Parameters
- mergeRange: MergeRange
Returns LineRange
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:526

`Protected`getMergeRangeData

getMergeRangeData(mergeRange: MergeRange): MergeRangeData
Parameters
- mergeRange: MergeRange
Returns MergeRangeData
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:439

getMergeRangeResultState

getMergeRangeResultState(mergeRange: MergeRange): MergeRangeResultState
Parameters
- mergeRange: MergeRange
Returns MergeRangeResultState
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:447

`Protected`getResultLineRangeMapping

getResultLineRangeMapping(mergeRange: MergeRange): LineRangeMapping
Parameters
- mergeRange: MergeRange
Returns LineRangeMapping
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:530

hasMergeRange

hasMergeRange(mergeRange: MergeRange): boolean
Parameters
- mergeRange: MergeRange
Returns boolean
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:435

`Protected`init

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

isDisposed

isDisposed(): boolean
Returns boolean
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:384

isMergeRangeHandled

isMergeRangeHandled(mergeRange: MergeRange): boolean
Parameters
- mergeRange: MergeRange
Returns boolean
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:478

markMergeRangeAsHandled

markMergeRangeAsHandled(
    mergeRange: MergeRange,
    options?: {
        undoRedo?: false | { callback?: { didRedo(): void; didUndo(): void } };
    },
): void
Parameters
- mergeRange: MergeRange
- Optionaloptions: { undoRedo?: false | { callback?: { didRedo(): void; didUndo(): void } } }
Returns void
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:482

`Protected`newDocumentLineRangeMap

newDocumentLineRangeMap(
lineRangeMappings: readonly LineRangeMapping[],
): DocumentLineRangeMap
Parameters
- lineRangeMappings: readonly LineRangeMapping[]
Returns DocumentLineRangeMap
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:591

`Protected`newDocumentRangeMap

newDocumentRangeMap(rangeMappings: readonly RangeMapping[]): DocumentRangeMap
Parameters
- rangeMappings: readonly RangeMapping[]
Returns DocumentRangeMap
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:595

`Protected`newLiveDiff

newLiveDiff(
originalDocument: MonacoEditorModel,
modifiedDocument: MonacoEditorModel,
): LiveDiff
Parameters
- originalDocument: MonacoEditorModel
- modifiedDocument: MonacoEditorModel
Returns LiveDiff
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:587

`Protected`newMergeRangeData

newMergeRangeData(): MergeRangeData
Returns MergeRangeData
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:583

reset

reset(): Promise<void>
Returns Promise<void>
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:388

translateBaseRangeToResult

translateBaseRangeToResult(range: Range): Range
Parameters
- range: Range
Returns Range
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:571

translateBaseRangeToSide

translateBaseRangeToSide(range: Range, side: MergeSide): Range
Parameters
- range: Range
- side: MergeSide
Returns Range
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:561

translateResultRangeToBase

translateResultRangeToBase(range: Range): Range
Parameters
- range: Range
Returns Range
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:575

translateSideRangeToBase

translateSideRangeToBase(range: Range, side: MergeSide): Range
Parameters
- range: Range
- side: MergeSide
Returns Range
- Defined in packages/scm/src/browser/merge-editor/model/merge-editor-model.ts:566