Przeglądaj źródła

SmalltalkSettings at: 'helios.completionKey'

Herbert Vojčík 11 lat temu
rodzic
commit
d748c5b92e
2 zmienionych plików z 23 dodań i 17 usunięć
  1. 22 16
      js/Helios-Workspace.js
  2. 1 1
      st/Helios-Workspace.st

+ 22 - 16
js/Helios-Workspace.js

@@ -391,38 +391,44 @@ protocol: 'accessing',
 fn: function (){
 var self=this;
 function $SmalltalkSettings(){return globals.SmalltalkSettings||(typeof SmalltalkSettings=="undefined"?nil:SmalltalkSettings)}
+function $HashedCollection(){return globals.HashedCollection||(typeof HashedCollection=="undefined"?nil:HashedCollection)}
 return smalltalk.withContext(function($ctx1) { 
-var $2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$1;
-$2="theme".__minus_gt(_st($SmalltalkSettings())._at_ifAbsent_("helios.codeMirrorTheme",(function(){
+var $3,$2,$4,$5,$6,$7,$8,$9,$10,$11,$12,$1;
+$3=_st($SmalltalkSettings())._at_ifAbsent_("helios.codeMirrorTheme",(function(){
 return smalltalk.withContext(function($ctx2) {
 return "default helios";
-}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})})));
+}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
+$ctx1.sendIdx["at:ifAbsent:"]=1;
+$2="theme".__minus_gt($3);
 $ctx1.sendIdx["->"]=1;
-$3="mode".__minus_gt("text/x-stsrc");
+$4="mode".__minus_gt("text/x-stsrc");
 $ctx1.sendIdx["->"]=2;
-$4="lineNumbers".__minus_gt(true);
+$5="lineNumbers".__minus_gt(true);
 $ctx1.sendIdx["->"]=3;
-$5="enterMode".__minus_gt("flat");
+$6="enterMode".__minus_gt("flat");
 $ctx1.sendIdx["->"]=4;
-$6="indentWithTabs".__minus_gt(true);
+$7="indentWithTabs".__minus_gt(true);
 $ctx1.sendIdx["->"]=5;
-$7="indentUnit".__minus_gt((4));
+$8="indentUnit".__minus_gt((4));
 $ctx1.sendIdx["->"]=6;
-$8="matchBrackets".__minus_gt(true);
+$9="matchBrackets".__minus_gt(true);
 $ctx1.sendIdx["->"]=7;
-$9="electricChars".__minus_gt(false);
+$10="electricChars".__minus_gt(false);
 $ctx1.sendIdx["->"]=8;
-$10="keyMap".__minus_gt("Amber");
+$11="keyMap".__minus_gt("Amber");
 $ctx1.sendIdx["->"]=9;
-$11="extraKeys".__minus_gt(globals.HashedCollection._from_(["Shift-Space".__minus_gt("autocomplete")]));
+$12="extraKeys".__minus_gt(_st($HashedCollection())._with_(_st(_st($SmalltalkSettings())._at_ifAbsent_("helios.completionKey",(function(){
+return smalltalk.withContext(function($ctx2) {
+return "Shift-Space";
+}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}))).__minus_gt("autocomplete")));
 $ctx1.sendIdx["->"]=10;
-$1=globals.HashedCollection._from_([$2,$3,$4,$5,$6,$7,$8,$9,$10,$11]);
+$1=globals.HashedCollection._from_([$2,$4,$5,$6,$7,$8,$9,$10,$11,$12]);
 return $1;
 }, function($ctx1) {$ctx1.fill(self,"editorOptions",{},globals.HLCodeWidget)})},
 args: [],
-source: "editorOptions\x0a\x09^ #{\x0a\x09\x09'theme' -> (SmalltalkSettings at: 'helios.codeMirrorTheme' ifAbsent: [ 'default helios' ]).\x0a\x09\x09'mode' -> 'text/x-stsrc'.\x0a        'lineNumbers' -> true.\x0a        'enterMode' -> 'flat'.\x0a        'indentWithTabs' -> true.\x0a\x09\x09'indentUnit' -> 4.\x0a        'matchBrackets' -> true.\x0a        'electricChars' -> false.\x0a\x09\x09'keyMap' -> 'Amber'.\x0a\x09\x09'extraKeys' -> #{'Shift-Space' -> 'autocomplete'}\x0a\x09}",
-messageSends: ["->", "at:ifAbsent:"],
-referencedClasses: ["SmalltalkSettings"]
+source: "editorOptions\x0a\x09^ #{\x0a\x09\x09'theme' -> (SmalltalkSettings at: 'helios.codeMirrorTheme' ifAbsent: [ 'default helios' ]).\x0a\x09\x09'mode' -> 'text/x-stsrc'.\x0a        'lineNumbers' -> true.\x0a        'enterMode' -> 'flat'.\x0a        'indentWithTabs' -> true.\x0a\x09\x09'indentUnit' -> 4.\x0a        'matchBrackets' -> true.\x0a        'electricChars' -> false.\x0a\x09\x09'keyMap' -> 'Amber'.\x0a\x09\x09'extraKeys' -> (HashedCollection with: (SmalltalkSettings at: 'helios.completionKey' ifAbsent: [ 'Shift-Space' ]) -> 'autocomplete')\x0a\x09}",
+messageSends: ["->", "at:ifAbsent:", "with:"],
+referencedClasses: ["SmalltalkSettings", "HashedCollection"]
 }),
 globals.HLCodeWidget);
 

+ 1 - 1
st/Helios-Workspace.st

@@ -91,7 +91,7 @@ editorOptions
         'matchBrackets' -> true.
         'electricChars' -> false.
 		'keyMap' -> 'Amber'.
-		'extraKeys' -> #{'Shift-Space' -> 'autocomplete'}
+		'extraKeys' -> (HashedCollection with: (SmalltalkSettings at: 'helios.completionKey' ifAbsent: [ 'Shift-Space' ]) -> 'autocomplete')
 	}
 !