Browse Source

Inline #and: and #or:.

Herby Vojčík 4 years ago
parent
commit
23bc5efd77

+ 26 - 33
src/Helios-Browser.js

@@ -2070,16 +2070,14 @@ var class_;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
+var $1;
 class_=$recv(anAnnouncement)._theClass();
-if(!$core.assert($recv($recv($recv(class_)._package()).__eq($recv($self._model())._selectedPackage()))._or_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
-return $recv($self._items())._includes_(class_);
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
-//>>excludeEnd("ctx");
-})))){
+if($core.assert($recv($recv(class_)._package()).__eq($recv($self._model())._selectedPackage()))){
+$1=true;
+} else {
+$1=$recv($self._items())._includes_(class_);
+}
+if(!$core.assert($1)){
 return self;
 }
 $self._setItemsForSelectedPackage();
@@ -2178,9 +2176,10 @@ var class_,oldPackage;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
+var $1;
 class_=$recv(anAnnouncement)._theClass();
 oldPackage=$recv(anAnnouncement)._oldPackage();
-if(!$core.assert($recv([$recv(oldPackage).__eq([$recv([$self._model()
+if($core.assert([$recv(oldPackage).__eq([$recv([$self._model()
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 ,$ctx1.sendIdx["model"]=1
 //>>excludeEnd("ctx");
@@ -2192,27 +2191,24 @@ if(!$core.assert($recv([$recv(oldPackage).__eq([$recv([$self._model()
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 ,$ctx1.sendIdx["="]=1
 //>>excludeEnd("ctx");
-][0])._or_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
-return [$recv($recv(class_)._package()).__eq([$recv([$self._model()
+][0])){
+$1=true;
+} else {
+$1=[$recv($recv(class_)._package()).__eq([$recv([$self._model()
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-,$ctx2.sendIdx["model"]=2
+,$ctx1.sendIdx["model"]=2
 //>>excludeEnd("ctx");
 ][0])._selectedPackage()
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-,$ctx2.sendIdx["selectedPackage"]=2
+,$ctx1.sendIdx["selectedPackage"]=2
 //>>excludeEnd("ctx");
 ][0])
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-,$ctx2.sendIdx["="]=2
+,$ctx1.sendIdx["="]=2
 //>>excludeEnd("ctx");
 ][0];
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
-//>>excludeEnd("ctx");
-})))){
+}
+if(!$core.assert($1)){
 return self;
 }
 if($core.assert($recv(oldPackage).__eq($recv($self._model())._selectedPackage()))){
@@ -4099,7 +4095,7 @@ var method;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
+var $1,$2;
 var $early={};
 try {
 method=$recv(anAnnouncement)._method();
@@ -4131,19 +4127,16 @@ $1=[$self._selectedItem()
 if($1 == null || $1.a$nil){
 $1;
 } else {
-if($core.assert($recv([$recv($recv(method)._methodClass()).__eq($recv($self._model())._selectedClass())
+if($core.assert([$recv($recv(method)._methodClass()).__eq($recv($self._model())._selectedClass())
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 ,$ctx1.sendIdx["="]=2
 //>>excludeEnd("ctx");
-][0])._and_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
-return $recv($recv(method)._selector()).__eq($self._selectedItem());
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({},$ctx1,4)});
-//>>excludeEnd("ctx");
-})))){
+][0])){
+$2=$recv($recv(method)._selector()).__eq($self._selectedItem());
+} else {
+$2=false;
+}
+if($core.assert($2)){
 $self._selectedItem_(nil);
 $self._selectItem_(nil);
 }

+ 5 - 9
src/Helios-Commands-Browser.js

@@ -511,19 +511,15 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($recv([$self._model()
+if($core.assert($recv([$self._model()
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 ,$ctx1.sendIdx["model"]=1
 //>>excludeEnd("ctx");
-][0])._showComment())._and_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
+][0])._showComment())){
 return $recv($recv($self._model())._selectedClass())._notNil();
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
-//>>excludeEnd("ctx");
-}));
+} else {
+return false;
+}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isActive",{})});
 //>>excludeEnd("ctx");

+ 7 - 9
src/Helios-Commands-Core.js

@@ -801,15 +801,13 @@ var newBinding;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-if($core.assert($recv($self._isConcrete())._and_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
-return $self._isValidFor_(aModel);
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
-//>>excludeEnd("ctx");
-})))){
+var $1;
+if($core.assert($self._isConcrete())){
+$1=$self._isValidFor_(aModel);
+} else {
+$1=false;
+}
+if($core.assert($1)){
 newBinding=$self._registerOn_for_(aBinding,aModel);
 newBinding;
 } else {

+ 48 - 81
src/Helios-Core.js

@@ -1338,19 +1338,17 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-if($core.assert($recv($recv([$self._selectedClass()
+var $1;
+if($core.assert($recv([$self._selectedClass()
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 ,$ctx1.sendIdx["selectedClass"]=1
 //>>excludeEnd("ctx");
-][0]).__eq(aClass))._and_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
-return $recv(aClass)._isNil();
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
-//>>excludeEnd("ctx");
-})))){
+][0]).__eq(aClass))){
+$1=$recv(aClass)._isNil();
+} else {
+$1=false;
+}
+if($core.assert($1)){
 return self;
 }
 $self._withChangesDo_((function(){
@@ -1440,6 +1438,7 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
+var $1;
 if($core.assert($recv($self.selectedSelector).__eq(aCompiledMethod))){
 return self;
 }
@@ -1452,15 +1451,12 @@ $self.selectedSelector=nil;
 $self.selectedSelector;
 } else {
 $self.selectedSelector=$recv(aCompiledMethod)._selector();
-if(!$core.assert($recv($recv($self.selectedClass)._notNil())._and_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx3) {
-//>>excludeEnd("ctx");
-return $recv($recv($self.selectedClass)._methodDictionary())._includesKey_($self.selectedSelector);
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx3) {$ctx3.fillBlock({},$ctx2,5)});
-//>>excludeEnd("ctx");
-})))){
+if($core.assert($recv($self.selectedClass)._notNil())){
+$1=$recv($recv($self.selectedClass)._methodDictionary())._includesKey_($self.selectedSelector);
+} else {
+$1=false;
+}
+if(!$core.assert($1)){
 $self.selectedClass=$recv(aCompiledMethod)._methodClass();
 $self.selectedPackage=$recv($recv($self.selectedClass)._theNonMetaClass())._package();
 $self.selectedPackage;
@@ -1604,15 +1600,11 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($recv($self._selectedClass())._isNil())._or_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
+if($core.assert($recv($self._selectedClass())._isNil())){
+return true;
+} else {
 return $recv(aString)._match_("^\x5cs*[A-Z]");
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
-//>>excludeEnd("ctx");
-}));
+}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"shouldCompileDefinition:",{aString:aString})});
 //>>excludeEnd("ctx");
@@ -2703,19 +2695,15 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($recv([$self._wrapper()
+if($core.assert($recv([$self._wrapper()
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 ,$ctx1.sendIdx["wrapper"]=1
 //>>excludeEnd("ctx");
-][0])._notNil())._and_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
+][0])._notNil())){
 return $recv($recv($self._wrapper())._asJQuery())._hasClass_($self._focusClass());
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
-//>>excludeEnd("ctx");
-}));
+} else {
+return false;
+}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"hasFocus",{})});
 //>>excludeEnd("ctx");
@@ -4208,27 +4196,15 @@ return $recv(each)._for_($self._model());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-return [$recv($recv($recv(each)._category()).__eq($self._commandCategory()))._and_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx3) {
-//>>excludeEnd("ctx");
-return $recv($recv(each)._isAction())._and_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx4) {
-//>>excludeEnd("ctx");
+if($core.assert($recv($recv(each)._category()).__eq($self._commandCategory()))){
+if($core.assert($recv(each)._isAction())){
 return $recv(each)._isActive();
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx4) {$ctx4.fillBlock({},$ctx3,5)});
-//>>excludeEnd("ctx");
-}));
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx3) {$ctx3.fillBlock({},$ctx2,4)});
-//>>excludeEnd("ctx");
-}))
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-,$ctx2.sendIdx["and:"]=1
-//>>excludeEnd("ctx");
-][0];
+} else {
+return false;
+}
+} else {
+return false;
+}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,3)});
 //>>excludeEnd("ctx");
