Jelajahi Sumber

Simplify references list.

Herby Vojčík 5 tahun lalu
induk
melakukan
f1a03254ea
2 mengubah file dengan 35 tambahan dan 346 penghapusan
  1. 24 282
      src/Helios-References.js
  2. 11 64
      src/Helios-References.st

+ 24 - 282
src/Helios-References.js

@@ -1,191 +1,9 @@
-define(["amber/boot", "require", "amber/core/Kernel-Objects", "helios/Helios-Core"], function($boot,requirejs){"use strict";
+define(["amber/boot", "require", "helios/Helios-Core"], function($boot,requirejs){"use strict";
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 var $pkg = $core.addPackage("Helios-References");
 $pkg.innerEval = function (expr) { return eval(expr); };
 $pkg.transport = {"type":"amd","amdNamespace":"helios"};
 
-$core.addClass("HLMethodReference", $globals.Object, ["selector", "methodClass"], "Helios-References");
-$core.addMethod(
-$core.method({
-selector: "initializeFromMethod:",
-protocol: "initialization",
-fn: function (aCompiledMethod){
-var self=this,$self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-$self._selector_($recv(aCompiledMethod)._selector());
-$self._methodClass_($recv(aCompiledMethod)._methodClass());
-return self;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"initializeFromMethod:",{aCompiledMethod:aCompiledMethod})});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["aCompiledMethod"],
-source: "initializeFromMethod: aCompiledMethod\x0a\x09self\x0a\x09\x09selector: aCompiledMethod selector;\x0a\x09\x09methodClass: aCompiledMethod methodClass",
-referencedClasses: [],
-//>>excludeEnd("ide");
-pragmas: [],
-messageSends: ["selector:", "selector", "methodClass:", "methodClass"]
-}),
-$globals.HLMethodReference);
-
-$core.addMethod(
-$core.method({
-selector: "method",
-protocol: "accessing",
-fn: function (){
-var self=this,$self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-return $recv($self._methodClass())._methodAt_($self._selector());
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"method",{})});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: [],
-source: "method\x0a\x09^ self methodClass methodAt: self selector",
-referencedClasses: [],
-//>>excludeEnd("ide");
-pragmas: [],
-messageSends: ["methodAt:", "methodClass", "selector"]
-}),
-$globals.HLMethodReference);
-
-$core.addMethod(
-$core.method({
-selector: "methodClass",
-protocol: "accessing",
-fn: function (){
-var self=this,$self=this;
-return $self.methodClass;
-
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: [],
-source: "methodClass\x0a\x09^ methodClass",
-referencedClasses: [],
-//>>excludeEnd("ide");
-pragmas: [],
-messageSends: []
-}),
-$globals.HLMethodReference);
-
-$core.addMethod(
-$core.method({
-selector: "methodClass:",
-protocol: "accessing",
-fn: function (aClass){
-var self=this,$self=this;
-$self.methodClass=aClass;
-return self;
-
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["aClass"],
-source: "methodClass: aClass\x0a\x09methodClass := aClass",
-referencedClasses: [],
-//>>excludeEnd("ide");
-pragmas: [],
-messageSends: []
-}),
-$globals.HLMethodReference);
-
-$core.addMethod(
-$core.method({
-selector: "selector",
-protocol: "accessing",
-fn: function (){
-var self=this,$self=this;
-return $self.selector;
-
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: [],
-source: "selector\x0a\x09^ selector",
-referencedClasses: [],
-//>>excludeEnd("ide");
-pragmas: [],
-messageSends: []
-}),
-$globals.HLMethodReference);
-
-$core.addMethod(
-$core.method({
-selector: "selector:",
-protocol: "accessing",
-fn: function (aString){
-var self=this,$self=this;
-$self.selector=aString;
-return self;
-
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["aString"],
-source: "selector: aString\x0a\x09selector := aString",
-referencedClasses: [],
-//>>excludeEnd("ide");
-pragmas: [],
-messageSends: []
-}),
-$globals.HLMethodReference);
-
-$core.addMethod(
-$core.method({
-selector: "source",
-protocol: "accessing",
-fn: function (){
-var self=this,$self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-return $recv($self._method())._source();
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"source",{})});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: [],
-source: "source\x0a\x09^ self method source",
-referencedClasses: [],
-//>>excludeEnd("ide");
-pragmas: [],
-messageSends: ["source", "method"]
-}),
-$globals.HLMethodReference);
-
-
-$core.addMethod(
-$core.method({
-selector: "on:",
-protocol: "instance creation",
-fn: function (aCompiledMethod){
-var self=this,$self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-var $1;
-$1=$self._new();
-$recv($1)._initializeFromMethod_(aCompiledMethod);
-return $recv($1)._yourself();
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"on:",{aCompiledMethod:aCompiledMethod})});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["aCompiledMethod"],
-source: "on: aCompiledMethod\x0a\x09^ self new\x0a\x09\x09initializeFromMethod: aCompiledMethod;\x0a\x09\x09yourself",
-referencedClasses: [],
-//>>excludeEnd("ide");
-pragmas: [],
-messageSends: ["initializeFromMethod:", "new", "yourself"]
-}),
-$globals.HLMethodReference.a$cls);
-
-
 $core.addClass("HLReferences", $globals.HLWidget, ["model", "sendersListWidget", "implementorsListWidget", "classReferencesListWidget", "regexpListWidget", "sourceCodeWidget"], "Helios-References");
 $core.addMethod(
 $core.method({
@@ -708,50 +526,30 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$receiver;
-var $early={};
-try {
+var $1,$receiver;
 if(($receiver = aMethod) == null || $receiver.a$nil){
 return self;
 } else {
 aMethod;
 }
-$recv($self._items())._detect_ifNone_((function(each){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
-$1=$recv(aMethod)._selector();
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx2.sendIdx["selector"]=1;
-//>>excludeEnd("ctx");
-return $recv(each).__eq($1);
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,2)});
-//>>excludeEnd("ctx");
-}),(function(){
-throw $early=[self];
-
-}));
-$2=$recv(aMethod)._selector();
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx1.sendIdx["selector"]=2;
-//>>excludeEnd("ctx");
-$self._selectedItem_($2);
-$self._activateItem_($recv(aMethod)._selector());
+$1=$recv($self._items())._includes_(aMethod);
+if(!$core.assert($1)){
 return self;
 }
-catch(e) {if(e===$early)return e[0]; throw e}
+$self._selectedItem_(aMethod);
+$self._activateItem_(aMethod);
+return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"onMethodSelected:",{aMethod:aMethod})});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aMethod"],
-source: "onMethodSelected: aMethod\x0a\x09aMethod ifNil: [ ^ self ].\x0a\x09self items detect: [ :each | each = aMethod selector ] ifNone: [ ^ self ].\x0a\x09\x0a\x09self \x0a\x09\x09selectedItem: aMethod selector;\x0a\x09\x09activateItem: aMethod selector",
+source: "onMethodSelected: aMethod\x0a\x09aMethod ifNil: [ ^ self ].\x0a\x09(self items includes: aMethod) ifFalse: [ ^ self ].\x0a\x09\x0a\x09self \x0a\x09\x09selectedItem: aMethod;\x0a\x09\x09activateItem: aMethod",
 referencedClasses: [],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["ifNil:", "detect:ifNone:", "items", "=", "selector", "selectedItem:", "activateItem:"]
