resin 0.0.1 → 0.0.2

data/amber/st/IDE.st

@@ -1,207 +1,331 @@
 Smalltalk current createPackage: 'IDE' properties: #{}!
-Widget subclass: #TabManager
-	instanceVariableNames: 'selectedTab tabs opened ul input'
+ErrorHandler subclass: #DebugErrorHandler
+	instanceVariableNames: ''
 	category: 'IDE'!
 
-!TabManager methodsFor: 'accessing'!
+!DebugErrorHandler methodsFor: 'error handling'!
 
-tabs
-    ^tabs ifNil: [tabs := Array new]
-!
+handleError: anError
+	[Debugger new
+		error: anError;
+		open] on: Error do: [:error |
+			ErrorHandler new handleError: error]
+! !
 
-labelFor: aWidget
-	| label maxSize |
-	maxSize := 15.
-	label := aWidget label copyFrom: 0 to: (aWidget label size min: maxSize).
-	aWidget label size > maxSize ifTrue: [
-		label := label, '...'].
-	^label
+!DebugErrorHandler class methodsFor: 'initialization'!
+
+initialize
+	self register
 ! !
 
-!TabManager methodsFor: 'actions'!
+Widget subclass: #ClassesListNode
+	instanceVariableNames: 'browser theClass level nodes'
+	category: 'IDE'!
 
-updateBodyMargin
-    self setBodyMargin: '#jtalk' asJQuery height
-!
+!ClassesListNode methodsFor: ''!
 
-updatePosition
-    <jQuery('#jtalk').css('top', '').css('bottom', '0px')>
-!
+renderOn: html
+	| li cssClass |
+	cssClass := ''.
+	li := html li 
+		onClick: [self browser selectClass: self theClass]. 
+	li asJQuery html: self label.
 
-removeBodyMargin
-    self setBodyMargin: 0
-!
+	self browser selectedClass = self theClass ifTrue:  [
+		cssClass := cssClass, ' selected'].
 
-setBodyMargin: anInteger
-    '.jtalkBody' asJQuery css: 'margin-bottom' put: anInteger asString, 'px'
-!
+	self theClass comment isEmpty ifFalse: [
+		cssClass := cssClass, ' commented'].
 
-onResize: aBlock
-    <jQuery('#jtalk').resizable({
-	handles: 'n', 
-	resize: aBlock,
-	minHeight: 230
-})>
-!
+	li class: cssClass.
 
-onWindowResize: aBlock
-    <jQuery(window).resize(aBlock)>
-!
+	self nodes do: [:each |
+		each renderOn: html]
+! !
 
-open
-    opened ifFalse: [
-	'body' asJQuery addClass: 'jtalkBody'.
-	'#jtalk' asJQuery show.
-	ul asJQuery show.
-	self updateBodyMargin.
-	selectedTab show.
-	opened := true]
+!ClassesListNode methodsFor: 'accessing'!
+
+nodes
+	^nodes
 !
 
-close
-    opened ifTrue: [
-	'#jtalk' asJQuery hide.
-	ul asJQuery hide.
-	selectedTab hide.
-	self removeBodyMargin.
-	'body' asJQuery removeClass: 'jtalkBody'.
-	opened := false]
+theClass
+	^theClass
 !
 
-newBrowserTab
-    Browser open
+theClass: aClass
+	theClass := aClass
 !
 
-selectTab: aWidget
-    self open.
-    selectedTab := aWidget.
-    self tabs do: [:each |
-	each hide].
-    aWidget show.
-	
-    self update
+browser
+	^browser
 !
 
-closeTab: aWidget
-    self removeTab: aWidget.
-    self selectTab: self tabs last.
-    aWidget remove.
-    self update
+browser: aBrowser
+	browser := aBrowser
 !
 
-search: aString
-	| searchedClass |
-	searchedClass := Smalltalk current at: aString.
-		searchedClass isClass
-			ifTrue: [Browser openOn: searchedClass]
-			ifFalse: [ReferencesBrowser search: aString]
-! !
+level
+	^level
+!
 
-!TabManager methodsFor: 'adding/Removing'!
+level: anInteger
+	level := anInteger
+!
 
-addTab: aWidget
-    self tabs add: aWidget.
-    aWidget appendToJQuery: '#jtalk' asJQuery.
-    aWidget hide
+label
+	| str |
+	str := String new writeStream.
+	self level timesRepeat: [
+		str nextPutAll: '&nbsp;&nbsp;&nbsp;&nbsp;'].
+	str nextPutAll: self theClass name.
+	^str contents
 !
 
-removeTab: aWidget
-    self tabs remove: aWidget.
-    self update
+getNodesFrom: aCollection
+	| children others |
+	children := #().
+	others := #().
+	aCollection do: [:each |
+		(each superclass = self theClass)
+			ifTrue: [children add: each]
+			ifFalse: [others add: each]].
+	nodes:= children collect: [:each |
+		ClassesListNode on: each browser: self browser classes: others level: self level + 1]
 ! !
 
-!TabManager methodsFor: 'initialization'!
+!ClassesListNode class methodsFor: 'instance creation'!
 
-initialize
-    super initialize.
-    opened := true.
-    [:html | html div id: 'jtalk'] appendToJQuery: 'body' asJQuery.
-    'body' asJQuery 
-	addClass: 'jtalkBody'.
-    self appendToJQuery: '#jtalk' asJQuery.
-    self 
-	addTab: IDETranscript current;
-	addTab: Workspace new;
-	addTab: TestRunner new.
-    self selectTab: self tabs last.
-    self 
-	onResize: [self updateBodyMargin; updatePosition];
-	onWindowResize: [self updatePosition]
+on: aClass browser: aBrowser classes: aCollection level: anInteger
+	^self new
+		theClass: aClass;
+		browser: aBrowser;
+		level: anInteger;
+		getNodesFrom: aCollection;
+		yourself
 ! !
 
