Merge pull request #1254 from fouziray/fix1207

filtering protocols when creating a new method in debugger

Author: jecisc

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

@@ -57,6 +57,43 @@ StDebuggerMNUExtensionTest >> tearDown [
 	super tearDown
 ]
 
+{ #category : 'tests' }
+StDebuggerMNUExtensionTest >> testExtensionDisplaysFilteredProtocolsDNU [
+
+	self hideExtensionInDebugger.
+	debugger := StTestDebuggerProvider new debuggerWithDNUContext.
+	debugger
+		application: debugger class currentApplication;
+		initialize.
+
+	self assert: debugger debuggerActionModel isInterruptedContextDoesNotUnderstand.
+	self assert: debugger canExecuteCreateMissingMethodCommand.
+
+	self displayExtensionInDebugger.
+
+self assertCollection:  ( (debugger extensionTools first instVarNamed: #selectedProtocol) items collect: #name)  hasSameElements:  StTestDebuggerProvider protocolNames.
+self denyCollection: ( (debugger extensionTools first instVarNamed: #selectedProtocol) items collect: #name) includesAny: Object protocolNames.
+]
+
+{ #category : 'tests' }
+StDebuggerMNUExtensionTest >> testExtensionDisplaysObjectProtocolsDNU [
+
+	| extensionFilteredProtocols |
+	self hideExtensionInDebugger.
+	debugger := StTestDebuggerProvider new debuggerWithObjectClassDNUContext.
+	debugger
+		application: debugger class currentApplication;
+		initialize.
+
+	self assert: debugger debuggerActionModel isInterruptedContextDoesNotUnderstand.
+	self assert: debugger canExecuteCreateMissingMethodCommand.
+
+	self displayExtensionInDebugger.
+extensionFilteredProtocols:=( (debugger extensionTools first instVarNamed: #selectedProtocol) items ).
+self assertCollection:  (extensionFilteredProtocols collect: #name)  includesAll:  Object class protocolNames.
+self denyCollection: (extensionFilteredProtocols reject: #isExtensionProtocol thenCollect: #name) includesAny: ((Object allSuperclasses collect:#protocols) flattened reject:#isExtensionProtocol thenCollect:#name).
+]
+
 { #category : 'tests' }
 StDebuggerMNUExtensionTest >> testExtensionDisplaysWhenDNU [
 

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

@@ -153,6 +153,15 @@ StTestDebuggerProvider >> debuggerWithMissingSubclassResponsibilityContextWithSt
 	^ dbg
 ]
 
+{ #category : 'helpers' }
+StTestDebuggerProvider >> debuggerWithObjectClassDNUContext [
+	[ self methodProducingDNUonObject ]
+		on: Error
+		do: [ :err | 
+			self sessionFor: err signalerContext exception: err.					
+			^ self newDebugger ]
+]
+
 { #category : 'helpers' }
 StTestDebuggerProvider >> debuggerWithObjectHalting [
 	[ StDebuggerObjectForTests new haltingMethod ]
@@ -198,6 +207,12 @@ StTestDebuggerProvider >> methodProducingDNU [
 	^ self foobar
 ]
 
+{ #category : 'helpers' }
+StTestDebuggerProvider >> methodProducingDNUonObject [
+
+	^ Object foobar
+]
+
 { #category : 'helpers' }
 StTestDebuggerProvider >> methodThatGeneratesCode [
 

src/NewTools-Debugger/StDebuggerMethodImplementorPresenter.class.st

@@ -54,12 +54,20 @@ StDebuggerMethodImplementorPresenter >> addProtocolsFrom: aClassOrTrait [
 	aClassOrTrait ifNil: [ ^ self ].
 
 	allProtocolsWithDuplicates := Dictionary new.
+	
 	(aClassOrTrait isTrait
 		 ifTrue: [ aClassOrTrait protocols ]
 		 ifFalse: [
-			 (aClassOrTrait withAllSuperclasses copyWithoutAll: {
-					  Object.
-					  ProtoObject }) flatCollect: #protocols ]) do: [ :protocol |
+			((aClassOrTrait withAllSuperclasses copyWithoutAll: ({
+						  Object.
+						  ProtoObject.
+						  Class.
+						  Behavior.
+						  ClassDescription.
+						  Object class.
+						  ProtoObject class } copyWithout: aClassOrTrait)) flatCollect: #protocols) asSet .
+						
+					 ]) do: [ :protocol |
 		allProtocolsWithDuplicates at: protocol name put: protocol ].
 	self addProtocols: allProtocolsWithDuplicates values
 ]