hg/stx-libtool: comparison Tools_

equal deleted inserted replaced

-:d797f0c1e183
+:576b071baeea
 SimpleView subclass:#CodeView2
 	instanceVariableNames:'gutterView textView textViewScroller methodHolder languageHolder
 		classHolder browserHolder codeAspect modifiedChannel
 		showGutterChannel showAcceptCancelBarChannel modeHolder
 		serviceManager services servicesFromClient syntaxElements
+		currentParseNodeHolder currentBlockNodeHolder
 		syntaxElementSelection highlightEmphasis diffMode
 		synchronizedCodeViews'
 	classVariableNames:'TraceSelectors'
 	poolDictionaries:''
 	category:'Interface-CodeView'
 !
 SimpleView subclass:#GutterView
 	instanceVariableNames:'codeView textView textViewScroller widthAcceptCancel
 		widthAnnotations widthDiffInfo numberOfLines acceptColor
-		cancelColor diffColor menuHolder showLineNumbers'
+		cancelColor diffColor menuHolder currentBlockNodeHolder
+		showLineNumbers'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:CodeView2
 !
 (Menu new fromLiteralArrayEncoding:(Tools::CodeView2 editMenu_eclipseStyle)) startUp
 "
 <resource: #menu>
 ^
 #(Menu
-(
+	(
-(MenuItem
+	 (MenuItem
-label: 'Implementors...'
+	    label: 'Implementors...'
-itemValue: browseImplementorsOfIt
+	    itemValue: browseImplementorsOfIt
-translateLabel: true
+	    submenuChannel: implementorsMenu
-submenuChannel: implementorsMenu
+	    shortcutKey: ImplementorsOfIt
-shortcutKey: ImplementorsOfIt
+	  )
-)
+	 (MenuItem
-(MenuItem
+	    label: 'Senders...'
-label: 'Senders...'
+	    itemValue: browseSendersOfIt
-itemValue: browseSendersOfIt
+	    submenuChannel: sendersMenu
-translateLabel: true
+	    shortcutKey: SendersOfIt
-submenuChannel: sendersMenu
+	  )
-shortcutKey: SendersOfIt
+	 (MenuItem
-)
+	    label: 'Refactor'
-(MenuItem
+	    nameKey: refactor
-label: 'Refactor'
+	    isVisible: false
-nameKey: refactor
+	    shortcutKey: Shift
-translateLabel: true
+	  )
-isVisible: false
+	 (MenuItem
-shortcutKey: Shift
+	    label: '-'
-)
+	  )
-(MenuItem
+	 (MenuItem
-label: '-'
+	    label: 'Accept'
-)
+	    itemValue: accept
-(MenuItem
+	    shortcutKey: Accept
-label: 'Accept'
+	  )
-itemValue: accept
+	 (MenuItem
-translateLabel: true
+	    label: '-'
-shortcutKey: Accept
+	  )
-)
+	 (MenuItem
-(MenuItem
+	    label: 'Cut'
-label: '-'
+	    itemValue: cut
-)
+	    shortcutKey: Cut
-(MenuItem
+	  )
-label: 'Cut'
+	 (MenuItem
-itemValue: cut
+	    label: 'Copy'
-translateLabel: true
+	    itemValue: copySelection
-shortcutKey: Cut
+	    shortcutKey: Copy
-)
+	  )
-(MenuItem
+	 (MenuItem
-label: 'Copy'
+	    label: 'Paste'
-itemValue: copySelection
+	    itemValue: pasteOrReplace
-translateLabel: true
+	    shortcutKey: Paste
-shortcutKey: Copy
+	  )
-)
+	 (MenuItem
-(MenuItem
+	    label: '-'
-label: 'Paste'
+	  )
-itemValue: pasteOrReplace
+	 (MenuItem
-translateLabel: true
+	    label: 'Undo'
-shortcutKey: Paste
+	    itemValue: undo
-)
+	    shortcutKey: Undo
-(MenuItem
+	  )
-label: '-'
+	 (MenuItem
-)
+	    label: 'Redo'
-(MenuItem
+	    itemValue: redo
-label: 'Undo'
+	    shortcutKey: Redo
-itemValue: undo
+	  )
-translateLabel: true
+	 (MenuItem
-shortcutKey: Undo
+	    label: '-'
-)
+	  )
-(MenuItem
+	 (MenuItem
-label: '-'
+	    label: 'Do it'
-)
+	    itemValue: doIt
-(MenuItem
+	    shortcutKey: DoIt
-label: 'Do it'
+	  )
-itemValue: doIt
+	 (MenuItem
-translateLabel: true
+	    label: 'Print it'
-shortcutKey: DoIt
+	    itemValue: printIt
-)
+	    shortcutKey: PrintIt
-(MenuItem
+	  )
-label: 'Print it'
+	 (MenuItem
-itemValue: printIt
+	    label: 'Inspect it'
-translateLabel: true
+	    itemValue: inspectIt
-shortcutKey: PrintIt
+	    shortcutKey: InspectIt
-)
+	  )
-(MenuItem
+	 (MenuItem
-label: 'Inspect it'
+	    label: 'Profile it'
-itemValue: inspectIt
+	    itemValue: profileIt
-translateLabel: true
+	    shortcutKey: InspectIt
-shortcutKey: InspectIt
+	  )
-)
+	 (MenuItem
-(MenuItem
+	    label: '-'
-label: 'Profile it'
+	  )
-itemValue: profileIt
+	 (MenuItem
-translateLabel: true
+	    label: 'Show Gutter'
-shortcutKey: InspectIt
+	    nameKey: ShowGutter
-)
+	    indication: showGutterChannel
-(MenuItem
+	  )
-label: '-'
+	 (MenuItem
-)
+	    label: 'More'
-(MenuItem
+	    nameKey: More
-label: 'Show Gutter'
+	  )
-nameKey: ShowGutter
+	 (MenuItem
-translateLabel: true
+	    label: 'Services'
-indication: showGutterChannel
+	    submenuChannel: servicesMenu
-)
+	  )
-(MenuItem
+	 (MenuItem
-label: 'More'
+	    label: 'Debug'
-nameKey: More
+	    submenuChannel: debugMenu
-translateLabel: true
+	  )
-)
+	 )
-(MenuItem
+	nil
-label: 'Services'
+	nil
-translateLabel: true
-submenuChannel: servicesMenu
-)
-(MenuItem
-label: 'Debug'
-translateLabel: true
-submenuChannel: debugMenu
-)
-)
-nil
-nil
 )
-"Modified: / 08-03-2012 / 12:36:18 / cg"
 !
 editMenu_stxStyle
 "This resource specification was automatically generated
 by the MenuEditor of ST/X."
 )
 "Modified: / 02-03-2012 / 19:53:19 / cg"
 ! !
