fix evaluation epilog

Author: tomooda

repository/ViennaTalk-Browser-Core/ViennaEpiLog.class.st

@@ -306,9 +306,12 @@ ViennaEpiLog >> metadataName [
 ]
 
 { #category : 'instance creation' }
-ViennaEpiLog >> newEvaluation: aString [
+ViennaEpiLog >> newEvaluation: aString state: aDictionary [
 
-	^ ViennaEvaluationEpiLog after: self expression: aString
+	^ ViennaEvaluationEpiLog
+		  after: self
+		  expression: aString
+		  state: aDictionary
 ]
 
 { #category : 'instance creation' }

repository/ViennaTalk-Browser-Core/ViennaEvaluationEpiLog.class.st

@@ -2,18 +2,20 @@ Class {
 	#name : 'ViennaEvaluationEpiLog',
 	#superclass : 'ViennaEpiLog',
 	#instVars : [
-		'#expression => HiDePersistencySlot loader: #hideLoadExpression'
+		'#expression => HiDePersistencySlot loader: #hideLoadExpression',
+		'#state => HiDePersistencySlot loader: #hideLoadState'
 	],
 	#category : 'ViennaTalk-Browser-Core-EpiLog',
 	#package : 'ViennaTalk-Browser-Core',
 	#tag : 'EpiLog'
 }
 
 { #category : 'instance creation' }
-ViennaEvaluationEpiLog class >> after: aViennaEpiLog expression: aString [
+ViennaEvaluationEpiLog class >> after: aViennaEpiLog expression: aString state: aDictionary [
 
 	^ (self after: aViennaEpiLog)
 		  expression: aString;
+		  state: aDictionary;
 		  yourself
 ]
 
@@ -35,11 +37,19 @@ ViennaEvaluationEpiLog >> expression: aString [
 	expression := aString
 ]
 
+{ #category : 'testing' }
+ViennaEvaluationEpiLog >> hasStateChange [
+
+	^ state notNil and: [ prev isNil or: [ prev state ~= state ] ]
+]
+
 { #category : 'hideho-operations' }
 ViennaEvaluationEpiLog >> hideLoad: aFileReference [
 
 	super hideLoad: aFileReference.
-	self hideLoadExpression: aFileReference
+	self
+		hideLoadExpression: aFileReference;
+		hideLoadState: aFileReference
 ]
 
 { #category : 'hideho-operations' }
@@ -55,14 +65,31 @@ ViennaEvaluationEpiLog >> hideLoadExpression: aFileReference [
 		expression := ref contents ]
 ]
 
+{ #category : 'hideho-operations' }
+ViennaEvaluationEpiLog >> hideLoadState [
+
+	self hideBaseDirectoryDo: [ :ref | self hideLoadState: ref ]
+]
+
+{ #category : 'hideho-operations' }
+ViennaEvaluationEpiLog >> hideLoadState: aFileReference [
+
+	aFileReference / 'state.json' ifExists: [ :ref |
+		ref readStreamDo: [ :stream | state := STONJSON fromStream: stream ] ]
+]
+
 { #category : 'hideho-operations' }
 ViennaEvaluationEpiLog >> hideSave: aFileReference [
 
 	super hideSave: aFileReference.
 	expression ifNotNil: [
-		(aFileReference / 'expression.txt')
-			ensureDelete;
-			writeStreamDo: [ :stream | stream nextPutAll: expression ] ]
+			(aFileReference / 'expression.txt')
+				ensureDelete;
+				writeStreamDo: [ :stream | stream nextPutAll: expression ] ].
+	state ifNotNil: [
+			(aFileReference / 'state.json')
+				ensureDelete;
+				writeStreamDo: [ :stream | STONJSON put: state onStream: stream ] ]
 ]
 
 { #category : 'initialization' }
@@ -91,3 +118,15 @@ ViennaEvaluationEpiLog >> printOn: aStream [
 		nextPutAll: 'Eval ';
 		nextPutAll: self expression
 ]
+
+{ #category : 'accessing' }
+ViennaEvaluationEpiLog >> state [
+
+	^ state ifNil: [ prev ifNotNil: #state ifNil: [ Dictionary new ] ]
+]
+
+{ #category : 'accessing' }
+ViennaEvaluationEpiLog >> state: aDictionary [
+
+	state := aDictionary
+]

repository/ViennaTalk-Browser-Core/ViennaRefactoringBrowser.class.st

@@ -1199,9 +1199,9 @@ ViennaRefactoringBrowser >> epiLogEnumerator [
 ]
 
 { #category : 'operations-epiLog' }
-ViennaRefactoringBrowser >> epiLogEvaluation: aString [
+ViennaRefactoringBrowser >> epiLogEvaluation: aString state: aDictionary [
 
-	self epiLog: (self epiLog newEvaluation: aString)
+	self epiLog: (self epiLog newEvaluation: aString state: aDictionary)
 ]
 
 { #category : 'operations-epiLog' }
@@ -2205,7 +2205,9 @@ ViennaRefactoringBrowser >> initializePlaygroundPagePresenters [
 		                  module: [ self module ];
 		                  withoutLineNumbers;
 		                  whenEvaluatedDo: [ :expression |
-			                  self epiLogEvaluation: expression ];
+			                  self
+				                  epiLogEvaluation: expression
+				                  state: animation state ];
 		                  whenExecutedDo: [ :statement |
 			                  self
 				                  epiLogExecution: statement
@@ -2338,7 +2340,9 @@ ViennaRefactoringBrowser >> initializeSourcePagePresenters [
 		              whenTextChangedDo: [ self onTheFlyCheckSourceText ];
 		              whenSubmitDo: [ :text | self accept: text ];
 		              whenEvaluatedDo: [ :expression |
-			              self epiLogEvaluation: expression ];
+			              self
+				              epiLogEvaluation: expression
+				              state: animation state ];
 		              whenExecutedDo: [ :statement |
 			              self
 				              epiLogExecution: statement

repository/ViennaTalk-Browser-Core/ViennaVDMSourcePresenter.class.st

@@ -49,19 +49,19 @@ ViennaVDMSourcePresenter >> animation: aBlock [
 ViennaVDMSourcePresenter >> doEvaluateIt [
 
 	self selectedTextOrLine trim ifNotEmpty: [ :expression |
-		| result |
-		result := self
-			          evaluateExpression: self selectedTextOrLine
-			          ifError: [ :msg |
-				          self
-					          insertPopoverAfterCurrentSelection:
-					          (self newLabel label: msg)
-					          style: 'error'.
-				          ^ nil ].
-		self
-			insertPopoverAfterCurrentSelection: (self newLabel label: result)
-			style: 'print'.
-		self announcer announce: (ViennaEvaluated expression: expression) ]
+			| result |
+			result := self
+				          evaluateExpression: self selectedTextOrLine
+				          ifError: [ :msg |
+						          self
+							          insertPopoverAfterCurrentSelection:
+							          (self newLabel label: msg)
+							          style: 'error'.
+						          ^ nil ].
+			self
+				insertPopoverAfterCurrentSelection: (self newLabel label: result)
+				style: 'print'.
+			self announcer announce: (ViennaEvaluated expression: expression) ]
 ]
 
 { #category : 'evaluating' }