-!TabManager methodsFor: 'rendering'!
+Widget subclass: #ClassesList
+	instanceVariableNames: 'browser ul nodes'
+	category: 'IDE'!
 
-renderOn: html
-	html div id: 'logo'.
-	self renderToolbarOn: html.
-	ul := html ul
-		id: 'jtalkTabs';
-		yourself.
-	self renderTabs
+!ClassesList methodsFor: 'accessing'!
+
+category
+	^self browser selectedPackage
 !
 
-renderTabFor: aWidget on: html
-	| li |
-	li := html li.
-	selectedTab = aWidget ifTrue: [
-	li class: 'selected'].
-	li with: [
-		html span class: 'ltab'.
-		html span
-			class: 'mtab';
-			with: [
-				aWidget canBeClosed ifTrue: [
-					html span 
-						class: 'close';
-						with: 'x';
-					onClick: [self closeTab: aWidget]].
-			html span with: (self labelFor: aWidget)].
-		html span class: 'rtab'];
-	onClick: [self selectTab: aWidget]
+nodes
+	nodes ifNil: [nodes := self getNodes].
+	^nodes
 !
 
-renderTabs
-	ul contents: [:html |
-	    self tabs do: [:each |
-		self renderTabFor: each on: html].
-	    html li
-		class: 'newtab';
-		with: [
-			html span class: 'ltab'.
-			html span class: 'mtab'; with: ' + '.
-			html span class: 'rtab'];
-		onClick: [self newBrowserTab]]
+browser
+	^browser
 !
 
-renderToolbarOn: html
-	html div 
-		id: 'jt_toolbar';
-		with: [
-			input := html input 
-				class: 'implementors';
-				yourself.
-			input onKeyPress: [:event |
-				event keyCode = 13 ifTrue: [
-				self search: input asJQuery val]].
-			html div id: 'jt_close'; onClick: [self close]]
-! !
+browser: aBrowser
+	browser := aBrowser
+!
 
-!TabManager methodsFor: 'updating'!
+getNodes
+	| classes children others |
+	classes := self browser classes.
+	children := #().
+	others := #().
+	classes do: [:each |
+		(classes includes: each superclass)
+			ifFalse: [children add: each]
+			ifTrue: [others add: each]].
+	^children collect: [:each |
+		ClassesListNode on: each browser: self browser classes: others level: 0]
+!
 
-update
-	self renderTabs
+resetNodes
+	nodes := nil
 ! !
 
-TabManager class instanceVariableNames: 'current'!
+!ClassesList methodsFor: 'rendering'!
 
-!TabManager class methodsFor: 'instance creation'!
+renderOn: html
+	ul := html ul
+		class: 'jt_column browser classes';
+		yourself.
+	self updateNodes
+!
 
-current
-    ^current ifNil: [current := super new]
+updateNodes
+	ul contents: [:html |
+		self nodes do: [:each |
+			each renderOn: html]]
+! !
+
+!ClassesList class methodsFor: 'instance creation'!
+
+on: aBrowser
+	^self new 
+		browser: aBrowser; 
+		yourself
+! !
+
+Widget subclass: #SourceArea
+	instanceVariableNames: 'editor div receiver onDoIt'
+	category: 'IDE'!
+
+!SourceArea methodsFor: 'accessing'!
+
+val
+    ^editor getValue
 !
 
-new
-    self shouldNotImplement
+val: aString
+    editor setValue: aString
+!
+
+currentLine
+    ^editor getLine: (editor getCursor line)
+!
+
+selection
+	^editor getSelection
+!
+
+selectionEnd
+   ^textarea element selectionEnd
+!
+
+selectionStart
+   ^textarea element selectionStart
+!
+
+selectionStart: anInteger
+   textarea element selectionStart: anInteger
+!
+
+selectionEnd: anInteger
+   textarea element selectionEnd: anInteger
+!
+
+setEditorOn: aTextarea
+	<self['@editor'] = CodeMirror.fromTextArea(aTextarea, {
+		theme: 'jtalk',
+                lineNumbers: true,
+                enterMode: 'flat',
+                matchBrackets: true,
+                electricChars: false
+	})>
+!
+
+editor
+	^editor
+!
+
+receiver
+	^receiver ifNil: [DoIt new]
+!
+
+receiver: anObject
+	receiver := anObject
+!
+
+onDoIt: aBlock
+	onDoIt := aBlock
+!
+
+onDoIt
+	^onDoIt
+!
+
+currentLineOrSelection
+    ^editor somethingSelected
+	ifFalse: [self currentLine]
+	ifTrue: [self selection]
+! !
+
+!SourceArea methodsFor: 'actions'!
+
+clear
+      self val: ''
+!
+
+doIt
+    | result |
+    result := self eval: self currentLineOrSelection.
+    self onDoIt ifNotNil: [self onDoIt value].
+    ^result
+!
+
+eval: aString
+	| compiler  |
+	compiler := Compiler new.
+	[compiler parseExpression: aString] on: Error do: [:ex |
+		^window alert: ex messageText].
+	^(compiler load: 'doIt ^[', aString, '] value' forClass: DoIt) fn applyTo: self receiver arguments: #()
+!
+
+handleKeyDown: 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;
+		}
+	}>
+!
+
+inspectIt
+    self doIt inspect
+!
+
+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
+    self print: self doIt printString
+!
+
+fileIn
+    Importer new import: self currentLineOrSelection readStream
+! !
+
+!SourceArea methodsFor: 'events'!
+
+onKeyUp: aBlock
+	div onKeyUp: aBlock
+!
+
+onKeyDown: aBlock
+	div onKeyDown: aBlock
+! !
+
+!SourceArea methodsFor: 'rendering'!
+
+renderOn: html
+    | textarea |
+    div := html div class: 'source'.
+    div with: [textarea := html textarea].
+    self setEditorOn: textarea element.
+    div onKeyDown: [:e | self handleKeyDown: e]
 ! !
 
 Widget subclass: #TabWidget