+!CodeView2 methodsFor:'* As yet uncategorized *'!
+defaultFileNameForSave
+self halt:'please define defaultFileNameForSave here'.
+"Created: / 11-05-2012 / 15:38:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
 !CodeView2 methodsFor:'accessing'!
 acceptAction:aBlock
 textView acceptAction: aBlock
 "Modified: / 27-07-2012 / 22:32:19 / cg"
 "Modified: / 27-09-2013 / 10:01:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
+compilerClass
+^textView compilerClass
+"Created: / 10-05-2012 / 23:47:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+compilerClass: aClass
+textView compilerClass: aClass
+"Created: / 10-05-2012 / 23:47:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
 contents
 ^textView contents
 "Created: / 14-02-2010 / 22:13:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 textView contents: aStringOrStringCollection.
 "/self update:#value with: aStringOrStringCollection from: textView model
 "Modified: / 19-07-2011 / 13:18:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+contents: aStringOrStringCollection clear: clearPrevious
+"Set the contents. If clearPrevous is true, then
+previous original text is cleared and set to given one.
+(so the text is considered not modified)"
+textView contents: aStringOrStringCollection clear: clearPrevious
+"Modified: / 19-07-2011 / 13:18:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Created: / 17-02-2012 / 00:33:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+currentParseNode
+^self currentParseNodeHolder value
+"Created: / 21-02-2012 / 14:20:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+delegate: anObject
+super delegate: anObject.
+self textView delegate: anObject.
+self gutterView delegate: anObject.
+"Created: / 11-05-2012 / 10:29:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 diffMode
 ^ diffMode
 !
 model: aValueModel
 |oldValue newValue|
 textView model notNil ifTrue:[
-oldValue := textView model value.
+	oldValue := textView model value.
-textView model removeDependent:self.
+	textView model removeDependent:self.
 ].
 textView model: aValueModel.
 textView model notNil ifTrue:[
-textView model addDependent:self.
+	textView model addDependent:self.
 ].
 newValue := textView model value.
 oldValue ~~ newValue ifTrue:[
-self update:#value with:newValue from:textView model.
+	self update:#value with:newValue from:textView model.
 ].
-"Modified: / 27-07-2011 / 12:58:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 17-03-2012 / 16:11:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 modified
 "return true if text was modified"
 (synchronizedCodeViews includes: aCodeView) ifTrue:[^self].
 synchronizedCodeViews := synchronizedCodeViews copyWith: aCodeView.
 "Created: / 06-04-2010 / 14:13:14 / Jakub <zelenja7@fel.cvut.cz>"
 "Modified: / 23-06-2010 / 17:01:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
+!
-!CodeView2 methodsFor:'accessing-code component'!
+unsynchronizeWith: aCodeView
+self assert: aCodeView ~= self.
+(synchronizedCodeViews includes: aCodeView) ifFalse:[^self].
+synchronizedCodeViews := synchronizedCodeViews copyWithout: aCodeView.
+"Created: / 06-04-2010 / 14:13:14 / Jakub <zelenja7@fel.cvut.cz>"
+"Modified: / 23-06-2010 / 17:01:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Created: / 19-03-2012 / 14:25:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+!CodeView2 methodsFor:'accessing - code component'!
 klass
 | v |
 (v := self classHolder value) notNil ifTrue:[^v].
 (v := self method) notNil ifTrue:[^v mclass].
-^UndefinedObject
+^nil
 "Created: / 27-07-2011 / 13:14:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 22-07-2013 / 13:34:05 / cg"
-!
+! !
+!CodeView2 methodsFor:'accessing-code component'!
 klass: aClass
 "Created: / 27-07-2011 / 13:13:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 ].
 self changed: #classHolder with: old -> classHolder
 "Modified: / 17-06-2011 / 12:56:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+currentBlockNodeHolder
