Class MergeRange

Describes modifications in side 1 and side 2 for a specific range in base.

Constructors

constructor

new MergeRange(
    baseRange: LineRange,
    baseDocument: TextEditorDocument,
    side1Range: LineRange,
    side1Changes: readonly DetailedLineRangeMapping[],
    side1Document: TextEditorDocument,
    side2Range: LineRange,
    side2Changes: readonly DetailedLineRangeMapping[],
    side2Document: TextEditorDocument,
): MergeRange
Parameters
- baseRange: LineRange
- baseDocument: TextEditorDocument
- side1Range: LineRange
- side1Changes: readonly DetailedLineRangeMapping[]
- side1Document: TextEditorDocument
- side2Range: LineRange
- side2Changes: readonly DetailedLineRangeMapping[]
- side2Document: TextEditorDocument
Returns MergeRange
- Defined in packages/scm/src/browser/merge-editor/model/merge-range.ts:61

Properties

`Readonly`baseDocument

baseDocument: TextEditorDocument

`Readonly`baseRange

baseRange: LineRange

`Protected` `Optional`dumbCombinationEdit1

dumbCombinationEdit1?: LineRangeEdit

`Protected` `Optional`dumbCombinationEdit2

dumbCombinationEdit2?: LineRangeEdit

`Readonly`isEqualChange

isEqualChange: boolean = ...

`Readonly`side1Changes

side1Changes: readonly DetailedLineRangeMapping[]

`Readonly`side1CombinedChange

side1CombinedChange: undefined | DetailedLineRangeMapping = ...

`Readonly`side1Document

side1Document: TextEditorDocument

`Readonly`side1Range

side1Range: LineRange

`Readonly`side2Changes

side2Changes: readonly DetailedLineRangeMapping[]

`Readonly`side2CombinedChange

side2CombinedChange: undefined | DetailedLineRangeMapping = ...

`Readonly`side2Document

side2Document: TextEditorDocument

`Readonly`side2Range

side2Range: LineRange

`Protected` `Optional`smartCombinationEdit1

smartCombinationEdit1?: { value: undefined | LineRangeEdit }

`Protected` `Optional`smartCombinationEdit2

smartCombinationEdit2?: { value: undefined | LineRangeEdit }

Accessors

isConflicting

get isConflicting(): boolean
Returns boolean
- Defined in packages/scm/src/browser/merge-editor/model/merge-range.ts:88

isSmartCombinationOrderRelevant

get isSmartCombinationOrderRelevant(): boolean
Returns boolean
- Defined in packages/scm/src/browser/merge-editor/model/merge-range.ts:96

Methods

canBeSmartCombined

canBeSmartCombined(firstSide: MergeSide): boolean
Parameters
- firstSide: MergeSide
Returns boolean
- Defined in packages/scm/src/browser/merge-editor/model/merge-range.ts:92

`Protected`dumbCombineChanges

dumbCombineChanges(firstSide: MergeSide): LineRangeEdit
Parameters
- firstSide: MergeSide
Returns LineRangeEdit
- Defined in packages/scm/src/browser/merge-editor/model/merge-range.ts:216

`Protected`editsToLineRangeEdit

editsToLineRangeEdit(
    range: LineRange,
    sortedEdits: RangeEdit[],
    document: TextEditorDocument,
): undefined | LineRangeEdit
Parameters
- range: LineRange
- sortedEdits: RangeEdit[]
- document: TextEditorDocument
Returns undefined | LineRangeEdit
- Defined in packages/scm/src/browser/merge-editor/model/merge-range.ts:164

getBaseRangeEdit

getBaseRangeEdit(state: MergeRangeAcceptedState): LineRangeEdit
Parameters
- state: MergeRangeAcceptedState
Returns LineRangeEdit
- Defined in packages/scm/src/browser/merge-editor/model/merge-range.ts:105

getChanges

getChanges(side: MergeSide): readonly DetailedLineRangeMapping[]
Parameters
- side: MergeSide
Returns readonly DetailedLineRangeMapping[]
- Defined in packages/scm/src/browser/merge-editor/model/merge-range.ts:84

getCombinedChange

getCombinedChange(side: MergeSide): undefined | DetailedLineRangeMapping
Parameters
- side: MergeSide
Returns undefined | DetailedLineRangeMapping
- Defined in packages/scm/src/browser/merge-editor/model/merge-range.ts:80

getModifiedRange

getModifiedRange(side: MergeSide): LineRange
Parameters
- side: MergeSide
Returns LineRange
- Defined in packages/scm/src/browser/merge-editor/model/merge-range.ts:76

`Protected`smartCombineChanges

smartCombineChanges(firstSide: MergeSide): undefined | LineRangeEdit
Parameters
- firstSide: MergeSide
Returns undefined | LineRangeEdit
- Defined in packages/scm/src/browser/merge-editor/model/merge-range.ts:130

`Static`computeMergeRanges

computeMergeRanges(
    side1Diff: readonly DetailedLineRangeMapping[],
    side2Diff: readonly DetailedLineRangeMapping[],
    baseDocument: TextEditorDocument,
    side1Document: TextEditorDocument,
    side2Document: TextEditorDocument,
): MergeRange[]
Parameters
- side1Diff: readonly DetailedLineRangeMapping[]
- side2Diff: readonly DetailedLineRangeMapping[]
- baseDocument: TextEditorDocument
- side1Document: TextEditorDocument
- side2Document: TextEditorDocument
Returns MergeRange[]
- Defined in packages/scm/src/browser/merge-editor/model/merge-range.ts:35