@@ -278,59 +402,264 @@ open
     ^self new open
 ! !
 
-TabWidget subclass: #Workspace
-	instanceVariableNames: 'sourceArea'
+Widget subclass: #TabManager
+	instanceVariableNames: 'selectedTab tabs opened ul input'
 	category: 'IDE'!
 
-!Workspace methodsFor: 'accessing'!
+!TabManager methodsFor: 'accessing'!
 
-label
-    ^'Workspace'
+tabs
+    ^tabs ifNil: [tabs := Array new]
+!
+
+labelFor: aWidget
+	| label maxSize |
+	maxSize := 15.
+	label := aWidget label copyFrom: 0 to: (aWidget label size min: maxSize).
+	aWidget label size > maxSize ifTrue: [
+		label := label, '...'].
+	^label
 ! !
 
-!Workspace methodsFor: 'actions'!
+!TabManager methodsFor: 'actions'!
 
-clearWorkspace
-    sourceArea clear
+updateBodyMargin
+    self setBodyMargin: '#jtalk' asJQuery height
 !
 
-doIt
-   sourceArea doIt
+updatePosition
+    <jQuery('#jtalk').css('top', '').css('bottom', '0px')>
 !
 
-printIt
-	sourceArea printIt
+removeBodyMargin
+    self setBodyMargin: 0
 !
 
-inspectIt
-    sourceArea inspectIt
+setBodyMargin: anInteger
+    '.jtalkBody' asJQuery css: 'margin-bottom' put: anInteger asString, 'px'
 !
 
-fileIn
-    sourceArea fileIn
-! !
+onResize: aBlock
+    <jQuery('#jtalk').resizable({
+	handles: 'n', 
+	resize: aBlock,
+	minHeight: 230
+})>
+!
 
-!Workspace methodsFor: 'rendering'!
+onWindowResize: aBlock
+    <jQuery(window).resize(aBlock)>
+!
 
-renderBoxOn: html
-    sourceArea := SourceArea new.
-    sourceArea renderOn: html
+open
+    opened ifFalse: [
+	'body' asJQuery addClass: 'jtalkBody'.
+	'#jtalk' asJQuery show.
+	ul asJQuery show.
+	self updateBodyMargin.
+	selectedTab show.
+	opened := true]
 !
 
-renderButtonsOn: html
-    html button
-	with: 'DoIt';
-	title: 'ctrl+d';
-	onClick: [self doIt].
-    html button
-	with: 'PrintIt';
-	title: 'ctrl+p';
-	onClick: [self printIt].
-    html button
-	with: 'InspectIt';
-	title: 'ctrl+i';
-	onClick: [self inspectIt].
-    html button
+close
+    opened ifTrue: [
+	'#jtalk' asJQuery hide.
+	ul asJQuery hide.
+	selectedTab hide.
+	self removeBodyMargin.
+	'body' asJQuery removeClass: 'jtalkBody'.
+	opened := false]
+!
+
+newBrowserTab
+    Browser open
+!
+
+selectTab: aWidget
+    self open.
+    selectedTab := aWidget.
+    self tabs do: [:each |
+	each hide].
+    aWidget show.
+	
+    self update
+!
+
+closeTab: aWidget
+    self removeTab: aWidget.
+    self selectTab: self tabs last.
+    aWidget remove.
+    self update
+!
+
+search: aString
+	| searchedClass |
+	searchedClass := Smalltalk current at: aString.
+		searchedClass isClass
+			ifTrue: [Browser openOn: searchedClass]
+			ifFalse: [ReferencesBrowser search: aString]
+! !
+
+!TabManager methodsFor: 'adding/Removing'!
+
+addTab: aWidget
+    self tabs add: aWidget.
+    aWidget appendToJQuery: '#jtalk' asJQuery.
+    aWidget hide
+!
+
+removeTab: aWidget
+    self tabs remove: aWidget.
+    self update
+! !
+
+!TabManager methodsFor: 'initialization'!
+
+initialize
+    super initialize.
+    opened := true.
+    [:html | html div id: 'jtalk'] appendToJQuery: 'body' asJQuery.
+    'body' asJQuery 
+	addClass: 'jtalkBody'.
+    self appendToJQuery: '#jtalk' asJQuery.
+    self 
+	addTab: IDETranscript current;
+	addTab: Workspace new;
+	addTab: TestRunner new.
+    self selectTab: self tabs last.
+    self 
+	onResize: [self updateBodyMargin; updatePosition];
+	onWindowResize: [self updatePosition]
+! !
+
+!TabManager methodsFor: 'rendering'!
+
+renderOn: html
+	html div id: 'logo'.
+	self renderToolbarOn: html.
+	ul := html ul
+		id: 'jtalkTabs';
+		yourself.
+	self renderTabs
+!
+
+renderTabFor: aWidget on: html
+	| li |
+	li := html li.
+	selectedTab = aWidget ifTrue: [
+	li class: 'selected'].
+	li with: [
+		html span class: 'ltab'.
+		html span
+			class: 'mtab';
+			with: [
+				aWidget canBeClosed ifTrue: [
+					html span 
+						class: 'close';
+						with: 'x';
+					onClick: [self closeTab: aWidget]].
+			html span with: (self labelFor: aWidget)].
+		html span class: 'rtab'];
+	onClick: [self selectTab: aWidget]
+!
+
+renderTabs
+	ul contents: [:html |
+	    self tabs do: [:each |
+		self renderTabFor: each on: html].
+	    html li
+		class: 'newtab';
+		with: [
+			html span class: 'ltab'.
+			html span class: 'mtab'; with: ' + '.
+			html span class: 'rtab'];
+		onClick: [self newBrowserTab]]
+!
+
+renderToolbarOn: html
+	html div 
+		id: 'jt_toolbar';
+		with: [
+			input := html input 
+				class: 'implementors';
+				yourself.
+			input onKeyPress: [:event |
+				event keyCode = 13 ifTrue: [
+				self search: input asJQuery val]].
+			html div id: 'jt_close'; onClick: [self close]]
+! !
+
+!TabManager methodsFor: 'updating'!
+
+update
+	self renderTabs
+! !
+
+TabManager class instanceVariableNames: 'current'!
+
+!TabManager class methodsFor: 'instance creation'!
+
+current
+    ^current ifNil: [current := super new]
+!
+
+new
+    self shouldNotImplement
+! !
+
+TabWidget subclass: #Workspace
+	instanceVariableNames: 'sourceArea'
+	category: 'IDE'!
+
+!Workspace methodsFor: 'accessing'!
+
+label
+    ^'Workspace'
+! !
+
+!Workspace methodsFor: 'actions'!
+
+clearWorkspace
+    sourceArea clear
+!
+
+doIt
+   sourceArea doIt
+!
+
+printIt
+	sourceArea printIt
+!
+
+inspectIt
+    sourceArea inspectIt
+!
+
+fileIn
+    sourceArea fileIn
+! !
+
+!Workspace methodsFor: 'rendering'!
+
+renderBoxOn: html
+    sourceArea := SourceArea new.
+    sourceArea renderOn: html
+!
+
+renderButtonsOn: html
+    html button
+	with: 'DoIt';
+	title: 'ctrl+d';
+	onClick: [self doIt].
+    html button
+	with: 'PrintIt';
+	title: 'ctrl+p';
+	onClick: [self printIt].
+    html button
+	with: 'InspectIt';
+	title: 'ctrl+i';
+	onClick: [self inspectIt].
+    html button
 	with: 'FileIn';
 	title: 'ctrl+f';
 	onClick: [self fileIn].