+"return/create the 'currentBlockNodeHolder' value holder (automatically generated)"
+currentBlockNodeHolder isNil ifTrue:[
+	currentBlockNodeHolder := ValueHolder new.
+].
+^ currentBlockNodeHolder
+!
+currentBlockNodeHolder:something
+"set the 'currentBlockNodeHolder' value holder (automatically generated)"
+currentBlockNodeHolder := something.
+!
+currentParseNodeHolder
+"return/create the 'currentParseNodeHolder' value holder (automatically generated)"
+currentParseNodeHolder isNil ifTrue:[
+	currentParseNodeHolder := ValueHolder new.
+].
+^ currentParseNodeHolder
+!
+currentParseNodeHolder:something
+"set the 'currentParseNodeHolder' value holder (automatically generated)"
+currentParseNodeHolder := something.
+gutterView notNil ifTrue:[ gutterView currentBlockNodeHolder: currentBlockNodeHolder ].
+"Modified: / 16-02-2012 / 23:11:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 languageHolder
 languageHolder isNil ifTrue:[
 "/ cg: I dont like the smalltalk default here, because everyone who is not showing ST-code (expecco, filebrowser etc.)
 update:aspect with:param from:sender
 sender == methodHolder ifTrue:[
-textView editedMethodOrClass: methodHolder value.
+	textView editedMethodOrClass: methodHolder value.
 ].
 sender == classHolder ifTrue:[
-methodHolder value isNil ifTrue:[
+	methodHolder value isNil ifTrue:[
-textView editedMethodOrClass: classHolder value.
+	    textView editedMethodOrClass: classHolder value.
-].
+	].
 ].
 sender == languageHolder ifTrue:[
-textView editedLanguage: languageHolder value.
+	textView editedLanguage: languageHolder value.
+].
+sender == modeHolder ifTrue:[
+	codeAspect := modeHolder value
 ].
 sender == showGutterChannel ifTrue: [
-self updateGutterVisibility.
+	self updateGutterVisibility.
-^self.
+	^self.
 ].
 services do:[:each |
-each isEnabled ifTrue:[
+	each isEnabled ifTrue:[
-each update:aspect with:param from:sender
+	    each update:aspect with:param from:sender
-]
+	]
 ].
 super update:aspect with:param from:sender
 "Modified: / 07-07-2011 / 12:07:04 / Jan Vrany <jan.vrant@fit.cvut,cz>"
 "/ not exact, but much faster (looks for symbol only, does not parse code for real send)
 senderBlock := SystemBrowser searchBlockForSymbol:selector.
 senderBlock == false ifTrue:[ ^ #() ].
 ^ SystemBrowser
-allMethodsIn:Smalltalk allClasses
+	allMethodsIn:Smalltalk allClasses
-where:senderBlock.
+	where:senderBlock.
 "/ exact, but much slower
-"/ (parses code to see if this is really a send or only a symbol reference)
 "/    ^SystemBrowser
 "/        findSendersOf: selector
 "/        in: Smalltalk allClasses
 "/        ignoreCase: false
 ^textView hasSelection
 "Created: / 14-02-2010 / 09:53:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+!CodeView2 methodsFor:'delegation - events'!
+buttonPress: button x:x y:y in: view
+"Delegates events to services. Answers true iff at least
+one service handler method returns true. In that case,
+the event is is NOT processes by the view."
+^ services
+	contains:[:service |
+	    service isEnabled and:[ ((service buttonPress: button x:x y:y in: view) == true) ]
+	].
+"Modified: / 07-03-2010 / 13:53:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 06-10-2011 / 14:14:00 / cg"
+"Modified (format): / 05-03-2012 / 08:56:02 / cg"
+!
+scrollTo:origin redraw:doRedraw in: view
+view == textView ifTrue: [
+	"/my text view scrolled...
+	synchronizedCodeViews do:[:codeView|
+	    codeView scrollTo:origin redraw:doRedraw in: view.
+	]
+] ifFalse: [
+	"/other code view scrolls and I'm notified about that
+	textView basicScrollTo:origin redraw:doRedraw.
+]
+"Created: / 06-04-2010 / 14:02:39 / Jakub <zelenja7@fel.cvut.cz>"
+"Created: / 19-03-2012 / 17:05:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
 !CodeView2 methodsFor:'delegation-drawing'!
 drawLine:lineNo in: view atX:x y:y width: w height:h from:startCol to:endColOrNil with:fg and:bg
 "See the comment in
 CodeViewService>>drawLine:in:atX..."
 service isEnabled and:[ ((service buttonMotion: button x:x y:y in: view) == true) ]
 ].
 "Modified: / 07-03-2010 / 13:53:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 06-10-2011 / 14:13:57 / cg"
-!
-buttonPress: button x:x y:y in: view
-"Delegates events to services. Answers true iff at least
-one service handler method returns true.
-In that case, the event is is NOT processes by the view."
-^ services
-contains:[:service |
-(service isEnabled
-and:[ ((service buttonPress: button x:x y:y in: view) == true) ])
-].
-"Modified: / 07-03-2010 / 13:53:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-"Modified (comment): / 29-08-2013 / 16:23:08 / cg"
 !
 buttonRelease: button x:x y:y in: view
 "Delegates events to services. Answers true iff at least
 one service handler method returns true. In that case,
 !
 initialize
 "Invoked when a new instance is created."
 "Call super initialize"
 super initialize.
 "Now set up some visual properties"
 self level:-1.
 "Now initialize sub-views"
 showGutterChannel := ValueHolder with: true.
 showGutterChannel addDependent: self.
 "/ toDo: I don't like two options in the settings;
 "/ showAcceptCancelBarChannel := (ValueHolder with: (UserPreferences current showAcceptCancelBarInBrowser)).
 showAcceptCancelBarChannel := ValueHolder with: (UserPreferences current codeView2ShowAcceptCancel).
 "/ these views must be created first, as they refer to each other's channels in their
 textView := textViewScroller scrolledView.
 self initializeGutterView.
 self initializeTextView.
 textView setCodeView:self.
 modifiedChannel := ValueHolder with:false.
 diffMode := false.
 synchronizedCodeViews := #().
+currentParseNodeHolder := ValueHolder new.
+currentBlockNodeHolder := ValueHolder new.
 servicesFromClient := false.
 services := OrderedCollection new.
 self initializeServices.
 "Modified: / 14-12-2009 / 13:59:53 / Jindra <a>"
 "Modified: / 06-04-2010 / 13:56:35 / Jakub <zelenja7@fel.cvut.cz>"
 "Modified: / 06-10-2011 / 14:15:48 / cg"
-"Modified: / 18-10-2011 / 19:17:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 16-02-2012 / 23:05:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 initializeGutterView
 gutterView setCodeView:self.
 | serviceClasses |
 "/ only do it, if the services have not yet been defined by the user of this view
 "/ (FileBrowser does not want Smalltalk-specific services)
 servicesFromClient ifFalse:[
-serviceClasses := self defaultServices sort:[:a :b|name < b name].
+	serviceClasses := self defaultServices sort:[:a :b|a priority = b priority ifTrue:[a name < b name] ifFalse:[a priority > b priority]].
-serviceClasses do:[:cls|
+	serviceClasses do:[:cls|
-self registerService: cls new
+	    self registerService: cls new
-].
+	].
 ].
-"Modified: / 27-07-2011 / 11:37:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 22-07-2013 / 14:02:59 / cg"
+"Modified: / 24-07-2013 / 11:56:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 initializeTextView
 "Initialize textView. gutterView has to be already initialized!!"
 "Modified: / 19-10-2008 / 08:16:50 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Created: / 30-06-2011 / 19:28:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 05-03-2012 / 09:02:43 / cg"
 !
 implementorsMenu: implementors selector: selector
 | menu|
 menu := Menu new.
 implementors isEmptyOrNil ifTrue:[
-menu addItem:(MenuItem label:'No implementors found') disable
+	menu addItem:(MenuItem label:'No implementors found') disable
 ] ifFalse:[
-menu addItem:(MenuItem
+	menu addItem:(MenuItem
-label:(selector "storeString" , (' (all implementors) ') asText allItalic)
+		    label:(selector storeString , (' (all implementors) ') asText allItalic)
-itemValue:[
+		    itemValue:[
-self browseMethods:implementors
+			self browseMethods:implementors
-label:'Implementors of ' , selector "storeString"
+			    label:'Implementors of ' , selector storeString
-]).
+		    ]).
-menu addSeparator.
+	menu addSeparator.
-"/ (implementors asOrderedCollection sort:[:a :b | a mclass name < b mclass name])
+	(implementors asOrderedCollection sort:[:a :b | a mclass name < b mclass name])
-(implementors asOrderedCollection sort:[:a :b | a selector < b selector])
+	"implementors" do:[:mth |
-"implementors" do:[:mth |
+	    menu
-menu
+		addItem:(MenuItem label:(selector storeString
-addItem:(MenuItem label:(selector "storeString" allBold
+				, (' in ' , mth containingClass nameInBrowser asText allBold))
-, (' in ' , mth containingClass name "asText allBold"))
+			itemValue:[ self browseMethod:mth label: 'Implementor of ' , selector storeString  ])
-value:[ self browseMethod:mth label: 'Implementor of ' , selector "storeString"  ])
+	]
-]
 ].
 ^ menu
 "Modified: / 19-10-2008 / 08:16:50 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Created: / 14-02-2010 / 19:39:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-"Modified: / 28-08-2013 / 22:03:06 / cg"
+"Modified: / 07-03-2012 / 12:56:56 / cg"
+"Modified: / 14-10-2013 / 10:47:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 sendersMenu
 | selectorAndSelectedText selector selectedText  senders |
 "Modified: / 19-10-2008 / 08:16:50 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Created: / 30-06-2011 / 19:28:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 05-03-2012 / 09:02:56 / cg"
 !
 sendersMenu: senders  selector: selector
 | menu shownSenderItems numCut sendersSorted|
 menu := Menu new.
 senders isEmptyOrNil ifTrue:[
-menu addItem:(MenuItem label:'No senders found') disable
+	menu addItem:(MenuItem label:'No senders found') disable
 ] ifFalse:[
-menu addItem:(MenuItem
+	menu addItem:(MenuItem
-label:(selector "storeString" , (' (all senders)') asText allItalic)
+		    label:(selector storeString , (' (all senders)') asText allItalic)
-itemValue:[
+		    itemValue:[
-self browseMethods:senders
+			self browseMethods:senders
-label:'Senders of ' , selector "storeString"
+			    label:'Senders of ' , selector storeString
-]).
+		    ]).
-menu addSeparator.
+	menu addSeparator.
-"/ sendersSorted := senders asOrderedCollection
+	sendersSorted := senders asOrderedCollection
-"/                    sort:[:a :b | a whoString < b whoString].
+			    sort:[:a :b | a whoString < b whoString].
-sendersSorted := senders asOrderedCollection
+	shownSenderItems := (senders size > 20) ifTrue:[sendersSorted copyTo:20] ifFalse:[sendersSorted].
-sort:[:a :b | a selector < b selector].
+	numCut := senders size - 20.
-shownSenderItems := (senders size > 20) ifTrue:[sendersSorted copyTo:20] ifFalse:[sendersSorted].
+	shownSenderItems do:[:mth |
-numCut := senders size - 20.
+	    menu
-shownSenderItems do:[:mth |
+		addItem:(MenuItem label:(mth selector storeString
-menu
+				, (' in ' , mth containingClass nameInBrowser asText allBold))
-addItem:(MenuItem label:(mth selector "storeString" allBold
+			itemValue:[ self browseMethod:mth label: 'Sender of ' , selector storeString ])
-, (' in ' , mth containingClass name "asText allBold"))
+	].
-value:[ self browseMethod:mth label: 'Sender of ' , selector "storeString" ])
+	numCut > 0 ifTrue:[
-].
+	    menu addSeparator.
-numCut > 0 ifTrue:[
+	    menu addItem:(MenuItem label:('... %1 more senders not shown here' bindWith:numCut)) disable
-menu addSeparator.
+	].
-menu addItem:(MenuItem label:('... %1 more senders not shown here' bindWith:numCut)) disable
-].
 ].
 ^ menu
 "Modified: / 19-10-2008 / 08:17:00 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Created: / 14-02-2010 / 19:40:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 07-07-2011 / 14:51:54 / jv"
-"Modified: / 28-08-2013 / 22:03:57 / cg"
+"Modified: / 07-03-2012 / 12:58:31 / cg"
+"Modified: / 14-10-2013 / 10:47:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 servicesMenu
 |menu item anyService|
 syntaxElementSelection
 ^ syntaxElementSelection
 !
-syntaxElementSelection:something
+syntaxElementSelection:anElement
-syntaxElementSelection := something.
+syntaxElementSelection := anElement.
+"/    anElement isNil ifTrue:[
+"/        currentParseNodeHolder value: nil.
+"/"/        currentBlockNodeHolder value: nil.
+"/    ] ifFalse:[
+"/        currentParseNodeHolder value: anElement node.
+"/"/        currentBlockNodeHolder value: anElement node enclosingBlock.
+"/    ]
+"Modified: / 24-09-2013 / 00:14:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 syntaxElements
 ^ syntaxElements
 !
 ^(self height * 0.6) ceiling.
 "Created: / 07-10-2011 / 19:53:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
+acceptCancelRight
+^((self paddingLeft) + (widthAcceptCancel ? 0))
+"Created: / 10-09-2013 / 03:00:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
 cancelButtonBottom
 ^(self height * 0.8) ceiling.
 "Created: / 07-10-2011 / 19:54:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 16-06-2011 / 13:47:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 paddingRight
-^0"px"
+^3"px"
 "Created: / 14-02-2010 / 22:27:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-"Modified: / 16-06-2011 / 13:47:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 16-02-2012 / 22:40:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 preferredExtent
 | font w h |
 middleButtonMenu
 menuHolder notNil ifTrue:[^ menuHolder value].
 codeView isNil ifTrue:[^ nil].
 ^ codeView servicesMenu
+! !
+!CodeView2::GutterView methodsFor:'aspects'!
+currentBlockNodeHolder
+"return/create the 'currentBlockNodeHolder' value holder (automatically generated)"
+currentBlockNodeHolder isNil ifTrue:[
+	currentBlockNodeHolder := ValueHolder new.
+	currentBlockNodeHolder addDependent:self.
+].
+^ currentBlockNodeHolder
+!
+currentBlockNodeHolder:something
+"set the 'currentBlockNodeHolder' value holder (automatically generated)"
+|oldValue newValue|
+currentBlockNodeHolder notNil ifTrue:[
+	oldValue := currentBlockNodeHolder value.
+	currentBlockNodeHolder removeDependent:self.
+].
+currentBlockNodeHolder := something.
+currentBlockNodeHolder notNil ifTrue:[
+	currentBlockNodeHolder addDependent:self.
+].
+newValue := currentBlockNodeHolder value.
+oldValue ~~ newValue ifTrue:[
+	self update:#value with:newValue from:currentBlockNodeHolder.
+].
 ! !
 !CodeView2::GutterView methodsFor:'change & update'!
 adjustSizeForLongestLine
 update:something with:aParameter from:changedObject
 "/    self shown ifFalse:[^self].
 (changedObject == textView) ifTrue:[
-((something == #sizeOfContents)
+	((something == #sizeOfContents)
-or:[ false "(something == #sizeOfView)" ]) ifTrue:[
+	or:[ false "(something == #sizeOfView)" ]) ifTrue:[
-self adjustSizeForLongestLine.
+	    self adjustSizeForLongestLine.
 "/            (numberOfLines ~= (textView list size max:textView cursorLine)) ifTrue:[
 "/                self invalidate.
 "/            ].
-^ self.
+	    ^ self.
-].
+	].
-something == #originOfContents ifTrue:[
+	something == #originOfContents ifTrue:[
-self invalidate.
+	    self invalidateLines.
-^ self.
+	    ^ self.
-].
+	].
-"/ something printCR.
+	"/ something printCR.
 ].
 (changedObject == textView reallyModifiedChannel) ifTrue:[
-"/ cg: I think this is rubbish: if any service needs that, it should make itself
+	self invalidateAcceptCancelBar.
-"/ dependent of it itself (leads to many redraws for non-existing accept-cancel bar,
+	^self.
-"/ if no such service is active)
-"/ self invalidate.
-^ self.
 ].
 super update:something with:aParameter from:changedObject
 "Modified (format): / 15-07-2011 / 20:14:04 / cg"
-"Modified: / 07-10-2011 / 19:25:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 10-09-2013 / 03:15:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !CodeView2::GutterView methodsFor:'event handling'!
 buttonPress: btn x: x y: y
 ].
 super buttonPress: btn x: x y: y
 "Created: / 17-06-2011 / 13:02:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified (comment): / 18-05-2012 / 10:56:54 / cg"
