making the debugger action model trigger its #clear event when the de…

…bug session's #clear event is raised; in order to unsubscribe from everything automatically

src/NewTools-Debugger-Tests/StDebuggerActionModelTest.class.st

@@ -344,6 +344,35 @@ StDebuggerActionModelTest >> testDynamicShouldFilterStackUpdate [
 
 
 
+]
+
+{ #category : #'tests - actions' }
+StDebuggerActionModelTest >> testEventAfterClear [
+
+	| dummyActionModel dummyDebugger |
+	dummyDebugger := StDummyDebuggerPresenter new.
+
+	dummyActionModel := StTestDebuggerProvider new debuggerWithDNUContext
+		                    debuggerActionModel.
+	self changeSession: dummyActionModel session.
+	dummyActionModel clear.
+
+	debugActionModel
+		when: StDebuggerActionModelClearAnnouncement
+		send: #tag:
+		to: dummyDebugger.
+
+	self assert: dummyDebugger tag isNil.
+
+	debugActionModel clear.
+
+	self deny: dummyDebugger tag isNil.
+	self
+		assert: dummyDebugger tag class
+		identicalTo: StDebuggerActionModelClearAnnouncement.
+	self
+		assert: dummyDebugger tag debuggerActionModel
+		identicalTo: debugActionModel
 ]
 
 { #category : #'tests - actions' }

src/NewTools-Debugger/StDebugger.class.st

@@ -348,8 +348,7 @@ StDebugger >> clear [
 
 	"When we programmatically close the window, we do not need to terminate the session as it was already cleared"
 	programmaticallyClosed ifTrue: [ ^ self ].
-	self clearDebugSession.
-	debuggerActionModel := nil
+	self clearDebugSession
 ]
 
 { #category : #'updating - widgets' }
@@ -504,8 +503,7 @@ StDebugger >> debuggerActionModel [
 StDebugger >> debuggerActionModelCleared [
 
 	self unsubscribeFromActionModel.
-	self unsubscribeFromSystemAnnouncer.
-	debuggerActionModel := nil
+	self unsubscribeFromSystemAnnouncer
 ]
 
 { #category : #accessing }

src/NewTools-Debugger/StDebuggerActionModel.class.st

@@ -78,8 +78,7 @@ StDebuggerActionModel >> clearDebugSession [
 	contextPredicate := nil.
 	self session
 		terminate;
-		clear.
-	session := nil
+		clear
 ]
 
 { #category : #context }
@@ -370,7 +369,8 @@ StDebuggerActionModel >> registerActionsForSession: aSession [
 			when: #stepInto send: #updateStep to: self;
 			when: #stepOver send: #updateStep to: self;
 			when: #stepThrough send: #updateStep to: self;
-			when: #contextChanged send: #updateContextChanged to: self ]
+			when: #contextChanged send: #updateContextChanged to: self;
+			when: #clear send: #clear to: self ]
 ]
 
 { #category : #'events - removing' }