@@ -361,9 +690,9 @@ packages
 !
 
 classes
-    ^(Smalltalk current classes 
+    ^((Smalltalk current classes 
 	select: [:each | each category = selectedPackage])
-	sort: [:a :b | a name < b name]
+	sort: [:a :b | a name < b name]) asSet
 !
 
 protocols
@@ -768,8 +1097,8 @@ initialize
 ajaxPutAt: anURL data: aString
 	jQuery 
 		ajax: anURL	options: #{	'type' -> 'PUT'.
-                                'contentType' -> 'application/json'.
 								'data' -> aString.
+								'contentType' -> 'text/plain'.
 								'error' -> [window alert: 'PUT request failed at:  ', anURL] }
 ! !
 
@@ -1018,650 +1347,340 @@ openOn: aClass
     ^self new
 	open;
 	selectCategory: aClass category;
-	selectClass: aClass
-!
-
-open
-    self new open
-! !
-
-TabWidget subclass: #Inspector
-	instanceVariableNames: 'label variables object selectedVariable variablesList valueTextarea diveButton sourceArea'
-	category: 'IDE'!
-
-!Inspector methodsFor: 'accessing'!
-
-label
-	^label ifNil: ['Inspector (nil)']
-!
-
-variables
-	^variables
-!
-
-setVariables: aCollection
-	variables := aCollection
-!
-
-setLabel: aString
-	label := aString
-!
-
-selectedVariable
-	^selectedVariable
-!
-
-selectedVariable: aString
-	selectedVariable := aString
-!
-
-sourceArea
-	^sourceArea
-! !
-
-!Inspector methodsFor: 'actions'!
-
-inspect: anObject
-	object := anObject.
-	variables := #().
-	object inspectOn: self
-!
-
-dive
-	(self variables at: self selectedVariable) inspect
-!
-
-refresh
-	self 
-		inspect: object; 
-		updateVariablesList;
-		updateValueTextarea
-! !
-
-!Inspector methodsFor: 'rendering'!
-
-renderBoxOn: html
-	self 
-		renderTopPanelOn: html;
-		renderBottomPanelOn: html
-!
-
-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: [
-				html button
-					class: 'jt_button inspector refresh';
-					with: 'Refresh';
-					onClick: [self refresh].
-				diveButton := html button 
-					class: 'jt_button inspector dive';
-					with: 'Dive'; 
-					onClick: [self dive]].
-			html div class: 'jt_clear'].
-	self
-		updateVariablesList;
-		updateValueTextarea.
-!
-
-renderBottomPanelOn: html
-    html div
-	class: 'jt_sourceCode';
-	with: [
-	    sourceArea := SourceArea new
-		receiver: object;
-		onDoIt: [self refresh];
-		yourself.
-            sourceArea renderOn: html]
-!
-
-renderButtonsOn: html
-	html button 
-		with: 'DoIt';
-		onClick: [self sourceArea doIt].
-	html button 
-		with: 'PrintIt';
-		onClick: [self sourceArea printIt].
-	html button 
-		with: 'InspectIt';
-		onClick: [self sourceArea inspectIt].
-	self updateButtons
-! !
-
-!Inspector methodsFor: 'testing'!
-
-canBeClosed
-	^true
-! !
-
-!Inspector methodsFor: 'updating'!
-
-updateVariablesList
-	variablesList contents: [:html |
-		self variables keys do: [:each || li |
-			li := html li.
-			li
-				with: each;
-				onClick: [self selectVariable: each].
-			self selectedVariable = each ifTrue: [
-				li class: 'selected']]]
-!
-
-selectVariable: aString
-	self selectedVariable: aString.
-	self 
-		updateVariablesList;
-		updateValueTextarea;
-		updateButtons
-!
-
-updateValueTextarea
-	valueTextarea asJQuery val: (self selectedVariable isNil
-		ifTrue: ['']
-		ifFalse: [(self variables at: self selectedVariable) printString])
-!
-
-updateButtons
-	(self selectedVariable notNil and: [(self variables at: self selectedVariable) notNil])
-		ifFalse: [diveButton at: 'disabled' put: true] 
-		ifTrue: [diveButton removeAt: 'disabled']
-! !
-
-!Inspector class methodsFor: 'instance creation'!
-
-on: anObject
-	^self new
-		inspect: anObject;
-		yourself
-! !
-
-TabWidget subclass: #ReferencesBrowser
-	instanceVariableNames: 'implementors senders implementorsList input timer selector sendersList referencedClasses referencedClassesList'
-	category: 'IDE'!
-
-!ReferencesBrowser methodsFor: 'accessing'!
-
-implementors
-	^implementors ifNil: [implementors := Array new]
-!
-
-label
-	^'[References]'
-!
-
-selector
-	^selector
-!
-
-senders
-	^senders ifNil: [senders := Array new]
-!
-
-classesAndMetaclasses
-	^Smalltalk current classes, (Smalltalk current classes collect: [:each | each class])
-!
-
-referencedClasses
-	^referencedClasses ifNil: [referencedClasses := Array new]
-! !
-
-!ReferencesBrowser methodsFor: 'actions'!
-
-openBrowserOn: aMethod
-       | browser |
-       browser := Browser openOn: (aMethod methodClass isMetaclass 
-		ifTrue: [aMethod methodClass instanceClass] ifFalse: [aMethod methodClass]).
-       aMethod methodClass isMetaclass ifTrue: [browser selectTab: #class].
-       browser
-               selectProtocol: aMethod category;
-               selectMethod: aMethod
-!
-
-searchReferencesFor: aString
-	selector := aString.
-	implementors := Array new.
-	senders := Array new.
-	referencedClasses := Array new.
-	(selector match: '^[A-Z]') 
-		ifFalse: [self searchSelectorReferencesFor: selector]
-		ifTrue: [self searchReferencedClassesFor: selector]
-!
-
-search: aString
-	self 
-		searchReferencesFor: aString;
-		updateImplementorsList;
-		updateSendersList;
-		updateReferencedClassesList
-!
-
-searchReferencedClassesFor: aString
-	self classesAndMetaclasses do: [:each |
-		each methodDictionary values do: [:value |
-			(value referencedClasses includes: selector) ifTrue: [
-				self referencedClasses add: value]]]
-!
-
-searchSelectorReferencesFor: aString
-	self classesAndMetaclasses do: [:each | 
-		each methodDictionary keysAndValuesDo: [:key :value | 
-			key = selector ifTrue: [self implementors add: value].
-			(value messageSends includes: selector) ifTrue: [
-				self senders add: value]]]
-! !
-
-!ReferencesBrowser methodsFor: 'initialization'!
-
-initialize
-	super initialize.
-	selector := ''
-! !
-
-!ReferencesBrowser methodsFor: 'private'!
-
-setInputEvents
-	input
-		onKeyUp: [timer := [self search: input asJQuery val] valueWithTimeout: 100];
-		onKeyDown: [timer ifNotNil: [timer clearTimeout]]
-! !
-
-!ReferencesBrowser methodsFor: 'rendering'!
-
-renderBoxOn: html
-	self 
-		renderInputOn: html;
-		renderImplementorsOn: html;
-		renderSendersOn: html;
-		renderReferencedClassesOn: html
-!
-
-renderInputOn: html
-	input := html input 
-		class: 'implementors';
-		yourself.
-	input asJQuery val: selector.
-	self setInputEvents
-!
-
-renderImplementorsOn: html
-	implementorsList := html ul class: 'jt_column implementors'.
-	self updateImplementorsList
-!
-
-renderSendersOn: html
-	sendersList := html ul class: 'jt_column senders'.
-	self updateSendersList
-!
-
-renderReferencedClassesOn: html
-	referencedClassesList := html ul class: 'jt_column referenced_classes'.
-	self updateReferencedClassesList
-! !
-
-!ReferencesBrowser methodsFor: 'testing'!
-
-canBeClosed
-	^true
-! !
-
-!ReferencesBrowser methodsFor: 'updating'!
-
-updateImplementorsList
-    implementorsList contents: [:html |
-	html li
-		class: 'column_label'; 
-		with: 'Implementors (', self implementors size asString, ')';
-		style: 'font-weight: bold'.
-	self implementors do: [:each || li |
-	    li := html li.
-	    li
-		with: (each methodClass asString, ' >> ', self selector);
-		onClick: [self openBrowserOn: each]]]
-!
-
-updateSendersList
-	sendersList contents: [:html |
-	html li
-		class: 'column_label'; 
-		with: 'Senders (', self senders size asString, ')';
-		style: 'font-weight: bold'.
-	self senders do: [:each |
-		html li
-			with: (each methodClass asString, ' >> ', each selector);
-			onClick: [self openBrowserOn: each]]]
-!
-
-updateReferencedClassesList
-	referencedClassesList contents: [:html |
-	html li
-		class: 'column_label'; 
-		with: 'Class references (', self referencedClasses size asString, ')';
-		style: 'font-weight: bold'.
-	self referencedClasses do: [:each |
-		html li
-			with: (each methodClass asString, ' >> ', each selector);
-			onClick: [self openBrowserOn: each]]]
-! !
-
-!ReferencesBrowser class methodsFor: 'instance creation'!
-
-search: aString
-	^self new
-		searchReferencesFor: aString;
-		open
-! !
-
-Widget subclass: #SourceArea
-	instanceVariableNames: 'editor div receiver onDoIt'
-	category: 'IDE'!
-
-!SourceArea methodsFor: 'accessing'!
-
-val
-    ^editor getValue
+	selectClass: aClass
 !
 
-val: aString
-    editor setValue: aString
-!
+open
+    self new open
+! !
 
-currentLine
-    ^editor getLine: (editor getCursor line)
-!
+TabWidget subclass: #Inspector
+	instanceVariableNames: 'label variables object selectedVariable variablesList valueTextarea diveButton sourceArea'
+	category: 'IDE'!
 
-selection
-	^editor getSelection
-!
+!Inspector methodsFor: 'accessing'!
 
-selectionEnd
-   ^textarea element selectionEnd
+label
+	^label ifNil: ['Inspector (nil)']
 !
 
-selectionStart
-   ^textarea element selectionStart
+variables
+	^variables
 !
 
-selectionStart: anInteger
-   textarea element selectionStart: anInteger
+setVariables: aCollection
+	variables := aCollection
 !
 
-selectionEnd: anInteger
-   textarea element selectionEnd: anInteger
+setLabel: aString
+	label := aString
 !
 
-setEditorOn: aTextarea
-	<self['@editor'] = CodeMirror.fromTextArea(aTextarea, {
-		theme: 'jtalk',
-                lineNumbers: true,
-                enterMode: 'flat',
-                matchBrackets: true,
-                electricChars: false
-	})>
+selectedVariable
+	^selectedVariable
 !
 
-editor
-	^editor
+selectedVariable: aString
+	selectedVariable := aString
 !
 
-receiver
-	^receiver ifNil: [DoIt new]
-!
+sourceArea
+	^sourceArea
+! !
 
-receiver: anObject
-	receiver := anObject
-!
+!Inspector methodsFor: 'actions'!
 
-onDoIt: aBlock
-	onDoIt := aBlock
+inspect: anObject
+	object := anObject.
+	variables := #().
+	object inspectOn: self
 !
 
-onDoIt
-	^onDoIt
+dive
+	(self variables at: self selectedVariable) inspect
 !
 
-currentLineOrSelection
-    ^editor somethingSelected
-	ifFalse: [self currentLine]
-	ifTrue: [self selection]
+refresh
+	self 
+		inspect: object; 
+		updateVariablesList;
+		updateValueTextarea
 ! !
 
-!SourceArea methodsFor: 'actions'!
+!Inspector methodsFor: 'rendering'!
 
-clear
-      self val: ''
+renderBoxOn: html
+	self 
+		renderTopPanelOn: html;
+		renderBottomPanelOn: html
 !
 
-doIt
-    | result |
-    result := self eval: self currentLineOrSelection.
-    self onDoIt ifNotNil: [self onDoIt value].
-    ^result
+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: [
+				html button
+					class: 'jt_button inspector refresh';
+					with: 'Refresh';
+					onClick: [self refresh].
+				diveButton := html button 
+					class: 'jt_button inspector dive';
+					with: 'Dive'; 
+					onClick: [self dive]].
+			html div class: 'jt_clear'].
+	self
+		updateVariablesList;
+		updateValueTextarea.
 !
 