+!
+sizeChanged:how
+super sizeChanged:how.
+self invalidateAcceptCancelBar.
+"Created: / 10-09-2013 / 03:19:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !CodeView2::GutterView methodsFor:'help'!
 flyByHelpText
 super initialize.
 showLineNumbers := true.
 widthAcceptCancel := 16.
-widthAnnotations := 8.
+widthAnnotations := "16"8.
 widthDiffInfo := 5.
 acceptColor := Color green lighter onDevice:device.
 cancelColor := Color red lighter lighter onDevice:device.
 diffColor := Color yellow lighter lighter onDevice:device.
 !
 setCodeView: aCodeView2
 codeView := aCodeView2.
-textView := aCodeView2 textView.
 codeView addDependent: self.
 codeView reallyModifiedChannel addDependent: self.
+codeView currentBlockNodeHolder addDependent: self.
+textView := aCodeView2 textView.
 textView addDependent: self.
+self currentBlockNodeHolder: codeView currentBlockNodeHolder.
 textViewScroller := aCodeView2 textViewScroller.
 "/ self backgroundPaint: (textView viewBackground "backgroundPaint" blendWith: (Color gray:80)).
 self viewBackground: (View defaultBackgroundColor).
 "Created: / 14-02-2010 / 15:19:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 17-08-2011 / 15:15:55 / cg"
