40448

14622 PackageManifest can not be in package Manifest-Core... https://pharo.fogbugz.com/f/cases/14622 14738 DebugSession assumes sending #stepToSendOrReturn is always needed https://pharo.fogbugz.com/f/cases/14738 14740 Faiing test: testMetaclassAndTraitClassRespectsPolymorphismRules https://pharo.fogbugz.com/f/cases/14740 http://files.pharo.org/image/40/40448.zip
pharo-project · Jan 15, 2015 · 814baf4 · 814baf4
1 parent a6f7eed
commit 814baf4
Show file tree

Hide file tree

Showing 18 changed files with 383 additions and 15 deletions.
diff --git a/DebuggerModel.package/DebugSession.class/instance/debugging actions/stepInto_.st b/DebuggerModel.package/DebugSession.class/instance/debugging actions/stepInto_.st
@@ -5,6 +5,6 @@ stepInto: aContext
 	(self isContextPostMortem: aContext) ifTrue: [^ self].
 
 	interruptedProcess step: aContext.
-	self updateContextTo:  interruptedProcess stepToSendOrReturn.
+	self updateContextTo: (self stepToFirstInterestingBytecodeIn: interruptedProcess).
 
 	self triggerEvent: #stepInto
diff --git a/DebuggerModel.package/DebugSession.class/instance/debugging actions/stepOver_.st b/DebuggerModel.package/DebugSession.class/instance/debugging actions/stepOver_.st
@@ -9,7 +9,7 @@ stepOver: aContext
 	newContext := interruptedProcess completeStep: aContext.
 	self updateContextTo:  
 		(newContext == aContext
-			ifTrue: [ interruptedProcess stepToSendOrReturn ]
+			ifTrue: [ (self stepToFirstInterestingBytecodeIn: interruptedProcess) ]
 			ifFalse: [ newContext ]).
 
 	self triggerEvent: #stepOver 
diff --git a/DebuggerModel.package/DebugSession.class/instance/debugging actions/stepThrough_.st b/DebuggerModel.package/DebugSession.class/instance/debugging actions/stepThrough_.st
@@ -5,6 +5,6 @@ stepThrough: aContext
 	(self isContextPostMortem: aContext) ifTrue: [^ self].
 
 	interruptedProcess stepToHome: aContext.
-	self updateContextTo:  interruptedProcess stepToSendOrReturn.
+	self updateContextTo: (self stepToFirstInterestingBytecodeIn: interruptedProcess).
 
 	self triggerEvent: #stepThrough 
diff --git a/...odel.package/DebugSession.class/instance/evaluating/rewindContextToMethod_fromContext_.st b/...odel.package/DebugSession.class/instance/evaluating/rewindContextToMethod_fromContext_.st
@@ -9,9 +9,8 @@ rewindContextToMethod: aMethod fromContext: aContext
 			self inform: 'Method saved, but current context unchanged\because of unwind error. Click OK to see error' withCRs ]
 		ifTrue: [
 			aMethod isQuick ifFalse: [
-				interruptedProcess
-					restartTopWith: aMethod;
-					stepToSendOrReturn ] ].
+				interruptedProcess restartTopWith: aMethod.
+				self stepToFirstInterestingBytecodeIn: interruptedProcess ] ].
 	self updateContextTo:  ctxt.
 
 	"Issue 3015 - Hernan"

diff --git a/DebuggerModel.package/DebugSession.class/instance/evaluating/unwindAndRestartToContext_.st b/DebuggerModel.package/DebugSession.class/instance/evaluating/unwindAndRestartToContext_.st
@@ -4,8 +4,7 @@ unwindAndRestartToContext: aContext
 	ctx := interruptedProcess popTo: aContext.
 	ctx == aContext ifTrue: [ 
 		"Only restart the process if the stack was unwind"
-		interruptedProcess
-			restartTop;
-			stepToSendOrReturn ].
+		interruptedProcess restartTop.
+		self stepToFirstInterestingBytecodeIn: interruptedProcess ].
 	self flag: 'Should a warning be displayed if the the unwind failed?'.
 	self updateContextTo:  aContext
diff --git a/...gerModel.package/DebugSession.class/instance/private/stepToFirstInterestingBytecodeIn_.st b/...gerModel.package/DebugSession.class/instance/private/stepToFirstInterestingBytecodeIn_.st
@@ -0,0 +1,9 @@
+stepToFirstInterestingBytecodeIn: aProcess
+	"After a restart of a method activation step to the first 
+	bytecode instruction that is of interest for the debugger.
+	
+	In this case step until a bytecode that causes a context switch,
+	as otherwise one will have to press may time step into without 
+	seeing any visible results."
+
+	^ aProcess stepToSendOrReturn
diff --git a/...e.package/PackageManifest.class/README.md → ...l.package/PackageManifest.class/README.md b/...e.package/PackageManifest.class/README.md → ...l.package/PackageManifest.class/README.md
diff --git a/...anifest.class/class/testing/isManifest.st → ...anifest.class/class/testing/isManifest.st b/...anifest.class/class/testing/isManifest.st → ...anifest.class/class/testing/isManifest.st
diff --git a/...ckage/PackageManifest.class/definition.st → ...ckage/PackageManifest.class/definition.st b/...ckage/PackageManifest.class/definition.st → ...ckage/PackageManifest.class/definition.st
@@ -2,4 +2,4 @@ Object subclass: #PackageManifest
 	instanceVariableNames: ''
 	classVariableNames: ''
 	poolDictionaries: ''
-	category: 'Manifest-Core'
+	category: 'Kernel'
diff --git a/...ss/instance/code-critics/rejectClasses.st → ...ss/instance/code-critics/rejectClasses.st b/...ss/instance/code-critics/rejectClasses.st → ...ss/instance/code-critics/rejectClasses.st
diff --git a/...lass/instance/code-critics/rejectRules.st → ...lass/instance/code-critics/rejectRules.st b/...lass/instance/code-critics/rejectRules.st → ...lass/instance/code-critics/rejectRules.st
diff --git a/...ageManifest.class/instance/comparing/=.st → ...ageManifest.class/instance/comparing/=.st b/...ageManifest.class/instance/comparing/=.st → ...ageManifest.class/instance/comparing/=.st
diff --git a/...Manifest.class/instance/comparing/hash.st → ...Manifest.class/instance/comparing/hash.st b/...Manifest.class/instance/comparing/hash.st → ...Manifest.class/instance/comparing/hash.st