-eval: aString
-	| compiler  |
-	compiler := Compiler new.
-	[compiler parseExpression: aString] on: Error do: [:ex |
-		^window alert: ex messageText].
-	^(compiler load: 'doIt ^[', aString, '] value' forClass: DoIt) fn applyTo: self receiver arguments: #()
+renderBottomPanelOn: html
+    html div
+	class: 'jt_sourceCode';
+	with: [
+	    sourceArea := SourceArea new
+		receiver: object;
+		onDoIt: [self refresh];
+		yourself.
+            sourceArea renderOn: html]
 !
 
-handleKeyDown: 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;
-		}
-	}>
-!
+renderButtonsOn: html
+	html button 
+		with: 'DoIt';
+		onClick: [self sourceArea doIt].
+	html button 
+		with: 'PrintIt';
+		onClick: [self sourceArea printIt].
+	html button 
+		with: 'InspectIt';
+		onClick: [self sourceArea inspectIt].
+	self updateButtons
+! !
 
-inspectIt
-    self doIt inspect
-!
+!Inspector methodsFor: 'testing'!
 
-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
-!
+canBeClosed
+	^true
+! !
 
-printIt
-    self print: self doIt printString
-!
+!Inspector methodsFor: 'updating'!
 
-fileIn
-    Importer new import: self currentLineOrSelection readStream
-! !
+updateVariablesList
+	variablesList contents: [:html |
+		self variables keys do: [:each || li |
+			li := html li.
+			li
+				with: each;
+				onClick: [self selectVariable: each].
+			self selectedVariable = each ifTrue: [
+				li class: 'selected']]]
+!
 
