Tools__CodeHighlightingService.st
author vrany
Wed, 28 Sep 2011 01:28:42 +0200
changeset 10729 f4109bfaad31
parent 10721 6813188d742b
child 10954 ba2dc0bd7290
permissions -rw-r--r--
fix in #syntaxHighlighter
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     1
"
10077
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
     2
 COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
10440
ad79e93dc9b7 no need to access BackgroundJob via Smalltalk - the bug
Claus Gittinger <cg@exept.de>
parents: 10439
diff changeset
     3
	      All Rights Reserved
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     4
10077
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
     5
Permission is hereby granted, free of charge, to any person
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
     6
obtaining a copy of this software and associated documentation
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
     7
files (the 'Software'), to deal in the Software without
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
     8
restriction, including without limitation the rights to use,
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
     9
copy, modify, merge, publish, distribute, sublicense, and/or sell
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    10
copies of the Software, and to permit persons to whom the
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    11
Software is furnished to do so, subject to the following
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    12
conditions:
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    13
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    14
The above copyright notice and this permission notice shall be
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    15
included in all copies or substantial portions of the Software.
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    16
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    17
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    18
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    19
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    20
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    21
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    22
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    23
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    24
OTHER DEALINGS IN THE SOFTWARE.
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    25
"
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    26
"{ Package: 'stx:libtool' }"
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    27
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    28
"{ NameSpace: Tools }"
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    29
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    30
CodeViewService subclass:#CodeHighlightingService
10710
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
    31
	instanceVariableNames:'job done modified'
10439
6a41520db1be variable renamed in: #initialize
Claus Gittinger <cg@exept.de>
parents: 10438
diff changeset
    32
	classVariableNames:''
6a41520db1be variable renamed in: #initialize
Claus Gittinger <cg@exept.de>
parents: 10438
diff changeset
    33
	poolDictionaries:''
6a41520db1be variable renamed in: #initialize
Claus Gittinger <cg@exept.de>
parents: 10438
diff changeset
    34
	category:'Interface-CodeView'
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    35
!
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    36
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    37
!CodeHighlightingService class methodsFor:'documentation'!
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    38
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    39
copyright
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    40
"
10077
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    41
 COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
10440
ad79e93dc9b7 no need to access BackgroundJob via Smalltalk - the bug
Claus Gittinger <cg@exept.de>
parents: 10439
diff changeset
    42
	      All Rights Reserved
10077
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    43
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    44
Permission is hereby granted, free of charge, to any person
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    45
obtaining a copy of this software and associated documentation
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    46
files (the 'Software'), to deal in the Software without
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    47
restriction, including without limitation the rights to use,
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    48
copy, modify, merge, publish, distribute, sublicense, and/or sell
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    49
copies of the Software, and to permit persons to whom the
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    50
Software is furnished to do so, subject to the following
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    51
conditions:
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    52
10077
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    53
The above copyright notice and this permission notice shall be
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    54
included in all copies or substantial portions of the Software.
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    55
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    56
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    57
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    58
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    59
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    60
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    61
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    62
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
d2b07a20c425 changed: #copyright
Claus Gittinger <cg@exept.de>
parents: 9980
diff changeset
    63
OTHER DEALINGS IN THE SOFTWARE.
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    64
"
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    65
! !
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    66
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    67
!CodeHighlightingService class methodsFor:'accessing'!
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    68
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    69
label
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    70
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    71
    "Answers short label - for UI"
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    72
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    73
    ^'Syntax Highlighting'
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    74
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    75
    "Created: / 07-03-2010 / 14:00:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    76
! !
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    77
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
    78
!CodeHighlightingService methodsFor:'accessing'!
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
    79
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
    80
