Parcourir la source

Do not re-alias alias variable

by making AliasVar >> isImmutable return true.
It's ok, as 'isImmutable' means 'can I just use it as is,
will it keep its value and not do side-effects?', which
AliasVar does (it's just a once-initialized holder).
Herbert Vojčík il y a 8 ans
Parent
commit
b2f8d23158
6 fichiers modifiés avec 121 ajouts et 142 suppressions
  1. 35 39
      src/Helios-Browser.js
  2. 22 26
      src/Helios-Core.js
  3. 7 9
      src/Helios-Debugger.js
  4. 3 4
      src/Helios-Helpers.js
  5. 4 5
      src/Helios-Inspector.js
  6. 50 59
      src/Helios-KeyBindings.js

+ 35 - 39
src/Helios-Browser.js

@@ -342,27 +342,25 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$4,$3,$5,$8,$7,$6;
+var $1,$3,$2,$6,$5,$4;
 $1=self._model();
 $recv($1)._focusOnSourceCode();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["focusOnSourceCode"]=1;
 //>>excludeEnd("ctx");
-$2=$1;
-$4=$recv(aCompiledMethod)._methodClass();
+$3=$recv(aCompiledMethod)._methodClass();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["methodClass"]=1;
 //>>excludeEnd("ctx");
-$3=$recv($4)._package();
-$recv($2)._selectedPackage_($3);
-$5=$1;
-$8=$recv(aCompiledMethod)._methodClass();
+$2=$recv($3)._package();
+$recv($1)._selectedPackage_($2);
+$6=$recv(aCompiledMethod)._methodClass();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["methodClass"]=2;
 //>>excludeEnd("ctx");
-$7=$recv($8)._isMetaclass();
-$6=$recv($7)._not();
-$recv($5)._showInstance_($6);
+$5=$recv($6)._isMetaclass();
+$4=$recv($5)._not();
+$recv($1)._showInstance_($4);
 $recv($1)._selectedClass_($recv(aCompiledMethod)._methodClass());
 $recv($1)._selectedProtocol_($recv(aCompiledMethod)._protocol());
 $recv($1)._selectedMethod_(aCompiledMethod);
@@ -2561,7 +2559,7 @@ function $String(){return $globals.String||(typeof String=="undefined"?nil:Strin
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$3,$4,$6,$5,$7,$8,$9,$10,$2,$11,$13,$12,$14;
+var $1,$3,$5,$4,$6,$7,$8,$9,$2,$10,$12,$11,$13;
 $1=$recv(html)._div();
 $recv($1)._class_("btn-group");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2579,8 +2577,7 @@ $3=$recv(html)._button();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["button"]=1;
 //>>excludeEnd("ctx");
-$4=$3;
-$5=$recv($String())._streamContents_((function(str){
+$4=$recv($String())._streamContents_((function(str){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
@@ -2588,8 +2585,8 @@ $recv(str)._nextPutAll_("btn btn-default");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx3.sendIdx["nextPutAll:"]=1;
 //>>excludeEnd("ctx");
-$6=self._showInstance();
-if($core.assert($6)){
+$5=self._showInstance();
+if($core.assert($5)){
 return $recv(str)._nextPutAll_(" active");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx3.sendIdx["nextPutAll:"]=2;
@@ -2602,7 +2599,7 @@ $ctx3.sendIdx["nextPutAll:"]=2;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["streamContents:"]=1;
 //>>excludeEnd("ctx");
-$recv($4)._class_($5);
+$recv($3)._class_($4);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["class:"]=2;
 //>>excludeEnd("ctx");
@@ -2610,7 +2607,7 @@ $recv($3)._with_("Instance");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["with:"]=2;
 //>>excludeEnd("ctx");
-$7=$recv($3)._onClick_((function(){
+$6=$recv($3)._onClick_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
@@ -2625,9 +2622,9 @@ $ctx3.sendIdx["showInstance:"]=1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["onClick:"]=1;
 //>>excludeEnd("ctx");
-$7;
-$8=$recv(html)._button();
-$recv($8)._class_($recv($String())._streamContents_((function(str){
+$6;
+$7=$recv(html)._button();
+$recv($7)._class_($recv($String())._streamContents_((function(str){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
@@ -2635,8 +2632,8 @@ $recv(str)._nextPutAll_("btn btn-default");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx3.sendIdx["nextPutAll:"]=3;
 //>>excludeEnd("ctx");
-$9=self._showClass();
-if($core.assert($9)){
+$8=self._showClass();
+if($core.assert($8)){
 return $recv(str)._nextPutAll_(" active");
 };
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2646,11 +2643,11 @@ return $recv(str)._nextPutAll_(" active");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["class:"]=3;
 //>>excludeEnd("ctx");
-$recv($8)._with_("Class");
+$recv($7)._with_("Class");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["with:"]=3;
 //>>excludeEnd("ctx");
-$10=$recv($8)._onClick_((function(){
+$9=$recv($7)._onClick_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
@@ -2662,7 +2659,7 @@ return self._showInstance_(false);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["onClick:"]=2;
 //>>excludeEnd("ctx");
-return $10;
+return $9;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
@@ -2670,15 +2667,15 @@ return $10;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:"]=1;
 //>>excludeEnd("ctx");
-$11=$recv(html)._label();
-$recv($11)._class_("checkbox");
-$12=$recv($11)._with_((function(){
+$10=$recv(html)._label();
+$recv($10)._class_("checkbox");
+$11=$recv($10)._with_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$13=$recv(html)._input();
-$recv($13)._type_("checkbox");
-checkbox=$recv($13)._onClick_((function(){
+$12=$recv(html)._input();
+$recv($12)._type_("checkbox");
+checkbox=$recv($12)._onClick_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
@@ -2696,8 +2693,8 @@ return $recv(html)._with_("Doc");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:"]=4;
 //>>excludeEnd("ctx");
-$14=self._showComment();
-if($core.assert($14)){
+$13=self._showComment();
+if($core.assert($13)){
 $recv(checkbox)._at_put_("checked","checked");
 };
 return self;
@@ -3710,7 +3707,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$4,$3,$5,$6,$9,$8,$7,$2,$receiver;
+var $1,$4,$3,$5,$8,$7,$6,$2,$receiver;
 $1=$recv(html)._div();
 $recv($1)._class_("inheritance");
 $2=$recv($1)._with_((function(){
@@ -3736,17 +3733,16 @@ $ctx2.sendIdx["with:"]=3;
 //>>excludeEnd("ctx");
 } else {
 $5=$recv(html)._a();
-$6=$5;
-$9=self._selectedItem();
+$8=self._selectedItem();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["selectedItem"]=2;
 //>>excludeEnd("ctx");
-$8=$recv($9)._superclass();
+$7=$recv($8)._superclass();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["superclass"]=2;
 //>>excludeEnd("ctx");
-$7=$recv($8)._name();
-$recv($6)._with_($7);
+$6=$recv($7)._name();
+$recv($5)._with_($6);
 return $recv($5)._onClick_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {

+ 22 - 26
src/Helios-Core.js

@@ -881,7 +881,7 @@ function $HLParseErrorRaised(){return $globals.HLParseErrorRaised||(typeof HLPar
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$3,$2,$4,$6,$7,$8,$5;
+var $1,$3,$2,$4,$6,$7,$5;
 split=$recv($recv(anError)._messageText())._tokenize_(" : ");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["tokenize:"]=1;
@@ -905,12 +905,11 @@ line=$recv(split)._first();
 column=$recv(split)._second();
 $4=self._announcer();
 $6=$recv($HLParseErrorRaised())._new();
-$7=$6;
-$8=$recv(line)._asNumber();
+$7=$recv(line)._asNumber();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["asNumber"]=1;
 //>>excludeEnd("ctx");
-$recv($7)._line_($8);
+$recv($6)._line_($7);
 $recv($6)._column_($recv(column)._asNumber());
 $recv($6)._message_(messageToInsert);
 $recv($6)._error_(anError);
@@ -9958,22 +9957,20 @@ var li;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$4,$6,$5,$7,$8,$9,$10,$11,$12;
+var $1,$2,$4,$3,$5,$6,$7,$8,$9;
 $1=$recv(html)._li();
-$2=$1;
-$3=$recv("width: ".__comma($recv(self._tabWidth())._asString())).__comma("px");
+$2=$recv("width: ".__comma($recv(self._tabWidth())._asString())).__comma("px");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx[","]=1;
 //>>excludeEnd("ctx");
-$recv($2)._style_($3);
-$4=$1;
-$6=$recv(aTab)._isActive();
-if($core.assert($6)){
-$5="tab active";
+$recv($1)._style_($2);
+$4=$recv(aTab)._isActive();
+if($core.assert($4)){
+$3="tab active";
 } else {
-$5="tab inactive";
+$3="tab inactive";
 };
-$recv($4)._class_($5);
+$recv($1)._class_($3);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["class:"]=1;
 //>>excludeEnd("ctx");
@@ -9981,16 +9978,16 @@ $recv($1)._with_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$7=$recv(html)._a();
-$recv($7)._with_((function(){
+$5=$recv(html)._a();
+$recv($5)._with_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
-$8=$recv($recv(html)._tag_("i"))._class_("close");
+$6=$recv($recv(html)._tag_("i"))._class_("close");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx3.sendIdx["class:"]=2;
 //>>excludeEnd("ctx");
-$recv($8)._onClick_((function(){
+$recv($6)._onClick_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx4) {
 //>>excludeEnd("ctx");
@@ -10002,15 +9999,14 @@ return self._removeTab_(aTab);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx3.sendIdx["onClick:"]=1;
 //>>excludeEnd("ctx");
-$9=$recv(html)._span();
-$recv($9)._class_($recv(aTab)._cssClass());
-$10=$9;
-$11=$recv(aTab)._label();
+$7=$recv(html)._span();
+$recv($7)._class_($recv(aTab)._cssClass());
+$8=$recv(aTab)._label();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx3.sendIdx["label"]=1;
 //>>excludeEnd("ctx");
-$recv($10)._title_($11);
-return $recv($9)._with_($recv(aTab)._label());
+$recv($7)._title_($8);
+return $recv($7)._with_($recv(aTab)._label());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx3) {$ctx3.fillBlock({},$ctx2,4)});
 //>>excludeEnd("ctx");
@@ -10018,11 +10014,11 @@ return $recv($9)._with_($recv(aTab)._label());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["with:"]=2;
 //>>excludeEnd("ctx");
-$12=$recv($7)._at_put_("role","tab");
+$9=$recv($5)._at_put_("role","tab");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["at:put:"]=1;
 //>>excludeEnd("ctx");
-return $12;
+return $9;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,3)});
 //>>excludeEnd("ctx");

+ 7 - 9
src/Helios-Debugger.js

@@ -188,27 +188,25 @@ function $HLDebuggerCodeModel(){return $globals.HLDebuggerCodeModel||(typeof HLD
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$5,$6,$7,$8,$4,$receiver;
+var $1,$2,$4,$5,$6,$3,$receiver;
 $1=self["@codeWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
 $2=$recv($HLDebuggerCodeWidget())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
-$3=$2;
-$5=$recv($HLDebuggerCodeModel())._new();
-$6=$5;
-$7=self._model();
+$4=$recv($HLDebuggerCodeModel())._new();
+$5=self._model();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["model"]=1;
 //>>excludeEnd("ctx");
-$recv($6)._debuggerModel_($7);
-$8=$recv($5)._yourself();
+$recv($4)._debuggerModel_($5);
+$6=$recv($4)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["yourself"]=1;
 //>>excludeEnd("ctx");
-$4=$8;
-$recv($3)._model_($4);
+$3=$6;
+$recv($2)._model_($3);
 $recv($2)._browserModel_(self._model());
 self["@codeWidget"]=$recv($2)._yourself();
 return self["@codeWidget"];

+ 3 - 4
src/Helios-Helpers.js

@@ -1643,14 +1643,13 @@ function $HLConfirmationWidget(){return $globals.HLConfirmationWidget||(typeof H
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3;
+var $1,$2;
 $1=$recv($HLConfirmationWidget())._new();
-$2=$1;
-$3=$recv("Commit failed for namespace \x22".__comma($recv($recv(self._package())._transport())._namespace())).__comma("\x22. Do you want to commit to another path?");
+$2=$recv("Commit failed for namespace \x22".__comma($recv($recv(self._package())._transport())._namespace())).__comma("\x22. Do you want to commit to another path?");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx[","]=1;
 //>>excludeEnd("ctx");
-$recv($2)._confirmationString_($3);
+$recv($1)._confirmationString_($2);
 $recv($1)._actionBlock_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {

+ 4 - 5
src/Helios-Inspector.js

@@ -965,15 +965,14 @@ function $HLCodeWidget(){return $globals.HLCodeWidget||(typeof HLCodeWidget=="un
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$4,$3;
+var $1,$3,$2;
 $1=$recv($HLCodeWidget())._new();
-$2=$1;
-$4=self._model();
+$3=self._model();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["model"]=1;
 //>>excludeEnd("ctx");
-$3=$recv($4)._code();
-$recv($2)._model_($3);
+$2=$recv($3)._code();
+$recv($1)._model_($2);
 $recv($1)._receiver_($recv(self._model())._inspectee());
 return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);

+ 50 - 59
src/Helios-KeyBindings.js

@@ -385,43 +385,39 @@ function $HLBindingInput(){return $globals.HLBindingInput||(typeof HLBindingInpu
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$4,$3,$5,$7,$6,$8,$10,$9,$11,$13,$12,$14;
+var $1,$3,$2,$5,$4,$7,$6,$9,$8,$10;
 $1=$recv($HLBindingInput())._new();
-$2=$1;
-$4=self._command();
+$3=self._command();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["command"]=1;
 //>>excludeEnd("ctx");
-$3=$recv($4)._inputLabel();
-$recv($2)._label_($3);
-$5=$1;
-$7=self._command();
+$2=$recv($3)._inputLabel();
+$recv($1)._label_($2);
+$5=self._command();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["command"]=2;
 //>>excludeEnd("ctx");
-$6=$recv($7)._displayLabel();
-$recv($5)._ghostText_($6);
-$8=$1;
-$10=self._command();
+$4=$recv($5)._displayLabel();
+$recv($1)._ghostText_($4);
+$7=self._command();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["command"]=3;
 //>>excludeEnd("ctx");
-$9=$recv($10)._defaultInput();
-$recv($8)._defaultValue_($9);
-$11=$1;
-$13=self._command();
+$6=$recv($7)._defaultInput();
+$recv($1)._defaultValue_($6);
+$9=self._command();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["command"]=4;
 //>>excludeEnd("ctx");
-$12=$recv($13)._inputCompletion();
-$recv($11)._inputCompletion_($12);
+$8=$recv($9)._inputCompletion();
+$recv($1)._inputCompletion_($8);
 $recv($1)._callback_((function(val){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$14=self._command();
-$recv($14)._input_(val);
-return $recv($14)._execute();
+$10=self._command();
+$recv($10)._input_(val);
+return $recv($10)._execute();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({val:val},$ctx1,1)});
 //>>excludeEnd("ctx");
@@ -450,22 +446,20 @@ function $HLBindingActionInputWidget(){return $globals.HLBindingActionInputWidge
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$4,$3,$5,$7,$6;
+var $1,$3,$2,$5,$4;
 $1=$recv($HLBindingActionInputWidget())._new();
-$2=$1;
-$4=self._command();
+$3=self._command();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["command"]=1;
 //>>excludeEnd("ctx");
-$3=$recv($4)._displayLabel();
-$recv($2)._ghostText_($3);
-$5=$1;
-$7=self._command();
+$2=$recv($3)._displayLabel();
+$recv($1)._ghostText_($2);
+$5=self._command();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["command"]=2;
 //>>excludeEnd("ctx");
-$6=$recv($7)._defaultInput();
-$recv($5)._defaultValue_($6);
+$4=$recv($5)._defaultInput();
+$recv($1)._defaultValue_($4);
 $recv($1)._inputCompletion_($recv(self._command())._inputCompletion());
 $recv($1)._callback_((function(value){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1274,7 +1268,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$4,$5,$7,$9,$8,$6,$10,$11,$3,$12,$receiver;
+var $1,$2,$4,$6,$8,$7,$5,$9,$10,$3,$11,$receiver;
 $1=self["@wrapper"];
 if(($receiver = $1) == null || $receiver.isNil){
 self["@wrapper"]=$recv(html)._span();
@@ -1297,19 +1291,18 @@ return $core.withContext(function($ctx2) {
 $4=$recv(html)._input();
 $recv($4)._placeholder_(self._ghostText());
 $recv($4)._value_(self._defaultValue());
-$5=$4;
-$6=$recv((function(event){
+$5=$recv((function(event){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
-$7=$recv($recv(event)._which()).__eq((13));
-if($core.assert($7)){
-$9=$recv(self["@input"])._asJQuery();
+$6=$recv($recv(event)._which()).__eq((13));
+if($core.assert($6)){
+$8=$recv(self["@input"])._asJQuery();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx3.sendIdx["asJQuery"]=1;
 //>>excludeEnd("ctx");
-$8=$recv($9)._val();
-return self._evaluate_($8);
+$7=$recv($8)._val();
+return self._evaluate_($7);
 };
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx3) {$ctx3.fillBlock({event:event},$ctx2,3)});
@@ -1318,17 +1311,17 @@ return self._evaluate_($8);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["yourself"]=1;
 //>>excludeEnd("ctx");
-self["@input"]=$recv($5)._onKeyDown_($6);
+self["@input"]=$recv($4)._onKeyDown_($5);
 self["@input"];
-$10=$recv(self["@input"])._asJQuery();
+$9=$recv(self["@input"])._asJQuery();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["asJQuery"]=2;
 //>>excludeEnd("ctx");
-$recv($10)._typeahead_($globals.HashedCollection._newFromPairs_(["source",self._inputCompletion()]));
-$11=$recv(html)._span();
-$recv($11)._class_("help-inline");
-$recv($11)._with_(self._message());
-self["@messageTag"]=$recv($11)._yourself();
+$recv($9)._typeahead_($globals.HashedCollection._newFromPairs_(["source",self._inputCompletion()]));
+$10=$recv(html)._span();
+$recv($10)._class_("help-inline");
+$recv($10)._with_(self._message());
+self["@messageTag"]=$recv($10)._yourself();
 return self["@messageTag"];
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)});
@@ -1341,9 +1334,9 @@ $recv((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$12=$recv(self["@input"])._asJQuery();
-$recv($12)._focus();
-return $recv($12)._select();
+$11=$recv(self["@input"])._asJQuery();
+$recv($11)._focus();
+return $recv($11)._select();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,5)});
 //>>excludeEnd("ctx");
@@ -1606,21 +1599,20 @@ function $HLOpenCommand(){return $globals.HLOpenCommand||(typeof HLOpenCommand==
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$4,$3;
+var $1,$3,$2;
 $1=$recv($HLBindingGroup())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
-$2=$1;
-$4=$recv($HLCloseTabCommand())._new();
+$3=$recv($HLCloseTabCommand())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=2;
 //>>excludeEnd("ctx");
-$3=$recv($4)._asBinding();
+$2=$recv($3)._asBinding();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["asBinding"]=1;
 //>>excludeEnd("ctx");
-$recv($2)._add_($3);
+$recv($1)._add_($2);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["add:"]=1;
 //>>excludeEnd("ctx");
@@ -2537,17 +2529,16 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$4,$3,$receiver;
+var $1,$3,$2,$receiver;
 $1=$recv(html)._span();
 $recv($1)._class_("selected");
-$2=$1;
-$4=$recv(self._selectedBinding())._label();
-if(($receiver = $4) == null || $receiver.isNil){
-$3="Action";
+$3=$recv(self._selectedBinding())._label();
+if(($receiver = $3) == null || $receiver.isNil){
+$2="Action";
 } else {
-$3=$4;
+$2=$3;
 };
-$recv($2)._with_($3);
+$recv($1)._with_($2);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"renderLabelOn:",{html:html},$globals.HLKeyBinderHelperWidget)});