-!SourceArea methodsFor: 'events'!
+selectVariable: aString
+	self selectedVariable: aString.
+	self 
+		updateVariablesList;
+		updateValueTextarea;
+		updateButtons
+!
 
-onKeyUp: aBlock
-	div onKeyUp: aBlock
+updateValueTextarea
+	valueTextarea asJQuery val: (self selectedVariable isNil
+		ifTrue: ['']
+		ifFalse: [(self variables at: self selectedVariable) printString])
 !
 
-onKeyDown: aBlock
-	div onKeyDown: aBlock
+updateButtons
+	(self selectedVariable notNil and: [(self variables at: self selectedVariable) notNil])
+		ifFalse: [diveButton at: 'disabled' put: true] 
+		ifTrue: [diveButton removeAt: 'disabled']
 ! !
 
-!SourceArea methodsFor: 'rendering'!
+!Inspector class methodsFor: 'instance creation'!
 
-renderOn: html
-    | textarea |
-    div := html div class: 'source'.
-    div with: [textarea := html textarea].
-    self setEditorOn: textarea element.
-    div onKeyDown: [:e | self handleKeyDown: e]
+on: anObject
+	^self new
+		inspect: anObject;
+		yourself
 ! !
 
-Widget subclass: #ClassesList
-	instanceVariableNames: 'browser ul nodes'
+TabWidget subclass: #ReferencesBrowser
+	instanceVariableNames: 'implementors senders implementorsList input timer selector sendersList referencedClasses referencedClassesList'
 	category: 'IDE'!
 