syntaxHighlighter
10721
6813188d742b comment/format in: #initialize
Claus Gittinger <cg@exept.de>
parents: 10710
diff changeset
    81
    | app lang highlighter |
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
    82
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
    83
    "First, ask application..."
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
    84
    app := codeView application.
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
    85
    app notNil ifTrue:[
10721
6813188d742b comment/format in: #initialize
Claus Gittinger <cg@exept.de>
parents: 10710
diff changeset
    86
        | mthd class |
6813188d742b comment/format in: #initialize
Claus Gittinger <cg@exept.de>
parents: 10710
diff changeset
    87
6813188d742b comment/format in: #initialize
Claus Gittinger <cg@exept.de>
parents: 10710
diff changeset
    88
        mthd := codeView methodHolder value.
6813188d742b comment/format in: #initialize
Claus Gittinger <cg@exept.de>
parents: 10710
diff changeset
    89
        class := codeView classHolder value.
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
    90
        (mthd notNil and:[app respondsTo: #syntaxHighlighterForMethod:]) ifTrue:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
    91
            highlighter := app syntaxHighlighterForMethod:mthd.
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
    92
        ] ifFalse:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
    93
            (class notNil and:[app respondsTo: #syntaxHighlighterForClass:]) ifTrue:[                        
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
    94
                highlighter := app syntaxHighlighterForClass: class.
10721
6813188d742b comment/format in: #initialize
Claus Gittinger <cg@exept.de>
parents: 10710
diff changeset
    95
            ] ifFalse:[
6813188d742b comment/format in: #initialize
Claus Gittinger <cg@exept.de>
parents: 10710
diff changeset
    96
                (class notNil and:[app respondsTo: #syntaxHighlighter]) ifTrue:[                        
6813188d742b comment/format in: #initialize
Claus Gittinger <cg@exept.de>
parents: 10710
diff changeset
    97
                    highlighter := app syntaxHighlighterClass.
6813188d742b comment/format in: #initialize
Claus Gittinger <cg@exept.de>
parents: 10710
diff changeset
    98
                ].
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
    99
            ].
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   100
        ]
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   101
    ].
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   102
    "App did not provide any highlighter..."
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   103
    highlighter isNil ifTrue:[        
10729
f4109bfaad31 fix in #syntaxHighlighter
vrany
parents: 10721
diff changeset
   104
        highlighter := (lang := codeView language)
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   105
                ifNil:[nil]
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   106
                ifNotNil:[lang syntaxHighlighterClass].
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   107
    ].
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   108
    "HACK!!!!!!"
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   109
    highlighter == SyntaxHighlighter ifTrue:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   110
        highlighter := SyntaxHighlighter2
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   111
    ].
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   112
    ^ highlighter
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   113
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   114
    "Created: / 05-08-2011 / 10:48:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10721
6813188d742b comment/format in: #initialize
Claus Gittinger <cg@exept.de>
parents: 10710
diff changeset
   115
    "Modified: / 26-09-2011 / 15:50:10 / cg"
10729
f4109bfaad31 fix in #syntaxHighlighter
vrany
parents: 10721
diff changeset
   116
    "Modified: / 28-09-2011 / 00:23:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   117
!
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   118
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   119
syntaxHighlighters
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   120
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   121
    | highlighters |
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   122
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   123
    highlighters := OrderedCollection new: 4.
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   124
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   125
    codeView services do:[:service|
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   126
        | highlighter |
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   127
        highlighter := service syntaxHighlighter.        
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   128
        highlighter notNil ifTrue:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   129
            "HACK, since AbstractSyntaxHighlighter overwrite
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   130
             emphasis instead of adding it..."
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   131
            (highlighter isKindOf: AbstractSyntaxHighlighter class) ifTrue:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   132
                highlighters addFirst: highlighter                    
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   133
            ] ifFalse:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   134
                highlighters add: highlighter
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   135
            ].
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   136
        ]
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   137
    ].
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   138
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   139
    ^highlighters
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   140
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   141
    "Created: / 05-08-2011 / 10:49:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   142