+messageSends: ["ifNil:", "ifFalse:", "includes:", "items", "selectedItem:", "activateItem:"]
 }),
 $globals.HLReferencesListWidget);
 
@@ -789,7 +587,7 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv(html)._with_($recv($recv(aMethod)._method())._asString());
+$recv(html)._with_($recv(aMethod)._asString());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"renderItemLabel:on:",{aMethod:aMethod,html:html})});
@@ -797,11 +595,11 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aMethod", "html"],
-source: "renderItemLabel: aMethod on: html\x0a\x09html with: aMethod method asString",
+source: "renderItemLabel: aMethod on: html\x0a\x09html with: aMethod asString",
 referencedClasses: [],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["with:", "asString", "method"]
+messageSends: ["with:", "asString"]
 }),
 $globals.HLReferencesListWidget);
 
@@ -1100,7 +898,7 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($self._allMethods())._select_thenCollect_((function(each){
+return $recv($self._allMethods())._select_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1108,14 +906,6 @@ return $recv($recv(each)._referencedClasses())._includes_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");
-}),(function(each){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
-return $self._methodReferenceOn_(each);
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,2)});
-//>>excludeEnd("ctx");
 }));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"classReferencesOf:",{aString:aString})});
@@ -1123,11 +913,11 @@ return $self._methodReferenceOn_(each);
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString"],
-source: "classReferencesOf: aString\x0a\x09\x22Answer all methods referencing the class named aString\x22\x0a\x09\x0a\x09^self allMethods select: [ :each |\x0a\x09\x09\x09(each referencedClasses includes: aString) ] thenCollect: [ :each | self methodReferenceOn: each ].",
+source: "classReferencesOf: aString\x0a\x09\x22Answer all methods referencing the class named aString\x22\x0a\x09\x0a\x09^self allMethods select: [ :each |\x0a\x09\x09\x09(each referencedClasses includes: aString) ]",
 referencedClasses: [],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["select:thenCollect:", "allMethods", "includes:", "referencedClasses", "methodReferenceOn:"]
