resin 0.2.2 → 0.2.3

data/amber/st/Helios-Workspace.st

@@ -0,0 +1,367 @@
+Smalltalk current createPackage: 'Helios-Workspace' properties: #{}!
+Object subclass: #HLCodeModel
+	instanceVariableNames: 'announcer environment receiver'
+	package: 'Helios-Workspace'!
+
+!HLCodeModel methodsFor: 'accessing'!
+
+announcer
+	^ announcer ifNil: [ announcer := Announcer new ]
+!
+
+environment
+	^ environment ifNil: [ HLManager current environment ]
+!
+
+environment: anEnvironment
+	environment := anEnvironment
+!
+
+receiver
+	^ receiver ifNil: [ receiver := self defaultReceiver ]
+!
+
+receiver: anObject
+	receiver := anObject
+! !
+
+!HLCodeModel methodsFor: 'actions'!
+
+doIt: someCode
+
+	^ self environment eval: someCode on: self receiver
+!
+
+subscribe: aWidget
+	aWidget subscribeTo: self announcer
+! !
+
+!HLCodeModel methodsFor: 'defaults'!
+
+defaultReceiver
+	^ DoIt new
+! !
+
+!HLCodeModel class methodsFor: 'actions'!
+
+on: anEnvironment
+
+	^ self new
+    	environment: anEnvironment;
+        yourself
+! !
+
+HLWidget subclass: #HLCodeWidget
+	instanceVariableNames: 'model wrapper code editor'
+	package: 'Helios-Workspace'!
+
+!HLCodeWidget methodsFor: 'accessing'!
+
+announcer
+	^ self model announcer
+!
+
+contents
+	^ editor getValue
+!
+
+contents: aString
+	editor setValue: aString
+!
+
+currentLine
+    ^editor getLine: (editor getCursor line)
+!
+
+currentLineOrSelection
+    ^editor somethingSelected
+		ifFalse: [self currentLine]
+		ifTrue: [self selection]
+!
+
+model
+	^ model ifNil: [ 
+    	self model: HLCodeModel new.
+		model ]
+!
+
+model: aModel
+	model := aModel
+!
+
+receiver
+	^ self model receiver
+!
+
+receiver: anObject
+	self model receiver: anObject
+!
+
+selection
+	^editor getSelection
+!
+
+selectionEnd
+   ^code element selectionEnd
+!
+
+selectionEnd: anInteger
+   code element selectionEnd: anInteger
+!
+
+selectionStart
+   ^code element selectionStart
+!
+
+selectionStart: anInteger
+   code element selectionStart: anInteger
+! !
+
+!HLCodeWidget methodsFor: 'actions'!
+
+clear
+      self contents: ''
+!
+
+doIt
+	| result |
+
+	self announcer announce: (HLDoItRequested on: model).
+
+	result:=  model doIt: self currentLineOrSelection.
+
+	self announcer announce: (HLDoItExecuted on: model).
+
+	^ result
+!
+
+editor
+	^editor
+!
+
+focus
+      self editor focus
+!
+
+inspectIt
+
+	| newInspector |
+       
+	self announcer announce: (HLInspectItRequested on: model).
+	newInspector := self makeInspectorOn: self doIt.
+	newInspector open
+!
+
+makeInspectorOn: anObject
+
+	^ HLInspector new 
+		inspect: anObject;
+		yourself
+!
+
+observeWrapper
+
+    wrapper onKeyDown: [ :e | self onKeyDown: e ]
+!
+
+print: aString
+	| start stop |
+	start := HashedCollection new.
+	stop := HashedCollection new.
+	start at: 'line' put: (editor getCursor: false) line.
+	start at: 'ch' put: (editor getCursor: false) ch.
+	stop at: 'line' put: (start at: 'line').
+	stop at: 'ch' put: ((start at: 'ch') + aString size + 2).
+	editor replaceSelection: (editor getSelection, ' ', aString, ' ').
+	editor setCursor: (editor getCursor: true).
+	editor setSelection: stop end: start
+!
+
+printIt
+
+	| result |
+
+	result:=  self doIt.
+       
+	self announcer announce: (HLPrintItRequested on: model).
+
+    self print: result printString.
+	self focus.
+!
+
+setEditorOn: aTextarea
+	<self['@editor'] = CodeMirror.fromTextArea(aTextarea, {
+		theme: 'amber',
+                lineNumbers: true,
+                enterMode: 'flat',
+                matchBrackets: true,
+                electricChars: false
+	})>
+! !
+
+!HLCodeWidget methodsFor: 'reactions'!
+
+onDoIt
+	
+    self doIt
+!
+
+onInspectIt
+
+	self inspectIt
+!
+
+onKeyDown: anEvent
+
+    <if(anEvent.ctrlKey) {
+		if(anEvent.keyCode === 80) { //ctrl+p
+			self._onPrintIt();
+			anEvent.preventDefault();
+			return false;
+		}
+		if(anEvent.keyCode === 68) { //ctrl+d
+			self._onDoIt();
+			anEvent.preventDefault();
+			return false;
+		}
+		if(anEvent.keyCode === 73) { //ctrl+i
+			self._onInspectIt();
+			anEvent.preventDefault();
+			return false;
+		}
+	}>
+!
+
+onPrintIt
+
+	self printIt
+! !
+
+!HLCodeWidget methodsFor: 'rendering'!
+
+renderContentOn: html
+    code := html textarea.
+    self setEditorOn: code element.
+    
+    self observeWrapper
+! !
+
+HLWidget subclass: #HLWorkspace
+	instanceVariableNames: 'model codeWidget'
+	package: 'Helios-Workspace'!
+
+!HLWorkspace methodsFor: 'accessing'!
+
+codeWidget
+	^ codeWidget ifNil: [
+		codeWidget := HLCodeWidget new
+    		model: self model code;
+        	yourself ]
+!
+
+model
+	^ model ifNil: [ 
+    	self model: HLWorkspaceModel new.
+		model ]
+!
+
+model: aModel
+	model := aModel.
+     
+    self codeWidget model: aModel code.
+    self observeCodeWidget.
+! !
+
+!HLWorkspace methodsFor: 'actions'!
+
+observeCodeWidget
+! !
+
+!HLWorkspace methodsFor: 'reactions'!
+
+onDoIt
+!
+
+onInspectIt
+!
+
+onPrintIt
+! !
+
+!HLWorkspace methodsFor: 'rendering'!
+
+renderContentOn: html
+	html with: self codeWidget
+! !
+
+!HLWorkspace class methodsFor: 'accessing'!
+
+tabLabel
+	^ 'Workspace'
+!
+
+tabPriority
+	^ 10
+! !
+
+!HLWorkspace class methodsFor: 'testing'!
+
+canBeOpenAsTab
+	^ true
+! !
+
+Object subclass: #HLWorkspaceModel
+	instanceVariableNames: 'announcer environment code'
+	package: 'Helios-Workspace'!
+
+!HLWorkspaceModel methodsFor: 'accessing'!
+
+announcer
+	^ announcer ifNil: [ announcer := Announcer new ]
+!
+
+code
+	"Answers the code model working for this workspace model"
+	^ code ifNil:[ HLCodeModel on: self environment ]
+!
+
+environment
+	^ environment ifNil: [ HLManager current environment ]
+!
+
+environment: anEnvironment
+	environment := anEnvironment
+! !
+
+!HLWorkspaceModel methodsFor: 'reactions'!
+
+onKeyDown: anEvent
+
+	<if(anEvent.ctrlKey) {
+		if(anEvent.keyCode === 80) { //ctrl+p
+			self._printIt();
+			anEvent.preventDefault();
+			return false;
+		}
+		if(anEvent.keyCode === 68) { //ctrl+d
+			self._doIt();
+			anEvent.preventDefault();
+			return false;
+		}
+		if(anEvent.keyCode === 73) { //ctrl+i
+			self._inspectIt();
+			anEvent.preventDefault();
+			return false;
+		}
+	}>
+! !
+
+!HLWorkspaceModel class methodsFor: 'actions'!
+
+on: anEnvironment
+
+	^ self new
+    	environment: anEnvironment;
+        yourself
+! !
+