! !
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   143
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   144
!CodeHighlightingService methodsFor:'change & update'!
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   145
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   146
update: aspect with: param from: sender
10701
741e06a3136f changed: #update:with:from:
Claus Gittinger <cg@exept.de>
parents: 10660
diff changeset
   147
    textView notNil ifTrue:[
10710
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   148
        "/sender == textView modifiedChannel ifTrue:[^self codeChanged: false].
10701
741e06a3136f changed: #update:with:from:
Claus Gittinger <cg@exept.de>
parents: 10660
diff changeset
   149
        sender == textView model ifTrue:[^self codeChanged: true].
10710
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   150
        (sender == textView and:[aspect == #sizeOfContents]) ifTrue:[^self codeChanged: true].
10701
741e06a3136f changed: #update:with:from:
Claus Gittinger <cg@exept.de>
parents: 10660
diff changeset
   151
    ].
741e06a3136f changed: #update:with:from:
Claus Gittinger <cg@exept.de>
parents: 10660
diff changeset
   152
    codeView notNil ifTrue:[
741e06a3136f changed: #update:with:from:
Claus Gittinger <cg@exept.de>
parents: 10660
diff changeset
   153
        sender == codeView languageHolder ifTrue:[^self codeChanged: true].
741e06a3136f changed: #update:with:from:
Claus Gittinger <cg@exept.de>
parents: 10660
diff changeset
   154
        sender == codeView classHolder ifTrue:[^self codeChanged: true].
741e06a3136f changed: #update:with:from:
Claus Gittinger <cg@exept.de>
parents: 10660
diff changeset
   155
    ].
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   156
    super update: aspect with: param from: sender
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   157
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   158
    "Created: / 06-03-2010 / 19:38:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10701
741e06a3136f changed: #update:with:from:
Claus Gittinger <cg@exept.de>
parents: 10660
diff changeset
   159
    "Modified: / 13-09-2011 / 12:00:29 / cg"
10710
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   160
    "Modified: / 16-09-2011 / 17:30:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   161
! !
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   162
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   163
!CodeHighlightingService methodsFor:'event handling'!
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   164
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   165
linesDeletedFrom: start to: end
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   166
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   167
    self codeChanged: true
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   168
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   169
    "Created: / 06-07-2011 / 17:14:36 / jv"
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   170
    "Created: / 16-09-2011 / 15:18:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   171
!
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   172
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   173
linesInsertedFrom: start to: end
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   174
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   175
    self codeChanged: true
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   176
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   177
    "Created: / 06-07-2011 / 17:14:36 / jv"
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   178
    "Created: / 16-09-2011 / 15:18:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   179
!
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   180
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   181
linesModifiedFrom: start to: end
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   182
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   183
    self codeChanged: true
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   184
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   185
    "Created: / 06-07-2011 / 17:14:36 / jv"
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   186
    "Created: / 16-09-2011 / 15:15:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   187
! !
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   188
10420
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   189
!CodeHighlightingService methodsFor:'initialization'!
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   190
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   191
initialize
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   192
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   193
    job := (Smalltalk at:#BackgroundJob)
10721
6813188d742b comment/format in: #initialize
Claus Gittinger <cg@exept.de>
parents: 10710
diff changeset
   194
                named: 'Syntax Highlighting Job'
6813188d742b comment/format in: #initialize
Claus Gittinger <cg@exept.de>
parents: 10710
diff changeset
   195
                on:[self syntaxHighlight: true].
10420
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   196
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   197
    "Created: / 29-07-2011 / 10:31:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10439
6a41520db1be variable renamed in: #initialize
Claus Gittinger <cg@exept.de>
parents: 10438
diff changeset
   198
    "Modified: / 03-08-2011 / 16:47:53 / cg"
10721
6813188d742b comment/format in: #initialize
Claus Gittinger <cg@exept.de>
parents: 10710
diff changeset
   199
    "Modified (format): / 26-09-2011 / 15:39:56 / cg"
10420
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   200
! !
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   201
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   202
!CodeHighlightingService methodsFor:'private'!
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   203
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   204
codeChanged: force
10660
4b97f38f9a0f comment/format in: #codeChanged:
Claus Gittinger <cg@exept.de>
parents: 10650
diff changeset
   205
    (force or:[codeView textView modified]) ifTrue:[
4b97f38f9a0f comment/format in: #codeChanged:
Claus Gittinger <cg@exept.de>
parents: 10650
diff changeset
   206
        self syntaxHighlight
4b97f38f9a0f comment/format in: #codeChanged:
Claus Gittinger <cg@exept.de>
parents: 10650
diff changeset
   207
    ].
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   208
10420
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   209
    "Modified: / 29-07-2011 / 11:07:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10650
fccac41fd387 comment/format in: #syntaxHighlight:
Claus Gittinger <cg@exept.de>
parents: 10644
diff changeset
   210
    "Modified: / 22-08-2011 / 13:51:53 / cg"
10660
4b97f38f9a0f comment/format in: #codeChanged:
Claus Gittinger <cg@exept.de>
parents: 10650
diff changeset
   211
    "Modified (format): / 05-09-2011 / 05:06:40 / cg"
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   212
!
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   213
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   214
setHighlightedCode:newCode elements: elements
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   215
    "the background synhighlighter has generated new colored text,
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   216
     with highlighted syntax.
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   217
     If there have been no modifications in the meantime, install it."
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   218
10420
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   219
    |firstShown lastShown cursorWasOn anyChange newLines l replaceAction list|
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   220
10710
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   221
    "textView" modified ifTrue:[
10634
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   222
        "/ new input arrived in the meantime
10420
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   223
10634
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   224
        ^ self
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   225
    ].
10420
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   226
    done  ifFalse:[
10634
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   227
        "/ another coloring process has already been started.
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   228
        "/ ignore this (leftover) code.
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   229
        ^ self
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   230
    ].
10710
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   231
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   232
    firstShown := textView firstLineShown.
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   233
    lastShown := textView lastLineShown.
10634
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   234
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   235
    replaceAction := [:lNr :line |
10634
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   236
            |oldLine|
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   237
10710
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   238
            oldLine :=  list at:lNr ifAbsent:nil.
10634
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   239
            oldLine notNil ifTrue:[
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   240
                line notNil ifTrue:[
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   241
                    "/ this check is needed - there is a race
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   242
                    "/ when the text is converted. This detects the
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   243
                    "/ resulting error.
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   244
                    "/ Certainly a kludge.
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   245
10634
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   246
                    oldLine string = line string ifTrue:[
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   247
                        oldLine emphasis ~= line emphasis ifTrue:[
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   248
                            textView modifiedChannel removeDependent:self.
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   249
                            list at:lNr put:line.
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   250
                            textView modifiedChannel addDependent:self.
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   251
                            (lNr between:firstShown and:lastShown) ifTrue:[
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   252
                                anyChange ifFalse:[
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   253
                                    anyChange := true.
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   254
                                    cursorWasOn := textView hideCursor
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   255
                                ].
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   256
                                textView redrawLine:lNr
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   257
                            ]
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   258
                        ]
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   259
                    ]
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   260
                ]
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   261
            ]
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   262
        ].
10234
7cdbded1e728 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10151
diff changeset
   263
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   264
    anyChange := false.
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   265
    newLines := newCode asStringCollection.
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   266
    list := textView list.
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   267
    list isNil ifTrue:[
10634
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   268
        textView list:newLines.
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   269
    ] ifFalse:[
10634
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   270
        "/ the cursor line first - that's where your eyes are ...
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   271
        (l := textView cursorLine) notNil ifTrue:[
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   272
            l <= newLines size ifTrue:[
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   273
                replaceAction value:l value:(newLines at:l)
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   274
            ]
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   275
        ].
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   276
        newLines keysAndValuesDo:replaceAction.
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   277
        anyChange ifTrue:[
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   278
            cursorWasOn ifTrue:[
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   279
                textView showCursor
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   280
            ]
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   281
        ]
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   282
    ].
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   283
    codeView syntaxElements: elements
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   284
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   285
    "Modified: / 09-10-2006 / 11:50:17 / cg"
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   286
    "Created: / 14-02-2010 / 16:10:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10634
9db32390ac37 comment/format in: #setHighlightedCode:elements:
Claus Gittinger <cg@exept.de>
parents: 10497
diff changeset
   287
    "Modified (format): / 21-08-2011 / 09:38:22 / cg"
10710
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   288
    "Modified: / 16-09-2011 / 17:33:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   289
!
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   290
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   291
showInfo: aString
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   292
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   293
    codeView showInfo: aString
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   294
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   295
    "Created: / 06-03-2010 / 19:34:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   296
!
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   297
10420
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   298
syntaxHighlight
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   299
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   300
    |highlighters prio |
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   301
10721
6813188d742b comment/format in: #initialize
Claus Gittinger <cg@exept.de>
parents: 10710
diff changeset
   302
    (highlighters := self syntaxHighlighters) isEmptyOrNil ifTrue:[
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   303
        "No higlighter, nothing to do"
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   304
        ^self
10420
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   305
    ].
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   306
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   307
    "/ this clobbers the codeViews modified state; therefore, we have to remember
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   308
    "/ this info somewhere ...
10244
9dac22861b94 Attempt to fix the accept/cancel bar - no success.
vrany
parents: 10234
diff changeset
   309
    codeView browser ifNotNil:[
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   310
        textView modified ifTrue:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   311
            codeView browser navigationState realModifiedState: true
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   312
        ].
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   313
        textView modifiedChannel setValue:false.
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   314
    ].
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   315
10420
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   316
    job scheduled ifTrue:[
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   317
        job running ifFalse:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   318
            "/ process already created, but did not get a change to start yet;
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   319
            ^ self
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   320
        ] ifTrue:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   321
            job stop.
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   322
        ]
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   323
    ].
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   324
    prio := Processor userBackgroundPriority - 1.
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   325
    textView shown ifFalse:[
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   326
        prio := prio - 1 max:1
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   327
    ].