@@ -10039,35 +10015,29 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
+var $1,$2;
 $recv("body"._asJQuery())._keydown_((function(event){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-if($core.assert([$recv([$recv(event)._ctrlKey()
+if($core.assert([$recv(event)._ctrlKey()
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 ,$ctx2.sendIdx["ctrlKey"]=1
 //>>excludeEnd("ctx");
-][0])._and_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx3) {
-//>>excludeEnd("ctx");
-return [$recv([$recv(event)._which()
+][0])){
+$1=[$recv([$recv(event)._which()
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-,$ctx3.sendIdx["which"]=1
+,$ctx2.sendIdx["which"]=1
 //>>excludeEnd("ctx");
 ][0]).__eq((188))
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-,$ctx3.sendIdx["="]=1
+,$ctx2.sendIdx["="]=1
 //>>excludeEnd("ctx");
 ][0];
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx3) {$ctx3.fillBlock({},$ctx2,2)});
-//>>excludeEnd("ctx");
-}))
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-,$ctx2.sendIdx["and:"]=1
-//>>excludeEnd("ctx");
-][0])){
+} else {
+$1=false;
+}
+if($core.assert($1)){
 $self._activatePreviousTab();
 [$recv(event)._preventDefault()
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -10075,15 +10045,12 @@ $self._activatePreviousTab();
 //>>excludeEnd("ctx");
 ][0];
 }
-if($core.assert($recv($recv(event)._ctrlKey())._and_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx3) {
-//>>excludeEnd("ctx");
-return $recv($recv(event)._which()).__eq((190));
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx3) {$ctx3.fillBlock({},$ctx2,4)});
-//>>excludeEnd("ctx");
-})))){
+if($core.assert($recv(event)._ctrlKey())){
+$2=$recv($recv(event)._which()).__eq((190));
+} else {
+$2=false;
+}
+if($core.assert($2)){
 $self._activateNextTab();
 return $recv(event)._preventDefault();
 }

+ 4 - 8
src/Helios-Debugger.js

@@ -110,15 +110,11 @@ return $recv((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
-return $recv($recv(inspectedContext)._notNil())._and_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx4) {
-//>>excludeEnd("ctx");
+if($core.assert($recv(inspectedContext)._notNil())){
 return $recv(inspectedContext)._isBlockContext();
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx4) {$ctx4.fillBlock({},$ctx3,3)});
-//>>excludeEnd("ctx");
-}));
+} else {
+return false;
+}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx3) {$ctx3.fillBlock({},$ctx2,2)});
 //>>excludeEnd("ctx");