-!ClassesList methodsFor: 'accessing'!
-
-category
-	^self browser selectedPackage
-!
-
-nodes
-	nodes ifNil: [nodes := self getNodes].
-	^nodes
-!
-
-browser
-	^browser
-!
-
-browser: aBrowser
-	browser := aBrowser
-!
+!ReferencesBrowser methodsFor: 'accessing'!
 
-getNodes
-	| classes children others |
-	classes := self browser classes.
-	children := #().
-	others := #().
-	classes do: [:each |
-		(classes includes: each superclass)
-			ifFalse: [children add: each]
-			ifTrue: [others add: each]].
-	^children collect: [:each |
-		ClassesListNode on: each browser: self browser classes: others level: 0]
+implementors
+	^implementors ifNil: [implementors := Array new]
 !
 
-resetNodes
-	nodes := nil
-! !
+label
+	^'[References]'
+!
 
-!ClassesList methodsFor: 'rendering'!
+selector
+	^selector
+!
 
-renderOn: html
-	ul := html ul
-		class: 'jt_column browser classes';
-		yourself.
-	self updateNodes
+senders
+	^senders ifNil: [senders := Array new]
 !
 
-updateNodes
-	ul contents: [:html |
-		self nodes do: [:each |
-			each renderOn: html]]
+classesAndMetaclasses
+	^Smalltalk current classes, (Smalltalk current classes collect: [:each | each class])
+!
+
+referencedClasses
+	^referencedClasses ifNil: [referencedClasses := Array new]
 ! !
 
-!ClassesList class methodsFor: 'instance creation'!
+!ReferencesBrowser methodsFor: 'actions'!
 