10149
d390c010293f changed:
Claus Gittinger <cg@exept.de>
parents: 10077
diff changeset
   328
10420
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   329
    job startWithPriority: prio.
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   330
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   331
    "Modified: / 07-07-2011 / 12:26:12 / Jan Vrany <jan.vrant@fit.cvut,cz>"
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   332
    "Created: / 29-07-2011 / 11:07:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10721
6813188d742b comment/format in: #initialize
Claus Gittinger <cg@exept.de>
parents: 10710
diff changeset
   333
    "Modified: / 26-09-2011 / 15:40:23 / cg"
10420
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   334
!
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   335
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   336
syntaxHighlight: delayed
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   337
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   338
    |oldCode oldCodeList newCode elements cls mthd highlighterClasses|
10420
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   339
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   340
    done := false.
10710
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   341
    modified := false.
10420
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   342
    codeView syntaxElements: nil.
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   343
    codeView syntaxElementSelection: nil.
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   344
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   345
    highlighterClasses := self syntaxHighlighters.
10149
d390c010293f changed:
Claus Gittinger <cg@exept.de>
parents: 10077
diff changeset
   346
10420
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   347
    cls := codeView klass.
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   348
    (cls notNil and:[cls isObsolete]) ifTrue:[
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   349
        cls isMeta ifTrue:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   350
            cls := (Smalltalk at:cls theNonMetaclass name) class
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   351
        ] ifFalse:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   352
            cls := Smalltalk at:cls name
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   353
        ].
