dc: fix copies in diff

hpi-swa-lab · Sep 26, 2023 · b924f1d · b924f1d
1 parent e40934e
commit b924f1d
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 9 deletions.
diff --git a/packages/DomainCode-Diff/DCChawatheScriptGenerator.class.st b/packages/DomainCode-Diff/DCChawatheScriptGenerator.class.st
@@ -51,11 +51,10 @@ DCChawatheScriptGenerator >> findPosition: aTree dest: destInorder in: aMapping
 { #category : #'as yet unclassified' }
 DCChawatheScriptGenerator >> generateFrom: src to: dest in: aMapping do: aBlock [
 
-	| actions srcInOrder destInOrder |
-	actions := DCEditScript new.
-
+	| srcInOrder destInOrder inserted |
 	srcInOrder := Set new.
 	destInOrder := Set new.
+	inserted := Set new.
 
 	dest allMorphsBreadthFirstDo: [:x | | y z w |
 		w := nil.
@@ -65,7 +64,8 @@ DCChawatheScriptGenerator >> generateFrom: src to: dest in: aMapping do: aBlock
 			ifFalse: [ | k |
 				k := self findPosition: x dest: destInOrder in: aMapping.
 				aBlock value: #insert value: {x. z. k}.
-				w := x copy.
+				w := x shallowCopyBlock.
+				inserted add: w.
 				z addMorph: w asElementNumber: k.
 				aMapping addMappingFrom: w to: x]
 			ifTrue: [
@@ -86,7 +86,7 @@ DCChawatheScriptGenerator >> generateFrom: src to: dest in: aMapping do: aBlock
 		destInOrder add: x.
 		self alignChildrenSrc: w dest: x srcInOrder: srcInOrder destInOrder: destInOrder in: aMapping do: aBlock].
 
-	src allMorphsDo: [:w | (aMapping isSrcMapped: w) ifFalse: [aBlock value: #delete value: {w}]]
+	src allMorphsDo: [:w | ((aMapping isSrcMapped: w) not and: [(inserted includes: w) not]) ifTrue: [aBlock value: #delete value: {w}]]
 ]
 
 { #category : #'as yet unclassified' }

diff --git a/packages/DomainCode-Diff/DCMappingStore.class.st b/packages/DomainCode-Diff/DCMappingStore.class.st
@@ -11,7 +11,6 @@ Class {
 { #category : #'as yet unclassified' }
 DCMappingStore >> addMappingFrom: src to: dest [
 
-	SBToggledCode comment: '' active: 0 do: {[src contents = 'abc' ifTrue: [self halt]]}.
 	self assert: src rootBlock ~= dest rootBlock.
 	srcToDest at: src put: dest.
 	destToSrc at: dest put: src

diff --git a/packages/DomainCode-Diff/DCMatchTest.class.st b/packages/DomainCode-Diff/DCMatchTest.class.st
@@ -9,8 +9,8 @@ DCMatchTest >> testSimple [
 
 	| src dest mappings |
 	Transcript clear.
-	src := DCBlock parseBlock: '' language: SBJavascript.
-	dest := DCBlock parseBlock: 'abc' language: SBJavascript.
+	src := DCBlock parseBlock: 'ab + 22' language: SBJavascript.
+	dest := DCBlock parseBlock: 'abc + 2' language: SBJavascript.
 	mappings := DCMappingStore new.
 	DCGreedySubtreeMatcher new matchFrom: src to: dest in: mappings.
 	DCGreedyBottomUpMatcher new matchFrom: src to: dest in: mappings.

diff --git a/packages/DomainCode-Diff/DCMatcher.class.st b/packages/DomainCode-Diff/DCMatcher.class.st
@@ -10,5 +10,11 @@ DCMatcher >> matchFrom: src to: dest [
 	| mappings |
 	mappings := DCMappingStore new.
 	DCGreedySubtreeMatcher new matchFrom: src to: dest in: mappings.
-	DCGreedyBottomUpMatcher new matchFrom: src to: dest in: mappings
+	DCGreedyBottomUpMatcher new matchFrom: src to: dest in: mappings.
+	Array streamContents: [:stream |
+		DCChawatheScriptGenerator new
+			generateFrom: src
+			to: dest
+			in: mappings
+			do: [:op :args | stream nextPut: {op. args}]]
 ]
diff --git a/packages/DomainCode-Parser/DCBlock.class.st b/packages/DomainCode-Parser/DCBlock.class.st
@@ -476,6 +476,17 @@ DCBlock >> rootBlock [
 	^ self ownerSatisfying: [:o | o isTSBlock and: [o type = self language rootRuleName]]
 ]
 
+{ #category : #'as yet unclassified' }
+DCBlock >> shallowCopyBlock [
+
+	^ DCBlock new
+		type: type;
+		language: language;
+		range: range;
+		field: field;
+		highlight: highlight
+]
+
 { #category : #'as yet unclassified' }
 DCBlock >> slot [
 

diff --git a/packages/DomainCode-Parser/DCText.class.st b/packages/DomainCode-Parser/DCText.class.st
@@ -123,6 +123,16 @@ DCText >> rootBlock [
 	^ self owner rootBlock
 ]
 
+{ #category : #'as yet unclassified' }
+DCText >> shallowCopyBlock [
+
+	^ DCText new
+		range: range;
+		contents: contents;
+		highlight: highlight;
+		field: field
+]
+
 { #category : #'as yet unclassified' }
 DCText >> shownColor [