Add class hierarchy and class scopes [feenkcom/gtoolkit#3983]

feenkcom · Oct 21, 2024 · e0e6ef9 · e0e6ef9
1 parent c36ca3f
commit e0e6ef9
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 5 deletions.
diff --git a/src/GToolkit-Pharo-SearchFilters/GtSearchScopedMethodsClassHierarchyScope.class.st b/src/GToolkit-Pharo-SearchFilters/GtSearchScopedMethodsClassHierarchyScope.class.st
@@ -0,0 +1,66 @@
+Class {
+	#name : #GtSearchScopedMethodsClassHierarchyScope,
+	#superclass : #GtSearchScopedMethodsScope,
+	#instVars : [
+		'itemClass',
+		'filter'
+	],
+	#category : #'GToolkit-Pharo-SearchFilters-Support'
+}
+
+{ #category : #factory }
+GtSearchScopedMethodsClassHierarchyScope class >> itemInstancesForFilterContext: aFilterContext into: aStream [
+	aFilterContext
+		behaviorDo: [ :aBehavior | aStream nextPut: (self new itemClass: aBehavior) ]
+]
+
+{ #category : #accessing }
+GtSearchScopedMethodsClassHierarchyScope class >> order [
+	^ 300
+]
+
+{ #category : #accessing }
+GtSearchScopedMethodsClassHierarchyScope >> gtIconName [
+	^ #class
+]
+
+{ #category : #accessing }
+GtSearchScopedMethodsClassHierarchyScope >> icon [
+	^ BrGlamorousIcons verticaltree asElement
+]
+
+{ #category : #testing }
+GtSearchScopedMethodsClassHierarchyScope >> includesMethod: aCompiledMethod [
+	<return: #Boolean>
+	^ filter includesMethod: aCompiledMethod
+]
+
+{ #category : #initialization }
+GtSearchScopedMethodsClassHierarchyScope >> initialize [
+	super initialize.
+
+	filter := GtSearchInheritedMethodsFilter new
+			withSubclasses;
+			withSuperclasses
+]
+
+{ #category : #accessing }
+GtSearchScopedMethodsClassHierarchyScope >> itemClass [
+	^ itemClass
+]
+
+{ #category : #accessing }
+GtSearchScopedMethodsClassHierarchyScope >> itemClass: aClass [
+	itemClass := aClass.
+	filter forClass: aClass
+]
+
+{ #category : #accessing }
+GtSearchScopedMethodsClassHierarchyScope >> itemValue [
+	^ self itemClass
+]
+
+{ #category : #accessing }
+GtSearchScopedMethodsClassHierarchyScope >> label [
+	^ 'Hierarchy: ' , (self itemClass ifNotNil: #name ifNil: [ 'none' ])
+]
diff --git a/src/GToolkit-Pharo-SearchFilters/GtSearchScopedMethodsClassScope.class.st b/src/GToolkit-Pharo-SearchFilters/GtSearchScopedMethodsClassScope.class.st
@@ -16,12 +16,12 @@ GtSearchScopedMethodsClassScope class >> itemInstancesForFilterContext: aFilterC
 
 { #category : #accessing }
 GtSearchScopedMethodsClassScope class >> order [
-	^ 300
+	^ 400
 ]
 
 { #category : #accessing }
 GtSearchScopedMethodsClassScope >> gtIconName [
-	^ #class
+	^ self itemClass gtSystemIconName ifNil: #class
 ]
 
 { #category : #testing }
@@ -34,9 +34,7 @@ GtSearchScopedMethodsClassScope >> includesMethod: aCompiledMethod [
 GtSearchScopedMethodsClassScope >> initialize [
 	super initialize.
 
-	filter := GtSearchInheritedMethodsFilter new
-			withSubclasses;
-			withSuperclasses
+	filter := GtSearchMethodsInClassFilter new
 ]
 
 { #category : #accessing }

diff --git a/src/GToolkit-Pharo-SearchFilters/GtSearchScopedMethodsScope.class.st b/src/GToolkit-Pharo-SearchFilters/GtSearchScopedMethodsScope.class.st
@@ -4,6 +4,11 @@ Class {
 	#category : #'GToolkit-Pharo-SearchFilters-Support'
 }
 
+{ #category : #testing }
+GtSearchScopedMethodsScope class >> isAbstract [
+	^ self name = #GtSearchScopedMethodsScope
+]
+
 { #category : #factory }
 GtSearchScopedMethodsScope class >> itemInstancesForFilterContext: aFilterContext into: aStream [
 	self subclassResponsibility