10420
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   354
    ].
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   355
    mthd := codeView methodHolder value.
10149
d390c010293f changed:
Claus Gittinger <cg@exept.de>
parents: 10077
diff changeset
   356
10710
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   357
    "textView" modified ifFalse:[
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   358
        oldCodeList := textView list copy.
10710
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   359
        "textView" modified ifFalse:[
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   360
            oldCodeList isNil ifFalse:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   361
                oldCode := oldCodeList asStringWithoutEmphasis.
10710
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   362
                "textView" modified ifFalse:[
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   363
                    Screen currentScreenQuerySignal answer:codeView device
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   364
                    do:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   365
                        Parser::ParseError handle:[:ex |
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   366
                            |errMsg|
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   367
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   368
                            errMsg := ex description asStringCollection first asString.
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   369
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   370
                            "/ Transcript topView raiseDeiconified.
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   371
                            "/ Transcript showCR:'ParseError: ', ex description.
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   372
"/ self halt.
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   373
                            "/ self showInfo:(errMsg colorizeAllWith:Color red).
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   374
                            newCode := nil.
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   375
                        ] do:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   376
                            elements := SortedCollection new.
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   377
                            newCode := oldCode asText.
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   378
                            codeView codeAspect == #method ifTrue:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   379
                                highlighterClasses do:[:e|newCode := e formatMethod:mthd source:newCode in:cls using: nil elementsInto: elements].
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   380
                            ] ifFalse:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   381
                                codeView codeAspect == #expression ifTrue:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   382
                                    highlighterClasses do:[:e|newCode := e formatExpression:newCode in:cls elementsInto: elements].
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   383
                                ] ifFalse:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   384
                                    codeView codeAspect == #classDefinition ifTrue:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   385
                                        highlighterClasses do:[:e|newCode := e formatClassDefinition:newCode in:cls elementsInto: elements].
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   386
                                    ]
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   387
                                ].
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   388
                            ].
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   389
                        ]
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   390
                    ].
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   391
                    newCode notNil ifTrue:[
10710
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   392
                        "textView" modified ifFalse:[
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   393
                            newCode ~= oldCodeList ifTrue:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   394
                                newCode := newCode asStringCollection.
10710
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   395
                                "textView" modified ifFalse:[
10486
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   396
                                    done := true.
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   397
                                    textView notNil ifTrue:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   398
                                        "/ must add this event - and not been interrupted
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   399
                                        "/ by any arriving key-event.
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   400
                                        "/ self showInfo:nil.
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   401
                                        delayed ifTrue:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   402
                                            codeView sensor
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   403
                                                pushUserEvent:#setHighlightedCode:elements:
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   404
                                                for:self
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   405
                                                withArguments:(Array with:newCode with: elements).
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   406
                                                "/self delayedUpdateBufferLabelWithCheckIfModified
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   407
                                        ] ifFalse:[
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   408
                                            textView contents: newCode.
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   409
                                        ]
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   410
                                    ]
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   411
                                ]
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   412
                            ].
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   413
                        ]
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   414
                    ]
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   415
                ]
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   416
            ]