+messageSends: ["select:", "allMethods", "includes:", "referencedClasses"]
 }),
 $globals.HLReferencesModel);
 
@@ -1195,7 +985,7 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($recv($self._allMethods())._select_((function(each){
+return $recv($self._allMethods())._select_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1203,14 +993,6 @@ return $recv($recv(each)._selector()).__eq(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");
-})))._collect_((function(each){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
-return $self._methodReferenceOn_(each);
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,2)});
-//>>excludeEnd("ctx");
 }));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"implementorsOf:",{aString:aString})});
@@ -1218,11 +1000,11 @@ return $self._methodReferenceOn_(each);
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString"],
-source: "implementorsOf: aString\x0a\x09^ (self allMethods select: [ :each |\x0a\x09\x09each selector = aString ])\x0a\x09\x09\x09collect: [ :each | self methodReferenceOn: each ]",
+source: "implementorsOf: aString\x0a\x09^ self allMethods select: [ :each |\x0a\x09\x09each selector = aString ]",
 referencedClasses: [],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["collect:", "select:", "allMethods", "=", "selector", "methodReferenceOn:"]
+messageSends: ["select:", "allMethods", "=", "selector"]
 }),
 $globals.HLReferencesModel);
 
@@ -1245,30 +1027,6 @@ messageSends: []
 }),
 $globals.HLReferencesModel);
 
-$core.addMethod(
-$core.method({
-selector: "methodReferenceOn:",
-protocol: "accessing",
-fn: function (aCompiledMethod){
-var self=this,$self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-return $recv($globals.HLMethodReference)._on_(aCompiledMethod);
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"methodReferenceOn:",{aCompiledMethod:aCompiledMethod})});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["aCompiledMethod"],
-source: "methodReferenceOn: aCompiledMethod\x0a\x09^ HLMethodReference on: aCompiledMethod",
-referencedClasses: ["HLMethodReference"],
-//>>excludeEnd("ide");
-pragmas: [],
-messageSends: ["on:"]
-}),
-$globals.HLReferencesModel);
-
 $core.addMethod(
 $core.method({
 selector: "methodsCache",
@@ -1389,7 +1147,7 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($recv($self._allMethods())._select_((function(each){
+return $recv($self._allMethods())._select_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1397,14 +1155,6 @@ return $recv($recv(each)._source())._match_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");
-})))._collect_((function(each){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
-return $self._methodReferenceOn_(each);
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,2)});
-//>>excludeEnd("ctx");
 }));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"regexpReferencesOf:",{aString:aString})});
@@ -1412,11 +1162,11 @@ return $self._methodReferenceOn_(each);
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString"],
-source: "regexpReferencesOf: aString\x0a\x09^ (self allMethods select: [ :each |\x0a\x09\x09each source match: aString ])\x0a\x09\x09\x09collect: [ :each | self methodReferenceOn: each ]",
+source: "regexpReferencesOf: aString\x0a\x09^ self allMethods select: [ :each |\x0a\x09\x09each source match: aString ]",
 referencedClasses: [],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["collect:", "select:", "allMethods", "match:", "source", "methodReferenceOn:"]
+messageSends: ["select:", "allMethods", "match:", "source"]
 }),
 $globals.HLReferencesModel);
 
@@ -1460,7 +1210,7 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($recv($self._allMethods())._select_((function(each){
+return $recv($self._allMethods())._select_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1468,14 +1218,6 @@ return $recv($recv(each)._messageSends())._includes_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");
-})))._collect_((function(each){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
-return $self._methodReferenceOn_(each);
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,2)});
-//>>excludeEnd("ctx");
 }));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"sendersOf:",{aString:aString})});