-on: aBrowser
-	^self new 
-		browser: aBrowser; 
-		yourself
-! !
+openBrowserOn: aMethod
+       | browser |
+       browser := Browser openOn: (aMethod methodClass isMetaclass 
+		ifTrue: [aMethod methodClass instanceClass] ifFalse: [aMethod methodClass]).
+       aMethod methodClass isMetaclass ifTrue: [browser selectTab: #class].
+       browser
+               selectProtocol: aMethod category;
+               selectMethod: aMethod
+!
 
-Widget subclass: #ClassesListNode
-	instanceVariableNames: 'browser theClass level nodes'
-	category: 'IDE'!
+searchReferencesFor: aString
+	selector := aString.
+	implementors := Array new.
+	senders := Array new.
+	referencedClasses := Array new.
+	(selector match: '^[A-Z]') 
+		ifFalse: [self searchSelectorReferencesFor: selector]
+		ifTrue: [self searchReferencedClassesFor: selector]
+!
 
-!ClassesListNode methodsFor: ''!
+search: aString
+	self 
+		searchReferencesFor: aString;
+		updateImplementorsList;
+		updateSendersList;
+		updateReferencedClassesList
+!
 
-renderOn: html
-	| li cssClass |
-	cssClass := ''.
-	li := html li 
-		onClick: [self browser selectClass: self theClass]. 
-	li asJQuery html: self label.
+searchReferencedClassesFor: aString
+	self classesAndMetaclasses do: [:each |
+		each methodDictionary values do: [:value |
+			(value referencedClasses includes: selector) ifTrue: [
+				self referencedClasses add: value]]]
+!
 
-	self browser selectedClass = self theClass ifTrue:  [
-		cssClass := cssClass, ' selected'].
+searchSelectorReferencesFor: aString
+	self classesAndMetaclasses do: [:each | 
+		each methodDictionary keysAndValuesDo: [:key :value | 
+			key = selector ifTrue: [self implementors add: value].
+			(value messageSends includes: selector) ifTrue: [
+				self senders add: value]]]
+! !
 
-	self theClass comment isEmpty ifFalse: [
-		cssClass := cssClass, ' commented'].
+!ReferencesBrowser methodsFor: 'initialization'!
 
-	li class: cssClass.
+initialize
+	super initialize.
+	selector := ''
+! !
 
-	self nodes do: [:each |
-		each renderOn: html]
+!ReferencesBrowser methodsFor: 'private'!
+
+setInputEvents
+	input
+		onKeyUp: [timer := [self search: input asJQuery val] valueWithTimeout: 100];
+		onKeyDown: [timer ifNotNil: [timer clearTimeout]]
 ! !
 
-!ClassesListNode methodsFor: 'accessing'!
+!ReferencesBrowser methodsFor: 'rendering'!
 
-nodes
-	^nodes
+renderBoxOn: html
+	self 
+		renderInputOn: html;
+		renderImplementorsOn: html;
+		renderSendersOn: html;
+		renderReferencedClassesOn: html
 !
 
-theClass
-	^theClass
+renderInputOn: html
+	input := html input 
+		class: 'implementors';
+		yourself.
+	input asJQuery val: selector.
+	self setInputEvents
 !
 
-theClass: aClass
-	theClass := aClass
+renderImplementorsOn: html
+	implementorsList := html ul class: 'jt_column implementors'.
+	self updateImplementorsList
 !
 
-browser
-	^browser
+renderSendersOn: html
+	sendersList := html ul class: 'jt_column senders'.
+	self updateSendersList
 !
 
-browser: aBrowser
-	browser := aBrowser
-!
+renderReferencedClassesOn: html
+	referencedClassesList := html ul class: 'jt_column referenced_classes'.
+	self updateReferencedClassesList
+! !
 
-level
-	^level
-!
+!ReferencesBrowser methodsFor: 'testing'!
 
-level: anInteger
-	level := anInteger
+canBeClosed
+	^true
+! !
+
+!ReferencesBrowser methodsFor: 'updating'!
+
+updateImplementorsList
+    implementorsList contents: [:html |
+	html li
+		class: 'column_label'; 
+		with: 'Implementors (', self implementors size asString, ')';
+		style: 'font-weight: bold'.
+	self implementors do: [:each || li |
+	    li := html li.
+	    li
+		with: (each methodClass asString, ' >> ', self selector);
+		onClick: [self openBrowserOn: each]]]
 !
 
-label
-	| str |
-	str := String new writeStream.
-	self level timesRepeat: [
-		str nextPutAll: '&nbsp;&nbsp;&nbsp;&nbsp;'].
-	str nextPutAll: self theClass name.
-	^str contents
+updateSendersList
+	sendersList contents: [:html |
+	html li
+		class: 'column_label'; 
+		with: 'Senders (', self senders size asString, ')';
+		style: 'font-weight: bold'.
+	self senders do: [:each |
+		html li
+			with: (each methodClass asString, ' >> ', each selector);
+			onClick: [self openBrowserOn: each]]]
 !
 
-getNodesFrom: aCollection
-	| children others |
-	children := #().
-	others := #().
-	aCollection do: [:each |
-		(each superclass = self theClass)
-			ifTrue: [children add: each]
-			ifFalse: [others add: each]].
-	nodes:= children collect: [:each |
-		ClassesListNode on: each browser: self browser classes: others level: self level + 1]
+updateReferencedClassesList
+	referencedClassesList contents: [:html |
+	html li
+		class: 'column_label'; 
+		with: 'Class references (', self referencedClasses size asString, ')';
+		style: 'font-weight: bold'.
+	self referencedClasses do: [:each |
+		html li
+			with: (each methodClass asString, ' >> ', each selector);
+			onClick: [self openBrowserOn: each]]]
 ! !
 
-!ClassesListNode class methodsFor: 'instance creation'!
+!ReferencesBrowser class methodsFor: 'instance creation'!
 
-on: aClass browser: aBrowser classes: aCollection level: anInteger
+search: aString
 	^self new
-		theClass: aClass;
-		browser: aBrowser;
-		level: anInteger;
-		getNodesFrom: aCollection;
-		yourself
+		searchReferencesFor: aString;
+		open
 ! !
 
 TabWidget subclass: #Debugger
@@ -1877,25 +1896,6 @@ updateVariablesList
 	selectedVariable ifNil: [inspectButton at: 'disabled' put: true] ifNotNil: [inspectButton removeAt: 'disabled']
 ! !
 
-ErrorHandler subclass: #DebugErrorHandler
-	instanceVariableNames: ''
-	category: 'IDE'!
-
-!DebugErrorHandler methodsFor: 'error handling'!
-
-handleError: anError
-	[Debugger new
-		error: anError;
-		open] on: Error do: [:error |
-			ErrorHandler new handleError: error]
-! !
-
-!DebugErrorHandler class methodsFor: 'initialization'!
-
-initialize
-	self register
-! !
-
 TabWidget subclass: #ProgressBar
 	instanceVariableNames: 'percent progressDiv div'
 	category: 'IDE'!
@@ -2320,6 +2320,37 @@ inspectOn: anInspector
 		setVariables: variables
 ! !
 
+!Date methodsFor: '*IDE'!
+
+inspectOn: anInspector
+	| variables |
+	variables := Dictionary new.
+	variables at: '#self' put: self.
+	variables at: '#year' put: self year.
+	variables at: '#month' put: self month.
+	variables at: '#day' put: self day.
+	variables at: '#hours' put: self hours.
+	variables at: '#minutes' put: self minutes.
+	variables at: '#seconds' put: self seconds.
+	variables at: '#milliseconds' put: self milliseconds.
+	anInspector 
+		setLabel: self printString;
+		setVariables: variables
+! !
+
+!Set methodsFor: '*IDE'!
+
+inspectOn: anInspector
+	| variables |
+	variables := Dictionary new.
+	variables at: '#self' put: self.
+	elements withIndexDo: [:each :i |
+		variables at: i put: each].
+	anInspector 
+		setLabel: self printString;
+		setVariables: variables
+! !
+
 !HashedCollection methodsFor: '*IDE'!
 
 inspectOn: anInspector