+ 8 - 10
src/Helios-Helpers.js

@@ -445,6 +445,7 @@ var protocolBag,methods,protocolToUse,counter;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
+var $1;
 var $early={};
 try {
 protocolBag=[$recv($globals.Dictionary)._new()
@@ -475,19 +476,16 @@ if(!$core.assert([$recv([$recv($self.method)._origin()
 ,$ctx3.sendIdx["="]=1
 //>>excludeEnd("ctx");
 ][0])){
-if(!$core.assert($recv([$recv($recv(protocol)._first()).__eq("*")
+if($core.assert([$recv($recv(protocol)._first()).__eq("*")
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 ,$ctx3.sendIdx["="]=2
 //>>excludeEnd("ctx");
-][0])._or_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx4) {
-//>>excludeEnd("ctx");
-return $recv(protocol).__eq($recv($self.method)._defaultProtocol());
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx4) {$ctx4.fillBlock({},$ctx3,5)});
-//>>excludeEnd("ctx");
-})))){
+][0])){
+$1=true;
+} else {
+$1=$recv(protocol).__eq($recv($self.method)._defaultProtocol());
+}
+if(!$core.assert($1)){
 return $recv(protocolBag)._at_put_(protocol,$recv($recv(protocolBag)._at_ifAbsent_(protocol,(function(){
 return (0);
 

+ 26 - 41
src/Helios-KeyBindings.js

@@ -1662,7 +1662,8 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-if($core.assert([$recv([$recv([$recv(event)._which()
+var $1,$2;
+if($core.assert([$recv([$recv(event)._which()
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 ,$ctx1.sendIdx["which"]=1
 //>>excludeEnd("ctx");
@@ -1670,43 +1671,29 @@ if($core.assert([$recv([$recv([$recv(event)._which()
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 ,$ctx1.sendIdx["="]=1
 //>>excludeEnd("ctx");
-][0])._or_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
-return $recv($recv([$recv([$recv(event)._which()
+][0])){
+$2=true;
+} else {
+if($core.assert([$recv([$recv(event)._which()
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-,$ctx2.sendIdx["which"]=2
+,$ctx1.sendIdx["which"]=2
 //>>excludeEnd("ctx");
 ][0]).__eq((71))
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-,$ctx2.sendIdx["="]=2
-//>>excludeEnd("ctx");
-][0])._or_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx3) {
-//>>excludeEnd("ctx");
-return $recv($recv(event)._which()).__eq($self._activationKey());
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx3) {$ctx3.fillBlock({},$ctx2,2)});
-//>>excludeEnd("ctx");
-})))._and_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx3) {
-//>>excludeEnd("ctx");
-return $recv(event)._ctrlKey();
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx3) {$ctx3.fillBlock({},$ctx2,3)});
-//>>excludeEnd("ctx");
-}));
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
-//>>excludeEnd("ctx");
-}))
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-,$ctx1.sendIdx["or:"]=1
+,$ctx1.sendIdx["="]=2
 //>>excludeEnd("ctx");
 ][0])){
+$1=true;
+} else {
+$1=$recv($recv(event)._which()).__eq($self._activationKey());
+}
+if($core.assert($1)){
+$2=$recv(event)._ctrlKey();
+} else {
+$2=false;
+}
+}
+if($core.assert($2)){
 $self._deactivate();
 $recv(event)._preventDefault();
 return false;
@@ -2769,15 +2756,13 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-if($core.assert($recv($recv($recv(anEvent)._which()).__eq(anInteger))._and_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
-return $recv($self._isKeyDown())._not();
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
-//>>excludeEnd("ctx");
-})))){
+var $1;
+if($core.assert($recv($recv(anEvent)._which()).__eq(anInteger))){
+$1=$recv($self._isKeyDown())._not();
+} else {
+$1=false;
+}
+if($core.assert($1)){
 $self._whileKeyDownDo_(aBlock);
 }
 return self;

+ 8 - 10
src/Helios-SUnit.js

@@ -922,7 +922,8 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-if($core.assert($recv($recv($recv($self._items())._includes_([$recv([$recv(anAnnouncement)._theClass()
+var $1;
+if($core.assert($recv($recv($self._items())._includes_([$recv([$recv(anAnnouncement)._theClass()
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 ,$ctx1.sendIdx["theClass"]=1
 //>>excludeEnd("ctx");
@@ -930,15 +931,12 @@ if($core.assert($recv($recv($recv($self._items())._includes_([$recv([$recv(anAnn
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 ,$ctx1.sendIdx["package"]=1
 //>>excludeEnd("ctx");
-][0]))._not())._and_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
-return $recv($recv($recv(anAnnouncement)._theClass())._package())._isTestPackage();
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
-//>>excludeEnd("ctx");
-})))){
+][0]))._not())){
+$1=$recv($recv($recv(anAnnouncement)._theClass())._package())._isTestPackage();
+} else {
+$1=false;
+}
+if($core.assert($1)){
 $self._initializeItems();
 $self._refresh();
 }