@@ -1483,11 +1225,11 @@ return $self._methodReferenceOn_(each);
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString"],
-source: "sendersOf: aString\x0a\x09^ (self allMethods select: [ :each |\x0a\x09\x09each messageSends includes: aString ])\x0a\x09\x09\x09collect: [ :each | self methodReferenceOn: each ]",
+source: "sendersOf: aString\x0a\x09^ self allMethods select: [ :each |\x0a\x09\x09each messageSends includes: aString ]",
 referencedClasses: [],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["collect:", "select:", "allMethods", "includes:", "messageSends", "methodReferenceOn:"]
+messageSends: ["select:", "allMethods", "includes:", "messageSends"]
 }),
 $globals.HLReferencesModel);
 

+ 11 - 64
src/Helios-References.st

@@ -1,50 +1,4 @@
 Smalltalk createPackage: 'Helios-References'!
-Object subclass: #HLMethodReference
-	slots: {#selector. #methodClass}
-	package: 'Helios-References'!
-
-!HLMethodReference methodsFor: 'accessing'!
-
-method
-	^ self methodClass methodAt: self selector
-!
-
-methodClass
-	^ methodClass
-!
-
-methodClass: aClass
-	methodClass := aClass
-!
-
-selector
-	^ selector
-!
-
-selector: aString
-	selector := aString
-!
-
-source
-	^ self method source
-! !
-
-!HLMethodReference methodsFor: 'initialization'!
-
-initializeFromMethod: aCompiledMethod
-	self
-		selector: aCompiledMethod selector;
-		methodClass: aCompiledMethod methodClass
-! !
-
-!HLMethodReference class methodsFor: 'instance creation'!
-
-on: aCompiledMethod
-	^ self new
-		initializeFromMethod: aCompiledMethod;
-		yourself
-! !
-
 HLWidget subclass: #HLReferences
 	slots: {#model. #sendersListWidget. #implementorsListWidget. #classReferencesListWidget. #regexpListWidget. #sourceCodeWidget}
 	package: 'Helios-References'!
@@ -179,11 +133,11 @@ selectItem: aMethod
 
 onMethodSelected: aMethod
 	aMethod ifNil: [ ^ self ].
-	self items detect: [ :each | each = aMethod selector ] ifNone: [ ^ self ].
+	(self items includes: aMethod) ifFalse: [ ^ self ].
 	
 	self 
-		selectedItem: aMethod selector;
-		activateItem: aMethod selector
+		selectedItem: aMethod;
+		activateItem: aMethod
 !
 
 onSearchReferences: aString
@@ -193,7 +147,7 @@ onSearchReferences: aString
 !HLReferencesListWidget methodsFor: 'rendering'!
 
 renderItemLabel: aMethod on: html
-	html with: aMethod method asString
+	html with: aMethod asString
 ! !
 
 !HLReferencesListWidget class methodsFor: 'instance creation'!
@@ -290,7 +244,7 @@ classReferencesOf: aString
 	"Answer all methods referencing the class named aString"
 	
 	^self allMethods select: [ :each |
-			(each referencedClasses includes: aString) ] thenCollect: [ :each | self methodReferenceOn: each ].
+			(each referencedClasses includes: aString) ]
 !
 
 classesAndMetaclasses
@@ -298,25 +252,18 @@ classesAndMetaclasses
 !
 
 implementorsOf: aString
-	^ (self allMethods select: [ :each |
-		each selector = aString ])
-			collect: [ :each | self methodReferenceOn: each ]
-!
-
-methodReferenceOn: aCompiledMethod
-	^ HLMethodReference on: aCompiledMethod
+	^ self allMethods select: [ :each |
+		each selector = aString ]
 !
 
 regexpReferencesOf: aString
-	^ (self allMethods select: [ :each |
-		each source match: aString ])
-			collect: [ :each | self methodReferenceOn: each ]
+	^ self allMethods select: [ :each |
+		each source match: aString ]
 !
 
 sendersOf: aString
-	^ (self allMethods select: [ :each |
-		each messageSends includes: aString ])
-			collect: [ :each | self methodReferenceOn: each ]
+	^ self allMethods select: [ :each |
+		each messageSends includes: aString ]
 ! !
 
 !HLReferencesModel methodsFor: 'actions'!