add adornments only at the end of the string. #3965

girba · girba · commit cccbe1f890ac · 2024-08-20T23:54:59.000+02:00
diff --git a/lepiter/akzy87sfo25ew7howpf8depta.lepiter b/lepiter/akzy87sfo25ew7howpf8depta.lepiter
@@ -322,14 +322,14 @@
 					"__type" : "time",
 					"time" : {
 						"__type" : "dateAndTime",
-						"dateAndTimeString" : "2023-09-19T23:47:04.865685+02:00"
+						"dateAndTimeString" : "2024-08-20T20:02:14.096337+02:00"
 					}
 				},
 				"uid" : {
 					"__type" : "uid",
 					"uidString" : "e6C51z1uAAAAAAAAAAAAAA=="
 				},
-				"code" : "dictionary := STON fromString: json."
+				"code" : "dictionary := STONJSON fromString: json."
 			},
 			{
 				"__type" : "textSnippet",
diff --git a/src/GToolkit-Transcript/GtTranscript.class.st b/src/GToolkit-Transcript/GtTranscript.class.st
@@ -106,9 +106,12 @@ GtTranscript >> initialize [
 ]
 
 { #category : #'private - actions' }
-GtTranscript >> insertString: aString withAttributes: aCollection [
+GtTranscript >> insertString: aString withAttributesForWholeString: aCollection withAttributesAtTheEnd: aCollection2 [
 	self textDo: [ :aText |
-		aText append: (aString asRopedText attributes: aCollection).
+		| toAppend |
+		toAppend := aString asRopedText attributes: aCollection.
+		(toAppend from: toAppend size to: toAppend size) attributes: aCollection2.
+		aText append: toAppend.
 		self announcer announce: (GtTranscriptInsertStringAnnouncement new 
 			string: aString; 
 			attributes: aCollection) ]
diff --git a/src/GToolkit-Transcript/GtTranscriptExamples.class.st b/src/GToolkit-Transcript/GtTranscriptExamples.class.st
@@ -341,15 +341,13 @@ GtTranscriptExamples >> transcriptWitAnimation [
 		do: [ :anEvent | 
 			| snapshot |
 			snapshot := animation target asSpartaForm.
+			transcript cr.
 			transcript next
-				cr;
 				expanded: [ BlElement new
 						constraintsDo: [ :c | c textFlow pushLine ];
 						size: snapshot extent;
 						background: snapshot ];
-				putAll: 'Animation progress:';
-				space;
-				putAll: anEvent progress asString.
+				putAll: 'Animation progress: ', anEvent progress asString.
 			animation target asSpartaForm extent ];
 		onFinishedDo: [ space close ].
 	
diff --git a/src/GToolkit-Transcript/GtTranscriptNextBuilder.class.st b/src/GToolkit-Transcript/GtTranscriptNextBuilder.class.st
@@ -20,11 +20,22 @@ Class {
 	#instVars : [
 		'transcript',
 		'adornmentStrategy',
-		'attributes'
+		'attributes',
+		'adornments'
 	],
 	#category : #'GToolkit-Transcript'
 }
 
+{ #category : #attributes }
+GtTranscriptNextBuilder >> adornment: anAdornment [
+	adornments add: anAdornment 
+]
+
+{ #category : #attributes }
+GtTranscriptNextBuilder >> adornments: aCollection [
+	adornments addAll: aCollection
+]
+
 { #category : #attributes }
 GtTranscriptNextBuilder >> attribute: anAttribute [
 	attributes add: anAttribute
@@ -63,7 +74,7 @@ GtTranscriptNextBuilder >> expanded: aBlock [
 		beAppend;
 		stencil: aBlock.
 	
-	self attributes: {
+	self adornments: {
 		BrGlamorousTriangleExpanderTextAttribute new
 			isExpanded: true;
 			createdAttributes: { adornmentAttribute };
@@ -76,7 +87,7 @@ GtTranscriptNextBuilder >> expanded: aBlock [
 
 { #category : #attributes }
 GtTranscriptNextBuilder >> expanding: aBlock [
-	self attribute: (
+	self adornment: (
 		BrGlamorousTriangleExpanderTextAttribute new 
 			attributesCreatingBlock: [
 				BrTextAdornmentDynamicAttribute new 	
@@ -97,7 +108,8 @@ GtTranscriptNextBuilder >> foreground: aColor [
 
 { #category : #initialize }
 GtTranscriptNextBuilder >> initialize [
-	attributes := OrderedCollection with: (BlFontFamilyAttribute named: 'Source Code Pro')
+	attributes := OrderedCollection with: (BlFontFamilyAttribute named: 'Source Code Pro').
+	adornments := OrderedCollection new
 ]
 
 { #category : #attributes }
@@ -122,11 +134,12 @@ GtTranscriptNextBuilder >> put: aCharacter [
 
 { #category : #streaming }
 GtTranscriptNextBuilder >> putAll: aString [
-
 	"We should only modify the editor from within the UI thread"
+
 	transcript
 		insertString: aString
-		withAttributes: attributes
+		withAttributesForWholeString: attributes
+		withAttributesAtTheEnd: adornments
 ]
 
 { #category : #streaming }
