dc: better support for insert-stmt

hpi-swa-lab · Oct 14, 2023 · 1cee429 · 1cee429
1 parent 96e2ec4
commit 1cee429
Show file tree

Hide file tree

Showing 15 changed files with 300 additions and 198 deletions.
diff --git a/packages/DomainCode-Core/Morph.extension.st b/packages/DomainCode-Core/Morph.extension.st
@@ -86,6 +86,18 @@ Morph >> hasChildren [
 	^ false
 ]
 
+{ #category : #'*DomainCode-Core' }
+Morph >> isExtra [
+
+	^ false
+]
+
+{ #category : #'*DomainCode-Core' }
+Morph >> isLineBreak [
+
+	^ false
+]
+
 { #category : #'*DomainCode-Core' }
 Morph >> isNode: aNode [
 

diff --git a/packages/DomainCode-Core/SequenceableCollection.extension.st b/packages/DomainCode-Core/SequenceableCollection.extension.st
@@ -0,0 +1,9 @@
+Extension { #name : #SequenceableCollection }
+
+{ #category : #'*DomainCode-Core' }
+SequenceableCollection >> overlappingPairsLoopedDo: aBlock [
+	"Emit overlapping pairs of my elements into aBlock"
+
+	1 to: self size - 1 do: [:i | aBlock value: (self at: i) value: (self at: i + 1)].
+	self size >= 2 ifTrue: [aBlock value: self last value: self first]
+]
diff --git a/packages/DomainCode-Diff/DCChawatheScriptGenerator.class.st b/packages/DomainCode-Diff/DCChawatheScriptGenerator.class.st
@@ -32,7 +32,12 @@ DCChawatheScriptGenerator >> delete: aMorph [
 
 	| target |
 	target := aMorph replacedParent
-		ifNotNil: [:p | p isReplacement ifTrue: [p] ifFalse: [p]]
+		ifNotNil: [:p |
+			p isReplacement
+				ifTrue: [
+					p queryState replacementDeleted: p.
+					p]
+				ifFalse: [p]]
 		ifNil: [aMorph].
 
 	target delete.
@@ -131,7 +136,7 @@ DCChawatheScriptGenerator >> lcsWith: x and: y in: aMapping [
 { #category : #'as yet unclassified' }
 DCChawatheScriptGenerator >> logChanges [
 
-	^ true
+	^ false
 ]
 
 { #category : #'as yet unclassified' }