Browse Source

Merge branch 'master' into helios

Nicolas Petton 11 years ago
parent
commit
a150e5041b
6 changed files with 51 additions and 1 deletions
  1. 1 0
      js/IDE.deploy.js
  2. 2 1
      js/IDE.js
  3. 18 0
      js/Kernel-Classes.deploy.js
  4. 23 0
      js/Kernel-Classes.js
  5. 1 0
      st/IDE.st
  6. 6 0
      st/Kernel-Classes.st

+ 1 - 0
js/IDE.deploy.js

@@ -677,6 +677,7 @@ return smalltalk.withContext(function($ctx1) { 
self['@editor'] = CodeMirror.fro
                 lineNumbers: true,
                 enterMode: 'flat',
                 indentWithTabs: true,
+				indentUnit: 4,
                 matchBrackets: true,
                 electricChars: false
 	});

+ 2 - 1
js/IDE.js

@@ -888,12 +888,13 @@ return smalltalk.withContext(function($ctx1) { 
self['@editor'] = CodeMirror.fro
                 lineNumbers: true,
                 enterMode: 'flat',
                 indentWithTabs: true,
+				indentUnit: 4,
                 matchBrackets: true,
                 electricChars: false
 	});
 return self}, function($ctx1) {$ctx1.fill(self,"setEditorOn:",{aTextarea:aTextarea}, smalltalk.SourceArea)})},
 args: ["aTextarea"],
-source: "setEditorOn: aTextarea\x0a\x09<self['@editor'] = CodeMirror.fromTextArea(aTextarea, {\x0a\x09\x09theme: 'amber',\x0a                lineNumbers: true,\x0a                enterMode: 'flat',\x0a                indentWithTabs: true,\x0a                matchBrackets: true,\x0a                electricChars: false\x0a\x09})>",
+source: "setEditorOn: aTextarea\x0a\x09<self['@editor'] = CodeMirror.fromTextArea(aTextarea, {\x0a\x09\x09theme: 'amber',\x0a                lineNumbers: true,\x0a                enterMode: 'flat',\x0a                indentWithTabs: true,\x0a\x09\x09\x09\x09indentUnit: 4,\x0a                matchBrackets: true,\x0a                electricChars: false\x0a\x09})>",
 messageSends: [],
 referencedClasses: []
 }),

+ 18 - 0
js/Kernel-Classes.deploy.js

@@ -55,6 +55,24 @@ return $2;
 messageSends: ["copy", "instanceVariableNames", "ifNotNil:", "addAll:", "allInstanceVariableNames", "superclass"]}),
 smalltalk.Behavior);
 
+smalltalk.addMethod(
+"_allSelectors",
+smalltalk.method({
+selector: "allSelectors",
+fn: function (){
+var self=this;
+return smalltalk.withContext(function($ctx1) { 
var $2,$3,$1;
+$1=_st(_st(self)._allSuperclasses())._inject_into_(_st(self)._selectors(),(function(soFar,aBehavior){
+return smalltalk.withContext(function($ctx2) {
$2=soFar;
+_st($2)._addAll_(_st(aBehavior)._selectors());
+$3=_st($2)._yourself();
+return $3;
+}, function($ctx2) {$ctx2.fillBlock({soFar:soFar,aBehavior:aBehavior},$ctx1)})}));
+return $1;
+}, function($ctx1) {$ctx1.fill(self,"allSelectors",{}, smalltalk.Behavior)})},
+messageSends: ["inject:into:", "selectors", "addAll:", "yourself", "allSuperclasses"]}),
+smalltalk.Behavior);
+
 smalltalk.addMethod(
 "_allSubclasses",
 smalltalk.method({

+ 23 - 0
js/Kernel-Classes.js

@@ -66,6 +66,29 @@ referencedClasses: []
 }),
 smalltalk.Behavior);
 
+smalltalk.addMethod(
+"_allSelectors",
+smalltalk.method({
+selector: "allSelectors",
+category: 'accessing',
+fn: function (){
+var self=this;
+return smalltalk.withContext(function($ctx1) { 
var $2,$3,$1;
+$1=_st(_st(self)._allSuperclasses())._inject_into_(_st(self)._selectors(),(function(soFar,aBehavior){
+return smalltalk.withContext(function($ctx2) {
$2=soFar;
+_st($2)._addAll_(_st(aBehavior)._selectors());
+$3=_st($2)._yourself();
+return $3;
+}, function($ctx2) {$ctx2.fillBlock({soFar:soFar,aBehavior:aBehavior},$ctx1)})}));
+return $1;
+}, function($ctx1) {$ctx1.fill(self,"allSelectors",{}, smalltalk.Behavior)})},
+args: [],
+source: "allSelectors\x0a\x09^self allSuperclasses\x0a\x09\x09inject: self selectors\x0a\x09\x09into: [ :soFar :aBehavior | soFar addAll: aBehavior selectors; yourself ]",
+messageSends: ["inject:into:", "selectors", "addAll:", "yourself", "allSuperclasses"],
+referencedClasses: []
+}),
+smalltalk.Behavior);
+
 smalltalk.addMethod(
 "_allSubclasses",
 smalltalk.method({

+ 1 - 0
st/IDE.st

@@ -214,6 +214,7 @@ setEditorOn: aTextarea
                 lineNumbers: true,
                 enterMode: 'flat',
                 indentWithTabs: true,
+				indentUnit: 4,
                 matchBrackets: true,
                 electricChars: false
 	})>

+ 6 - 0
st/Kernel-Classes.st

@@ -21,6 +21,12 @@ allInstanceVariableNames
 	^result
 !
 
+allSelectors
+	^self allSuperclasses
+		inject: self selectors
+		into: [ :soFar :aBehavior | soFar addAll: aBehavior selectors; yourself ]
+!
+
 allSubclasses
 	| result |
 	result := self subclasses.