The Trunk: Tools-ct.1355.mcz

Christoph Thiede uploaded a new version of Tools to project The Trunk:
http://source.squeak.org/trunk/Tools-ct.1355.mcz

==================== Summary ====================

Name: Tools-ct.1355
Author: ct
Time: 6 June 2026, 4:26:36.856372 pm
UUID: 14115d0e-2143-4521-b2df-7fa8169a2ecb
Ancestors: Tools-ct.1354

Prevents nil slip when aborting recompilation of a method in the debugger.

=============== Diff against Tools-ct.1354 ===============

Item was changed:
  ----- Method: Debugger>>contents:notifying: (in category 'accessing') -----
  contents: aText notifying: aController
  	"Accept new method source of the selected context."
  
  	| selector classOfMethod category ctxt newMethod |
  	self hasContextSelected ifFalse: [^ false].
  	
  	"First, handle some edge cases"
  	selector := self selectedClass newParser parseSelector: aText.
  	"selector isDoIt ifTrue: [
  		currentCompiledMethod := self compileDoIt: aText]."
  	self flag: #todo. "ct: Recompile doIt method *without* creating method litters!! See Compiler>>#evaluateCue:ifFail:."
  	selector = self selectedMessageName ifFalse: [
  		"Different message compiled, delegating to super"
  		^ super contents: aText notifying: aController].
  	
  	self selectedContext isClosureContext ifTrue: [
  		"If we are in a block context, we need to rewind the stack before ."
  		| home |
  		home := self selectedContext activeHome.
  		home ifNil: [
  			(self confirm: 'Method for block not found on stack, can''t edit and continue. Update method anyway?' translated) ifFalse: [
  				^ false].
+ 			^ (super contents: aText notifying: aController) = true
- 			^ (super contents: aText notifying: aController)
  				ifTrue: [
  					contents := nil. self contentsChanged.
  					self inform: 'Method was updated, but cannot revert the stack to it.' translated];
  				yourself].
  		(self confirm: 'I will have to revert to the method from\which this block originated. Is that OK?' translated withCRs) ifFalse: [
  			^ false].
  		
  		self resetContext: home changeContents: false.
  		"N.B. Only reset the contents if the compilation succeeds. If contents would be reset when compilation fails, both compiler error message and modifications were lost."
+ 		^ (self contents: aText notifying: aController) = true
- 		^ (self contents: aText notifying: aController)
  			ifTrue: [self contentsChanged];
  			yourself].
  	
  	classOfMethod := self selectedClass.
  	category := self selectedMessageCategoryName.
  	
  	"Do the actual compilation"
  	selector := classOfMethod
  		compile: aText
  		classified: category
  		notifying: aController.
  	selector ifNil: [^ false]. "compilation cancelled"
  	
  	"Update views"
  	contents := aText.
  	newMethod := classOfMethod compiledMethodAt: selector.
  	newMethod isQuick ifTrue: [
  		self cutBackExecutionToSenderContext].
  	ctxt := interruptedProcess popTo: self selectedContext.
  	ctxt == self selectedContext
  		ifFalse: [self inform: 'Method saved, but current context unchanged\because of unwind error. Click OK to see error' translated withCRs]
  		ifTrue: [
  			newMethod isQuick ifFalse: [
  				interruptedProcess restartTopWith: newMethod.
  				ctxt := self stepToStatement].
  			contextVariablesInspector object: nil].
  	self resetContext: ctxt.
  	
  	Project current addDeferredUIMessage: [
  		self changed: #contentsSelection].
  	^ true!

Squeak-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]