-"Modified: / 08-10-2011 / 11:58:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 05-04-2012 / 17:46:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !CodeView2::GutterView methodsFor:'queries'!
 displayedString: line
 the textView (because gutter may become higher than textView, iff
 the textView has a horizontal scrollbar"
 |visibleLineNr "{ Class: SmallInteger }"|
+"/JV: BAD, BAD BAD - check senders, they are not prepared
+"/    to get nil!!
 shown ifFalse:[^ nil].
 lineNr isNil ifTrue:[^ nil].
 visibleLineNr := lineNr - textView firstLineShown + 1.
 ^ textView yOfVisibleLine:visibleLineNr
+"Modified (format): / 28-08-2013 / 12:49:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !CodeView2::GutterView methodsFor:'redrawing'!
+invalidateAcceptCancelBar
+| w |
+(widthAcceptCancel ? 0) == 0 ifTrue:[ ^ self ].
+w := ((self paddingLeft) + (widthAcceptCancel ? 0)) + 1.
+self
+	invalidateX: 0
+		  y: 0
+	      width: w
+	     height: self height.
+"Created: / 10-09-2013 / 03:07:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
 invalidateDeviceRectangle:aRectangle repairNow:doRepairNow
 ^ super invalidateDeviceRectangle:aRectangle repairNow:doRepairNow
 !
+invalidateLines
+| x0 |
+x0 := ((self paddingLeft) + (widthAcceptCancel ? 0)) + 1.
+self
+	invalidateX: x0
+		  y: 0
+	      width: self width - x0
+	     height: self height.
+"Created: / 10-09-2013 / 03:08:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
 redrawAcceptCancelBarX: x y: y width:w height:h
 | rw acceptBottom cancelBottom |
 x > ((self paddingLeft) + (widthAcceptCancel ? 0)) ifTrue:[
-^self.
+	^self.
 ].
 rw := ((x + w) min: (self paddingLeft + (widthAcceptCancel ? 0))) - x.
 textView reallyModified ifFalse:[
-self fillRectangleX:x y:y width:rw height:h color: self viewBackground
+	self fillRectangleX:x y:y width:rw height:h color: self viewBackground
 ] ifTrue:[
-acceptBottom := self acceptButtonBottom.
+	acceptBottom := self acceptButtonBottom.
-cancelBottom := self cancelButtonBottom.
+	cancelBottom := self cancelButtonBottom.
-y < acceptBottom ifTrue:[
+	y < acceptBottom ifTrue:[
-self fillRectangleX:x y:y width:rw height: ((y + h) min: acceptBottom) color: acceptColor.
+	    self fillRectangleX:x y:y width:rw height: ((y + h) min: acceptBottom) color: acceptColor.
-].
+	].
-(y < cancelBottom) ifTrue:[
+	(y < cancelBottom) ifTrue:[
-self fillRectangleX:x y: acceptBottom + 1width:rw height: ((y + h) min: cancelBottom) - acceptBottom - 1color: cancelColor.
+	    self fillRectangleX:x y: acceptBottom + 1width:rw height: ((y + h) min: cancelBottom) - acceptBottom - 1color: cancelColor.
-].
+	].
-(y + h >= cancelBottom) ifTrue:[
+	(y + h >= cancelBottom) ifTrue:[
-self fillRectangleX:x y: cancelBottom + 1 width:rw height: (y + h) - cancelBottom - 1 color: diffColor.
+	    self fillRectangleX:x y: cancelBottom + 1 width:rw height: (y + h) - cancelBottom - 1 color: diffColor.
-]
+	]
 ]
 "Created: / 07-10-2011 / 19:44:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 10-09-2013 / 03:03:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 redrawBackgroundX:x y:y width:w height:h
 "redraws gutter background"
 ^ self redrawLine:line cleared:cleared drawServices:true
 !
 redrawLine:line cleared:cleared drawServices:drawServices
 "redraws specified line. Returns width of drawn object.
 Color of drawn objects should be taken from lineFont, lineColor"
 |lineString yTop yBaseline fontAscent fontDescent
 textW requiredW oldFont newFont oldColor newColor|
+shown ifFalse:[ ^ self ]. "/ Do not bother if the view is not shown.
 textView isNil ifTrue:[^ self].     "/ happens when shown in UIPainter
 requiredW := self width.
 showLineNumbers ifTrue:[
-lineString := self displayedString:line.
+	lineString := self displayedString:line.
-textW := (lineString widthOn:self).
+	textW := (lineString widthOn:self).
-requiredW := textW + self padding.
+	requiredW := textW + self padding.
-oldFont := self font.
+	oldFont := self font.
-oldColor := self paint.
+	oldColor := self paint.
-newFont := self lineFontForLine:line.
+	newFont := self lineFontForLine:line.
-newFont isNil ifTrue:[
+	newFont isNil ifTrue:[
-newFont := oldFont.
+	    newFont := oldFont.
-newColor := self lineColorForLine:line.
+	    newColor := self lineColorForLine:line.
-newColor ifNotNil:[ self paint:newColor ].
+	    newColor ifNotNil:[ self paint:newColor ].
-].
+	].
-newFont ~~ oldFont ifTrue:[
+	newFont ~~ oldFont ifTrue:[
-"/ ensure that the line number lines are not higher than the text lines
+	    "/ ensure that the line number lines are not higher than the text lines
-(newFont heightOn:device) > (textView font heightOn:device) ifTrue:[
+	    (newFont heightOn:device) > (textView font heightOn:device) ifTrue:[
-newFont := textView font.
+		newFont := textView font.
-].
+	    ].
-newFont ~~ oldFont ifTrue:[
+	    newFont ~~ oldFont ifTrue:[
-self font:newFont
+		self font:newFont
-].
+	    ].
-].
+	].
 ].
 fontAscent := textView font ascentOn:device.
 fontDescent := textView font descentOn:device.
 yTop := (self yOfTextViewLine:line) ? 0.
 yBaseline := yTop + fontAscent.
 cleared ifFalse:[
-self clearRectangleX:0 y:yBaseline - font ascent
+	self clearRectangleX:0 y:yBaseline - font ascent
-width: width - 2
+	    width: width - 2
-height: font ascent + font descent.
+	    height: font ascent + font descent.
 ].
 "/ cg: this should be done differently: services know about the
 "/ gutter, so they should respond to a special drawGutter message.
 "/ otherwise, some redraws become unusably slow (especially
 "/ with multiple fonts/colors/emphases)...
 drawServices ifTrue:[
-"Let services draw annotations and other stuff"
+	"Let services draw annotations and other stuff"
-codeView notNil ifTrue:[
+	codeView notNil ifTrue:[
-codeView
+	    codeView
-drawLine:line in: self
+		drawLine:line in: self
-atX: (self paddingLeft + self usedWidthForAcceptCancel) y:yBaseline width: widthAnnotations height: font height
+		atX: (self paddingLeft + self usedWidthForAcceptCancel) y:yBaseline width: widthAnnotations height: font height
-from:nil to:nil with:self paint and: self backgroundColor.
+		from:nil to:nil with:self paint and: self backgroundColor.
-]
+	]
 ].
 showLineNumbers ifTrue:[
-self
+	self
-displayString:lineString
+	    displayString:lineString
-x:(width - textW - 2 - self paddingRight - widthDiffInfo)
+	    x:(width - textW - 2 - self paddingRight - widthDiffInfo)
-y:yBaseline.
+	    y:yBaseline.
-newFont
+	newFont
-ifNotNil:[
+	    ifNotNil:[
-self font:oldFont.
+		self font:oldFont.
-self paint:oldColor
+		self paint:oldColor
-]
+	    ]
-ifNil:[
+	    ifNil:[
-newColor ifNotNil:[ self paint:oldColor ].
+		newColor ifNotNil:[ self paint:oldColor ].
-].
+	    ].
 ].
+"/ If the view has been cleared here, we have also to redraw corresponding portion
+"/ of accept/cancel bar !!
+cleared ifFalse:[
+	"/ In that case it was cleared above.
+	self redrawAcceptCancelBarX:0 y:yBaseline - font ascent
+	    width: width - 2
+	   height: font ascent + font descent.
+].
 ^ requiredW.
 "Modified: / 14-12-2009 / 15:30:44 / Jindra <a>"
 "Created: / 17-06-2011 / 14:11:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 18-07-2012 / 19:05:24 / cg"
+"Modified: / 28-08-2013 / 15:17:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 redrawLinesFrom:start
 "/ cg: obsolete?
 start to: (textView lastLineShown - 1 min: textView list size) do:[:line|
 reallyModifiedChannel value: false.
 "Created: / 07-10-2011 / 20:32:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
+contents: text clear: clearPrevious
+| savedListOriginal |
+savedListOriginal := listOriginal.
+super contents: text.
+listOriginal := savedListOriginal.
+self updateReallyModified.
+"Created: / 17-02-2012 / 00:35:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
 deletedLines
 ^  deletedLines
 "Modified: / 26-04-2010 / 21:48:23 / Jakub <zelenja7@fel.cvut.cz>"
 !
 ^ emptyLines
 !
 emptyLines:something
 emptyLines := something.
+!
+fontAscent
+^fontAscent notNil ifTrue:[fontAscent] ifFalse:[super fontAscent]
+"Created: / 19-05-2012 / 14:13:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 insertedLines
 ^  insertedLines
 super list:aCollection expandTabs:expand scanForNonStrings:scan includesNonStrings:nonStrings.
 listOriginal := aCollection copy.
 reallyModifiedChannel value: false.
-self notifyLinesModifiedFrom: 1 to: list size.
+"/JV: used to be notifyLines... but that method
+"/    leaves suppressNotifications to true, which is not what
+"/    we want!!
+self updateReallyModified.
+codeView linesModifiedFrom: 1 to: list size.
 "Created: / 08-10-2011 / 12:23:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified (comment): / 03-08-2013 / 13:35:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 setList:aCollection expandTabs:expandTabs redraw:doRedraw
 super setList:aCollection expandTabs:expandTabs redraw:doRedraw.
 listOriginal := aCollection copy.
 reallyModifiedChannel value: false.
-self notifyLinesModifiedFrom: 1 to: list size.
+"/JV: used to be notifyLines... but that method
+"/    leaves suppressNotifications to true, which is not what
+"/    we want!!
+self updateReallyModified.
+codeView linesModifiedFrom: 1 to: list size.
 "Created: / 07-10-2011 / 18:42:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified (comment): / 03-08-2013 / 13:35:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+!CodeView2::TextView methodsFor:'accessing-look'!
+lineSpacing
+^lineSpacing
+"Modified: / 22-05-1996 / 12:22:29 / cg"
+"Created: / 19-03-2012 / 13:22:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !CodeView2::TextView methodsFor:'accessing-state'!
 beUnmodified
 isReallyModified
 ^self reallyModified
 "Created: / 08-10-2011 / 12:52:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+!CodeView2::TextView methodsFor:'bit blitting'!
+copyFrom:aDrawable x:srcX y:srcY toX:dstX y:dstY width:w height:h async:async
+"/ a vertical scroll operation ?
+aDrawable == self ifTrue:[
+	((srcY ~= dstY) and:[srcX = dstX]) ifTrue:[
+	    "/ Do copy in gutter, but not accept-cancel bar!!
+	    | x0 |
+	    x0 := gutterView acceptCancelRight.
+	    gutterView
+		copyFrom:gutterView
+		       x:x0
+		       y:srcY
+		     toX:x0
+		       y:dstY
+		   width:(gutterView width - x0)
+		  height:h
+		   async:false
+	]
+].
+^ super
+	copyFrom:aDrawable x:srcX y:srcY toX:dstX y:dstY width:w height:h async:async
+"Modified (comment): / 10-09-2013 / 03:13:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !CodeView2::TextView methodsFor:'channels'!
 reallyModifiedChannel
 ! !
 !CodeView2::TextView methodsFor:'delegation-events'!
 isQuickMenuModifierPressed
-|sensor|
-sensor := self sensor.
 UserPreferences current codeView2QuickSendersAndImplementorsOnControl ifTrue:[
-^ sensor ctrlDown
+	^ self sensor ctrlDown
 ].
-^ sensor metaDown
+^ self sensor metaDown
-"Modified: / 29-08-2013 / 16:22:30 / cg"
 !
 isQuickMenuModifierReleased
 UserPreferences current codeView2QuickSendersAndImplementorsOnControl ifTrue:[
 ^ self sensor ctrlDown not
 ^ self sensor metaDown not
 ! !
 !CodeView2::TextView methodsFor:'drawing'!
-drawFromVisibleLine:startVisLineNr to:endVisLineNr with:fg and:bg
+backgroundForVisibleLine:visLineNr default:bg
+| lineNr |
-super
-drawFromVisibleLine:startVisLineNr
-to:endVisLineNr
+diffMode ifTrue:[
-with:fg
+	lineNr := self visibleLineToListLine:visLineNr.
-and:bg.
+	(insertedLines notEmptyOrNil and:[insertedLines includes:lineNr]) ifTrue:[
+	    ^self colorInserted
-"/ if in diffmode...
+	].
-self redrawLines.
+	(changedLines notEmptyOrNil and:[changedLines includes:lineNr]) ifTrue:[
+	    ^self colorChanged
-"Created: / 05-04-2010 / 12:08:38 / Jakub <zelenja7@fel.cvut.cz>"
+	].
-"Modified: / 02-05-2010 / 18:46:04 / Jakub <zelenja7@fel.cvut.cz>"
+	(deletedLines notEmptyOrNil and:[deletedLines includes:lineNr]) ifTrue:[
-!
+	    ^self colorDeleted
+	].
-drawLine:line fromX:x inVisible:visLineNr with:fg and:bg
+].
+^ bg
-super
-drawLine:line
+"Modified: / 17-03-2012 / 12:22:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-fromX:x
+!
-inVisible:visLineNr
-with:fg
+drawFromVisibleLine:startVisLineNr to:endVisLineNr with:fg and:bg
-and:bg.
+"draw a visible line range in fg/bg"
-"/ if in diffmode...
+diffMode ifFalse:[
-self redrawLines.
+	super drawFromVisibleLine:startVisLineNr to:endVisLineNr with:fg and:bg.
+	^self.
+].
+startVisLineNr to: endVisLineNr do:[:visLineNr|
+	self drawVisibleLine: visLineNr with:fg and:bg
+]
+"Modified: / 15-12-1999 / 23:19:39 / cg"
+"Created: / 17-03-2012 / 09:44:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+drawLine:line fromX:x inVisible:visLineNr with:fg and:bg
+super
+	drawLine:line
+	fromX:x
+	inVisible:visLineNr
+	with:fg
+	and:(self backgroundForVisibleLine:visLineNr default:bg).
 "Created: / 05-04-2010 / 12:07:07 / Jakub <zelenja7@fel.cvut.cz>"
 "Modified: / 02-05-2010 / 18:46:00 / Jakub <zelenja7@fel.cvut.cz>"
-!
+"Modified: / 17-03-2012 / 10:05:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
-drawLine:lineStringArg inVisible:visLineNr col:col with:fg and:bg
+drawLine:lineStringArg inVisible:visLineNr col:col with:fg and:bg
 super
-drawLine:lineStringArg
+	drawLine:lineStringArg
-inVisible:visLineNr
+	inVisible:visLineNr
-col:col
+	col:col
-with:fg
+	with:fg
-and:bg.
+	and:(self backgroundForVisibleLine:visLineNr default:bg).
-"/ if in diffmode...
-self redrawLines.
 "Created: / 05-04-2010 / 11:49:42 / Jakub <zelenja7@fel.cvut.cz>"
 "Modified: / 02-05-2010 / 18:45:56 / Jakub <zelenja7@fel.cvut.cz>"
-!
+"Modified: / 17-03-2012 / 10:04:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
-drawLine:lineStringArg inVisible:visLineNr from:startCol to:endColOrNil with:fg and:bg
+drawLine:lineStringArg inVisible:visLineNr from:startCol to:endColOrNil with:fg and:bg
 super
-drawLine:lineStringArg
+	drawLine:lineStringArg
-inVisible:visLineNr
+	inVisible:visLineNr
-from:startCol
+	from:startCol
-to:endColOrNil
+	to:endColOrNil
-with:fg
+	with:fg
-and:bg.
+	and:(self backgroundForVisibleLine:visLineNr default:bg).
-"/ if in diffmode...
-self redrawLines.
 "Created: / 05-04-2010 / 11:54:54 / Jakub <zelenja7@fel.cvut.cz>"
 "Modified: / 02-05-2010 / 18:45:52 / Jakub <zelenja7@fel.cvut.cz>"
-!
+"Modified: / 17-03-2012 / 10:04:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
-drawLine:lineString inVisible:visLineNr from:startCol with:fg and:bg
+drawLine:lineString inVisible:visLineNr from:startCol with:fg and:bg
 super
-drawLine:lineString
+	drawLine:lineString
-inVisible:visLineNr
+	inVisible:visLineNr
-from:startCol
+	from:startCol
-with:fg
+	with:fg
-and:bg.
+	and:(self backgroundForVisibleLine:visLineNr default:bg).
-"/ if in diffmode...
-self redrawLines.
 "Created: / 05-04-2010 / 11:54:26 / Jakub <zelenja7@fel.cvut.cz>"
 "Modified: / 02-05-2010 / 18:45:48 / Jakub <zelenja7@fel.cvut.cz>"
-!
+"Modified: / 17-03-2012 / 10:04:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
-drawVisibleLine:visLineNr with:fg and:bg
-super
+drawVisibleLine:visLineNr with:fg and:bg
-drawVisibleLine:visLineNr
+super
-with:fg
+	drawVisibleLine:visLineNr
-and:bg.
+	with:fg
+	and:(self backgroundForVisibleLine:visLineNr default:bg).
-gutterView redrawVisibleLine:visLineNr.
-"/ if in diffmode...
-self redrawLines.
 "Created: / 05-04-2010 / 11:49:42 / Jakub <zelenja7@fel.cvut.cz>"
 "Modified: / 02-05-2010 / 18:45:44 / Jakub <zelenja7@fel.cvut.cz>"
+"Modified: / 17-03-2012 / 10:04:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 redraw
 "/ thisContext fullPrintAll.
 super redraw.
 "redraw diff lines"
 |i pom|
 diffMode ifFalse:[^self].
+true ifTrue:[^self].
 pom := self hasSelection.
 (pom) ifTrue:[ ^ self. ].
 i := 1.
 [
-i <= (deletedLines size)
+	i <= (deletedLines size)
 ] whileTrue:[
-((deletedLines at:i) > 0) ifTrue:[
+	((deletedLines at:i) > 0) ifTrue:[
-super
+	    super
-drawVisibleLine:(deletedLines at:i)
+		drawVisibleLine:(deletedLines at:i)
-with:fgColor
+		with:fgColor
-and:self colorDeleted.
+		and:self colorDeleted.
-].
+	].
-i := i + 1.
+	i := i + 1.
 ].
 i := 1.
 [
-i <= (insertedLines size)
+	i <= (insertedLines size)
 ] whileTrue:[
-((insertedLines at:i) > 0) ifTrue:[
+	((insertedLines at:i) > 0) ifTrue:[
-super
+	    super
-drawVisibleLine:(insertedLines at:i)
+		drawVisibleLine:(insertedLines at:i)
-with:fgColor
+		with:fgColor
-and:self colorInserted.
+		and:self colorInserted.
-].
+	].
-i := i + 1.
+	i := i + 1.
 ].
 i := 1.
 [
-i <= (changedLines size)
+	i <= (changedLines size)
 ] whileTrue:[
-((changedLines at:i) > 0) ifTrue:[
+	((changedLines at:i) > 0) ifTrue:[
-super
+	    super
-drawVisibleLine:(changedLines at:i)
+		drawVisibleLine:(changedLines at:i)
-with:fgColor
+		with:fgColor
-and:self colorChanged.
+		and:self colorChanged.
-].
+	].
-i := i + 1.
+	i := i + 1.
 ].
 "Created: / 26-04-2010 / 21:04:31 / Jakub <zelenja7@fel.cvut.cz>"
 "Modified: / 22-06-2010 / 23:28:30 / Jakub <zelenja7@fel.cvut.cz>"
-"Modified: / 08-04-2011 / 20:52:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 17-03-2012 / 09:27:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !CodeView2::TextView methodsFor:'editing'!
 contentsChanged
 | lang |
 lang := codeView language.
 "Bit hacky here, should ask language some language toolbox
 for formatting helper, that should do it..."
 (lang notNil and:[lang isSmalltalk]) ifTrue:[
-| line lineNo indent |
+	| line lineNo indent |
-lineNo := lineNr.
+	lineNo := lineNr.
-[lineNo ~~ 1] whileTrue:[
+	[lineNo ~~ 1] whileTrue:[
-lineNo  := lineNo - 1.
+	    lineNo  := lineNo - 1.
-line := self listAt:lineNo.
+	    line := self listAt:lineNo.
-line notNil ifTrue:[
+	    line notNil ifTrue:[
-indent := line indexOfNonSeparatorStartingAt:1.
+		indent := line indexOfNonSeparatorStartingAt:1.
-"beggining of block"
+		"beggining od block"
-line notEmptyOrNil ifTrue:[
+		line notEmptyOrNil ifTrue:[
-line last == $[ ifTrue:[
+		    line last == $[ ifTrue:[
-indent := indent + 4.
+			indent := indent + 4.
-] ifFalse:[
+		    ] ifFalse:[
-"end of block args"
+			"end of block args"
-(line last == $| and: [line includes: $[]) ifTrue:[
+			(line last == $| and: [line includes: $[]) ifTrue:[
-indent := indent + 4.
+			    indent := indent + 4.
-]
+			]
-].
+		    ].
-].
+		].
-indent ~~ 0 ifTrue:[
+		indent ~~ 0 ifTrue:[
-^ indent - 1
+		^ indent - 1
-]
+		]
-]
+	    ]
-].
+	].
-^0.
+	^0.
 ].
 ^super leftIndentForLine:lineNr
 "Created: / 10-12-2011 / 11:02:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 changedDiffText := true.
 diffMode := false.
 suppressNotifications := false.
 reallyModifiedChannel := false asValue.
+autoIndent := UserPreferences current codeView2AutoIndent.
 self enableMotionEvents.
 "Created: / 23-06-2010 / 17:28:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 06-07-2011 / 17:46:31 / jv"
 "Modified: / 21-08-2011 / 10:09:29 / cg"
-"Modified: / 07-10-2011 / 19:22:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 15-07-2013 / 13:15:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 setCodeView: aCodeView2
 codeView := aCodeView2.
 "Created: / 06-04-2010 / 14:03:28 / Jakub <zelenja7@fel.cvut.cz>"
 "Modified: / 02-05-2010 / 19:29:23 / Jakub <zelenja7@fel.cvut.cz>"
 !
+basicScrollTo:anOrigin redraw:doRedraw
+super scrollTo:anOrigin redraw:doRedraw
+"Modified: / 06-04-2010 / 14:05:40 / Jakub <zelenja7@fel.cvut.cz>"
+"Modified: / 17-03-2012 / 10:06:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Created: / 19-03-2012 / 17:01:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
 basicScrollUp:nLines
 |i|
 (scrolled isNil) ifTrue:[
 scrolled := false.
 self basicScrollDown: nLines.
 "Modified: / 06-04-2010 / 14:04:28 / Jakub <zelenja7@fel.cvut.cz>"
 !
+scrollTo:anOrigin redraw:doRedraw
+codeView scrollTo:anOrigin redraw:doRedraw in: self.
+self basicScrollTo:anOrigin redraw:doRedraw
+"Modified: / 06-04-2010 / 14:04:28 / Jakub <zelenja7@fel.cvut.cz>"
+"Modified: / 17-03-2012 / 10:06:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Created: / 19-03-2012 / 17:05:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
 scrollUp:nLines
 codeView scrollUp: nLines in: self.
 self basicScrollUp: nLines.
 ! !
 !CodeView2 class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.129 2013-10-09 16:16:02 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.130 2014-02-05 18:56:57 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.129 2013-10-09 16:16:02 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.130 2014-02-05 18:56:57 cg Exp $'
 !
 version_SVN
-^ '$Id: Tools__CodeView2.st,v 1.129 2013-10-09 16:16:02 cg Exp $'
+^ '$Id: Tools__CodeView2.st,v 1.130 2014-02-05 18:56:57 cg Exp $'
 ! !
 CodeView2 initialize!

changeset 13813	576b071baeea
parent 13625	33f926cd64ff
child 13936	93271eb5f45b