ecf02903122f SmallLint UI improvements
vrany
parents: 10440
diff changeset
   417
        ]
10420
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   418
    ]
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   419
10420
ed96d3da2be7 - CodeHighlightingService refactored to use
vrany
parents: 10410
diff changeset
   420
    "Created: / 29-07-2011 / 11:01:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10650
fccac41fd387 comment/format in: #syntaxHighlight:
Claus Gittinger <cg@exept.de>
parents: 10644
diff changeset
   421
    "Modified: / 22-08-2011 / 14:17:47 / cg"
10710
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   422
    "Modified: / 16-09-2011 / 17:01:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   423
! !
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   424
10410
0d8eaf28b7a9 Fixes for debugger
vrany
parents: 10353
diff changeset
   425
!CodeHighlightingService methodsFor:'registering'!
0d8eaf28b7a9 Fixes for debugger
vrany
parents: 10353
diff changeset
   426
0d8eaf28b7a9 Fixes for debugger
vrany
parents: 10353
diff changeset
   427
registerIn: aCodeView
0d8eaf28b7a9 Fixes for debugger
vrany
parents: 10353
diff changeset
   428
0d8eaf28b7a9 Fixes for debugger
vrany
parents: 10353
diff changeset
   429
    super registerIn: aCodeView.
10710
5aa37ab3189e Fixes for syntax highlighting and code navigation. Now it should work fine debugger.
vrany
parents: 10701
diff changeset
   430
    textView addDependent: self.
10410
0d8eaf28b7a9 Fixes for debugger
vrany
parents: 10353
diff changeset
   431
0d8eaf28b7a9 Fixes for debugger
vrany
parents: 10353
diff changeset
   432
    "Created: / 27-07-2011 / 13:25:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0d8eaf28b7a9 Fixes for debugger
vrany
parents: 10353
diff changeset
   433
! !
0d8eaf28b7a9 Fixes for debugger
vrany
parents: 10353
diff changeset
   434
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   435
!CodeHighlightingService class methodsFor:'documentation'!
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   436
10497
aab867178a6f fixes for code highlighting
vrany
parents: 10486
diff changeset
   437
version
10729
f4109bfaad31 fix in #syntaxHighlighter
vrany
parents: 10721
diff changeset
   438
    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeHighlightingService.st,v 1.25 2011-09-27 23:28:42 vrany Exp $'
10497
aab867178a6f fixes for code highlighting
vrany
parents: 10486
diff changeset
   439
!
aab867178a6f fixes for code highlighting
vrany
parents: 10486
diff changeset
   440
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   441
version_CVS
10729
f4109bfaad31 fix in #syntaxHighlighter
vrany
parents: 10721
diff changeset
   442
    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeHighlightingService.st,v 1.25 2011-09-27 23:28:42 vrany Exp $'
9980
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   443
!
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   444
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   445
version_SVN
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   446
    ^ '§Id: Tools__CodeHighlightingService.st 7715 2011-04-10 16:32:58Z vranyj1 §'
cf0d7a8b54e9 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   447
! !