data/amber/st/IDE.st

@@ -43,7 +43,7 @@ resetNodes
 
 renderOn: html
 	ul := html ul
-		class: 'jt_column browser classes';
+		class: 'amber_column browser classes';
 		yourself.
 	self updateNodes
 !
@@ -226,7 +226,7 @@ selectionStart: anInteger
 
 setEditorOn: aTextarea
 	<self['@editor'] = CodeMirror.fromTextArea(aTextarea, {
-		theme: 'jtalk',
+		theme: 'amber',
                 lineNumbers: true,
                 enterMode: 'flat',
                 matchBrackets: true,
@@ -267,6 +267,10 @@ fileIn
     Importer new import: self currentLineOrSelection readStream
 !
 
+focus
+      self editor focus.
+!
+
 handleKeyDown: anEvent
     <if(anEvent.ctrlKey) {
 		if(anEvent.keyCode === 80) { //ctrl+p
@@ -305,7 +309,8 @@ print: aString
 !
 
 printIt
-    self print: self doIt printString
+    self print: self doIt printString.
+	self focus.
 ! !
 
 !SourceArea methodsFor: 'events'!
@@ -351,11 +356,11 @@ tabs
 
 close
     opened ifTrue: [
-	'#jtalk' asJQuery hide.
+	'#amber' asJQuery hide.
 	ul asJQuery hide.
 	selectedTab hide.
 	self removeBodyMargin.
-	'body' asJQuery removeClass: 'jtalkBody'.
+	'body' asJQuery removeClass: 'amberBody'.
 	opened := false]
 !
 
@@ -371,7 +376,7 @@ newBrowserTab
 !
 
 onResize: aBlock
-    <jQuery('#jtalk').resizable({
+    <jQuery('#amber').resizable({
 	handles: 'n', 
 	resize: aBlock,
 	minHeight: 230
@@ -384,8 +389,8 @@ onWindowResize: aBlock
 
 open
     opened ifFalse: [
-	'body' asJQuery addClass: 'jtalkBody'.
-	'#jtalk' asJQuery show.
+	'body' asJQuery addClass: 'amberBody'.
+	'#amber' asJQuery show.
 	ul asJQuery show.
 	self updateBodyMargin.
 	selectedTab show.
@@ -415,22 +420,22 @@ selectTab: aWidget
 !
 
 setBodyMargin: anInteger
-    '.jtalkBody' asJQuery css: 'margin-bottom' put: anInteger asString, 'px'
+    '.amberBody' asJQuery css: 'margin-bottom' put: anInteger asString, 'px'
 !
 
 updateBodyMargin
-    self setBodyMargin: '#jtalk' asJQuery height
+    self setBodyMargin: '#amber' asJQuery height
 !
 
 updatePosition
-    <jQuery('#jtalk').css('top', '').css('bottom', '0px')>
+    <jQuery('#amber').css('top', '').css('bottom', '0px')>
 ! !
 
 !TabManager methodsFor: 'adding/Removing'!
 
 addTab: aWidget
     self tabs add: aWidget.
-    aWidget appendToJQuery: '#jtalk' asJQuery.
+    aWidget appendToJQuery: '#amber' asJQuery.
     aWidget hide
 !
 
@@ -444,10 +449,10 @@ removeTab: aWidget
 initialize
     super initialize.
     opened := true.
-    [:html | html div id: 'jtalk'] appendToJQuery: 'body' asJQuery.
+    [:html | html div id: 'amber'] appendToJQuery: 'body' asJQuery.
     'body' asJQuery 
-	addClass: 'jtalkBody'.
-    self appendToJQuery: '#jtalk' asJQuery.
+	addClass: 'amberBody'.
+    self appendToJQuery: '#amber' asJQuery.
     self 
 	addTab: IDETranscript current;
 	addTab: Workspace new;
@@ -464,7 +469,7 @@ renderOn: html
 	html div id: 'logo'.
 	self renderToolbarOn: html.
 	ul := html ul
-		id: 'jtalkTabs';
+		id: 'amberTabs';
 		yourself.
 	self renderTabs
 !
@@ -504,7 +509,7 @@ renderTabs
 
 renderToolbarOn: html
 	html div 
-		id: 'jt_toolbar';
+		id: 'amber_toolbar';
 		with: [
 			input := html input 
 				class: 'implementors';
@@ -512,7 +517,7 @@ renderToolbarOn: html
 			input onKeyPress: [:event |
 				event keyCode = 13 ifTrue: [
 				self search: input asJQuery val]].
-			html div id: 'jt_close'; onClick: [self close]]
+			html div id: 'amber_close'; onClick: [self close]]
 ! !
 
 !TabManager methodsFor: 'updating'!
@@ -576,7 +581,7 @@ renderButtonsOn: html
 
 renderOn: html
 	div := html div
-		class: 'jtalkTool';
+		class: 'amberTool';
 		yourself.
 	self renderTab
 !
@@ -584,10 +589,10 @@ renderOn: html
 renderTab
 	div contents: [:html |
 	    html div
-		class: 'jt_box';
+		class: 'amber_box';
 		with: [self renderBoxOn: html].
 	    html div
-		class: 'jt_buttons';
+		class: 'amber_buttons';
 		with: [self renderButtonsOn: html]]
 !
 
@@ -797,7 +802,9 @@ commitPackage
 !
 
 compile
+    | currentEditLine |
     self disableSaveButton.
+    currentEditLine := sourceArea editor getCursor.
     selectedTab = #comment 
 	ifTrue: [
 			selectedClass ifNotNil: [
@@ -805,7 +812,8 @@ compile
 	ifFalse: [
 			(selectedProtocol notNil or: [selectedMethod notNil])
 				ifFalse: [self compileDefinition]
-				ifTrue: [self compileMethodDefinition]]
+				ifTrue: [self compileMethodDefinition]].
+    sourceArea editor setCursor: currentEditLine.
 !
 
 compileClassComment
@@ -1045,7 +1053,7 @@ ajaxPutAt: anURL data: aString
 
 renderBottomPanelOn: html
     html div
-	class: 'jt_sourceCode';
+	class: 'amber_sourceCode';
 	with: [
 	    sourceArea := SourceArea new.
 	    sourceArea renderOn: html.
@@ -1083,7 +1091,7 @@ renderButtonsOn: html
 !
 
 renderTabsOn: html
-    tabsList := html ul class: 'jt_tabs jt_browser'.
+    tabsList := html ul class: 'amber_tabs amber_browser'.
     self updateTabsList.
 !
 
@@ -1091,8 +1099,8 @@ renderTopPanelOn: html
 	html div 
 		class: 'top'; 
 		with: [
-			packagesList := html ul class: 'jt_column browser packages'.
-          		html div class: 'jt_packagesButtons'; with: [
+			packagesList := html ul class: 'amber_column browser packages'.
+          		html div class: 'amber_packagesButtons'; with: [
 				html button 
 					title: 'Commit classes in this package to disk';
 					onClick: [self commitPackage];
@@ -1107,14 +1115,14 @@ renderTopPanelOn: html
 					with: 'Remove'].
 			classesList := ClassesList on: self.
 			classesList renderOn: html.
-			protocolsList := html ul class: 'jt_column browser protocols'.
-			methodsList := html ul class: 'jt_column browser methods'.
+			protocolsList := html ul class: 'amber_column browser protocols'.
+			methodsList := html ul class: 'amber_column browser methods'.
 			self
 				updateCategoriesList;
 				updateClassesList;
 				updateProtocolsList;
 				updateMethodsList.
-			html div class: 'jt_clear']
+			html div class: 'amber_clear']
 ! !
 
 !Browser methodsFor: 'testing'!
@@ -1171,6 +1179,8 @@ updateProtocolsList
 !
 
 updateSourceAndButtons
+	| currentProtocol |
+
 	self disableSaveButton.
 	classButtons contents: [:html |
 		html button
@@ -1203,9 +1213,12 @@ updateSourceAndButtons
 				html option
 					class: 'important';
 					with: 'New...'.
+                currentProtocol := selectedProtocol.
+                (currentProtocol isNil and: [ selectedMethod notNil ])
+                	ifTrue: [ currentProtocol := selectedMethod category].
 				self protocols do: [:each |
 					option := html option with: each.
-					selectedProtocol = each ifTrue: [ option at: 'selected' put: 'selected' ] ]].
+					currentProtocol = each ifTrue: [ option at: 'selected' put: 'selected' ] ]].
 		selectedMethod isNil ifFalse: [
 			referencesSelect := html select.
                         referencesSelect
@@ -1380,12 +1393,12 @@ initialize
 
 renderBottomPanelOn: html
 	html div
-		class: 'jt_sourceCode debugger';
+		class: 'amber_sourceCode debugger';
 		with: [
 			sourceArea := SourceArea new.
 			sourceArea renderOn: html].
-	ul2 := html ul class: 'jt_column debugger variables'.
-	inspector := html div class: 'jt_column debugger inspector'.
+	ul2 := html ul class: 'amber_column debugger variables'.
+	inspector := html div class: 'amber_column debugger inspector'.
 	sourceArea
 		onKeyUp: [self updateStatus]
 !
@@ -1416,7 +1429,7 @@ renderButtonsOn: html
 		with: 'Abandon';
 		onClick: [self close].
 	inspectButton := html button
-		class: 'jt_button debugger inspect';
+		class: 'amber_button debugger inspect';
 		with: 'Inspect';
 		onClick: [self inspectSelectedVariable].
 	 self 
@@ -1446,7 +1459,7 @@ renderTopPanelOn: html
 				class: 'label';
 				with: self error messageText.
 			ul := html ul 
-				class: 'jt_column debugger contexts';
+				class: 'amber_column debugger contexts';
 				with: [self renderContext: self error context on: html]]
 ! !
 
@@ -1543,7 +1556,7 @@ show: anObject
 renderBoxOn: html
     textarea := html textarea.
     textarea 
-	class: 'jt_transcript';
+	class: 'amber_transcript';
 	at: 'spellcheck' put: 'false'
 !
 
@@ -1634,7 +1647,7 @@ refresh
 
 renderBottomPanelOn: html
     html div
-	class: 'jt_sourceCode';
+	class: 'amber_sourceCode';
 	with: [
 	    sourceArea := SourceArea new
 		receiver: object;
@@ -1666,18 +1679,18 @@ renderTopPanelOn: html
 	html div 
 		class: 'top'; 
 		with: [
-			variablesList := html ul class: 'jt_column variables'.
-			valueTextarea := html textarea class: 'jt_column value'; at: 'readonly' put: 'readonly'.
-			html div class: 'jt_tabs inspector'; with: [
+			variablesList := html ul class: 'amber_column variables'.
+			valueTextarea := html textarea class: 'amber_column value'; at: 'readonly' put: 'readonly'.
+			html div class: 'amber_tabs inspector'; with: [
 				html button
-					class: 'jt_button inspector refresh';
+					class: 'amber_button inspector refresh';
 					with: 'Refresh';
 					onClick: [self refresh].
 				diveButton := html button 
-					class: 'jt_button inspector dive';
+					class: 'amber_button inspector dive';
 					with: 'Dive'; 
 					onClick: [self dive]].
-			html div class: 'jt_clear'].
+			html div class: 'amber_clear'].
 	self
 		updateVariablesList;
 		updateValueTextarea.
@@ -1885,7 +1898,7 @@ renderBoxOn: html
 !
 
 renderImplementorsOn: html
-	implementorsList := html ul class: 'jt_column implementors'.
+	implementorsList := html ul class: 'amber_column implementors'.
 	self updateImplementorsList
 !
 
@@ -1898,17 +1911,17 @@ renderInputOn: html
 !
 
 renderMatchesOn: html
-	matchesList := html ul class: 'jt_column matches'.
+	matchesList := html ul class: 'amber_column matches'.
 	self updateMatchesList
 !
 
 renderReferencedClassesOn: html
-	referencedClassesList := html ul class: 'jt_column referenced_classes'.
+	referencedClassesList := html ul class: 'amber_column referenced_classes'.
 	self updateReferencedClassesList
 !
 
 renderSendersOn: html
-	sendersList := html ul class: 'jt_column senders'.
+	sendersList := html ul class: 'amber_column senders'.
 	self updateSendersList
 ! !
 
@@ -1985,7 +1998,7 @@ TabWidget subclass: #TestRunner
 !TestRunner methodsFor: 'accessing'!
 
 allClasses
-	^TestCase allSubclasses
+	^TestCase allSubclasses select: [ :each | each isAbstract not ]
 !
 
 classes
@@ -2030,14 +2043,18 @@ statusInfo
 testCases
 	| testCases |
 	testCases := #().
-	self selectedClasses do: [:each | testCases addAll: each buildSuite].
+	(self selectedClasses
+		select: [:each | self selectedCategories includes: each category])
+		do: [:each | testCases addAll: each buildSuite].
 	^testCases
 ! !
 
 !TestRunner methodsFor: 'actions'!
 
 performFailure: aTestCase
-	aTestCase perform: aTestCase selector
+	aTestCase setUp.
+    [ aTestCase perform: aTestCase selector ]
+  		ensure: [ aTestCase tearDown ]
 !
 
 run: aCollection
@@ -2130,12 +2147,12 @@ renderButtonsOn: html
 !
 
 renderCategoriesOn: html
-	packagesList := html ul class: 'jt_column sunit packages'.
+	packagesList := html ul class: 'amber_column sunit packages'.
 	self updateCategoriesList
 !
 
 renderClassesOn: html
-	classesList := html ul class: 'jt_column sunit classes'.
+	classesList := html ul class: 'amber_column sunit classes'.
 	self updateClassesList
 !
 
@@ -2158,7 +2175,7 @@ renderFailuresOn: html
 renderResultsOn: html
 	statusDiv := html div.
 	html with: self progressBar.
-	methodsList := html ul class: 'jt_column sunit results'.
+	methodsList := html ul class: 'amber_column sunit results'.
 	self updateMethodsList.
 	self updateStatusDiv
 ! !
@@ -2248,6 +2265,11 @@ inspectIt
 
 printIt
 	sourceArea printIt
+!
+
+show
+	super show.
+	sourceArea focus.
 ! !
 
 !Workspace methodsFor: 'rendering'!