author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Fri, 06 Sep 2013 00:16:38 +0100 | |
branch | development |
changeset 2711 | a00302fe5083 |
parent 2708 | 648286432b9a |
child 2731 | 13f5be2bf83b |
permissions | -rw-r--r-- |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1 |
" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
2 |
COPYRIGHT (c) 1996-2011 by Claus Gittinger |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
3 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
4 |
New code and modifications done at SWING Research Group [1]: |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
5 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
6 |
COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
7 |
SWING Research Group, Czech Technical University in Prague |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
8 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
9 |
This software is furnished under a license and may be used |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
10 |
only in accordance with the terms of that license and with the |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
11 |
inclusion of the above copyright notice. This software may not |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
12 |
be provided or otherwise made available to, or used by, any |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
13 |
other person. No title to or ownership of the software is |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
14 |
hereby transferred. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
15 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
16 |
[1] Code written at SWING Research Group contains a signature |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
17 |
of one of the above copright owners. For exact set of such code, |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
18 |
see the differences between this version and version stx:libjava |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
19 |
as of 1.9.2010 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
20 |
" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
21 |
"{ Package: 'stx:libjava/tools' }" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
22 |
|
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
23 |
Object subclass:#JavaSourceHighlighter |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
24 |
instanceVariableNames:'preferences cachedStringEmphasis cachedStringColor sourceText |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
25 |
sourceIndex' |
2707
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
26 |
classVariableNames:'' |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
27 |
poolDictionaries:'' |
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
28 |
category:'Languages-Java-Tools-Source' |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
29 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
30 |
|
2707
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
31 |
Object subclass:#Marker |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
32 |
instanceVariableNames:'highlighter' |
2707
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
33 |
classVariableNames:'MARK_KEYWORD MARK_NUMBER MARK_STRING MARK_CHARACTER MARK_COMMENT |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
34 |
MARK_JAVADOC MARK_KEYWORD_FLOW' |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
35 |
poolDictionaries:'' |
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
36 |
privateIn:JavaSourceHighlighter |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
37 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
38 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
39 |
JavaScanner subclass:#Scanner |
2703 | 40 |
instanceVariableNames:'buffer bufferFirst bufferLast highlighter' |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
41 |
classVariableNames:'' |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
42 |
poolDictionaries:'' |
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
43 |
privateIn:JavaSourceHighlighter |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
44 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
45 |
|
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
46 |
!JavaSourceHighlighter class methodsFor:'documentation'! |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
47 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
48 |
copyright |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
49 |
" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
50 |
COPYRIGHT (c) 1996-2011 by Claus Gittinger |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
51 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
52 |
New code and modifications done at SWING Research Group [1]: |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
53 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
54 |
COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
55 |
SWING Research Group, Czech Technical University in Prague |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
56 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
57 |
This software is furnished under a license and may be used |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
58 |
only in accordance with the terms of that license and with the |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
59 |
inclusion of the above copyright notice. This software may not |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
60 |
be provided or otherwise made available to, or used by, any |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
61 |
other person. No title to or ownership of the software is |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
62 |
hereby transferred. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
63 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
64 |
[1] Code written at SWING Research Group contains a signature |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
65 |
of one of the above copright owners. For exact set of such code, |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
66 |
see the differences between this version and version stx:libjava |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
67 |
as of 1.9.2010 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
68 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
69 |
" |
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
70 |
! |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
71 |
|
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
72 |
documentation |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
73 |
" |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
74 |
A syntax highligter for Java. This highlighter is SmallSense-aware and |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
75 |
supports incremental highlighting. |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
76 |
|
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
77 |
[author:] |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
78 |
Jan Vrany <jan.vrany@fit.cvut.cz> |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
79 |
|
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
80 |
[instance variables:] |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
81 |
|
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
82 |
[class variables:] |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
83 |
|
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
84 |
[see also:] |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
85 |
|
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
86 |
" |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
87 |
! ! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
88 |
|
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
89 |
!JavaSourceHighlighter class methodsFor:'formatting'! |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
90 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
91 |
formatClass: javaClass |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
92 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
93 |
^self new formatClassDefinition: javaClass source in: javaClass |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
94 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
95 |
"Created: / 15-12-2011 / 21:54:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
96 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
97 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
98 |
formatClassDefinition:source in:class |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
99 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
100 |
^self new formatClassDefinition:source in:class |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
101 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
102 |
"Created: / 04-08-2011 / 23:44:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
103 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
104 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
105 |
formatClassDefinition:source in:class elementsInto: elements |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
106 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
107 |
^self new formatClassDefinition:source in:class elementsInto: elements |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
108 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
109 |
"Created: / 04-08-2011 / 23:44:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
110 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
111 |
|
2641
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
112 |
formatClassDefinition:newCode line: ln number: lnr in:cls |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
113 |
^self new formatClassDefinition:newCode line: ln number: lnr in:cls. |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
114 |
|
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
115 |
"Created: / 04-08-2013 / 00:25:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
116 |
! |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
117 |
|
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
118 |
formatExpression:source in:class |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
119 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
120 |
^self new formatExpression:source in:class |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
121 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
122 |
"Created: / 04-08-2011 / 23:45:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
123 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
124 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
125 |
formatExpression:source in:class elementsInto: elements |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
126 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
127 |
^self new formatExpression:source in:class elementsInto: elements |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
128 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
129 |
"Created: / 04-08-2011 / 23:43:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
130 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
131 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
132 |
formatMethod:mth source:source in:class |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
133 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
134 |
^self formatMethod: mth source: source in: class using: UserPreferences current |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
135 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
136 |
"Created: / 11-02-2012 / 18:18:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
137 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
138 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
139 |
formatMethod:mth source:source in:class using: preferences |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
140 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
141 |
^self new formatMethod:mth source:source in:class using: preferences |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
142 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
143 |
"Created: / 04-08-2011 / 23:45:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
144 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
145 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
146 |
formatMethod:mth source:source in:class using: preferences elementsInto: elements |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
147 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
148 |
^self new formatMethod:mth source:source in:class using: preferences elementsInto: elements |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
149 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
150 |
"Created: / 04-08-2011 / 23:42:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2641
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
151 |
! |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
152 |
|
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
153 |
formatMethod:mthd source:newCode line: ln number: lnr in:cls using:syntaxPreferences |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
154 |
^ self new formatMethod:mthd source:newCode line: ln number: lnr in:cls using:syntaxPreferences |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
155 |
|
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
156 |
"Created: / 04-08-2013 / 00:26:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
157 |
! ! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
158 |
|
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
159 |
!JavaSourceHighlighter methodsFor:'formatting'! |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
160 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
161 |
formatClassDefinition:source in:class |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
162 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
163 |
^ self format: source kind: #start in: class |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
164 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
165 |
"Created: / 04-08-2011 / 23:44:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
166 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
167 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
168 |
formatClassDefinition:source in:class elementsInto: els |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
169 |
|
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
170 |
sourceIndex := els. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
171 |
^self formatClassDefinition:source in:class |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
172 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
173 |
"Created: / 04-08-2011 / 23:44:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
174 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
175 |
|
2641
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
176 |
formatClassDefinition:newCode line: line number: lnr in:cls |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
177 |
| scanner | |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
178 |
|
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
179 |
line isEmptyOrNil ifTrue:[ ^ nil ]. |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
180 |
|
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
181 |
sourceText := line asText. |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
182 |
preferences isNil ifTrue:[ |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
183 |
preferences := UserPreferences current. |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
184 |
]. |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
185 |
scanner := Scanner for: line asString. |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
186 |
scanner highlighter: self. |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
187 |
[ |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
188 |
[ scanner nextToken ~~ #EOF ] whileTrue. |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
189 |
] on: Error do:[ |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
190 |
|
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
191 |
]. |
2707
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
192 |
^ sourceText |
2641
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
193 |
|
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
194 |
"Created: / 04-08-2013 / 00:25:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2707
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
195 |
"Modified (format): / 05-09-2013 / 02:54:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2641
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
196 |
! |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
197 |
|
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
198 |
formatExpression:source in:class |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
199 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
200 |
"/ self breakPoint:#jv. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
201 |
^source. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
202 |
^ self format: source kind: #'K_EXPRESSION' in: class |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
203 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
204 |
"Created: / 04-08-2011 / 23:45:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
205 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
206 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
207 |
formatExpression:source in:class elementsInto: els |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
208 |
|
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
209 |
sourceIndex := els. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
210 |
^self formatExpression:source in:class |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
211 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
212 |
"Created: / 04-08-2011 / 23:43:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
213 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
214 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
215 |
formatMethod:mth source:source in:class using: prefs |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
216 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
217 |
preferences := prefs. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
218 |
^ self format: source kind: #start in: class |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
219 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
220 |
"Created: / 04-08-2011 / 23:45:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
221 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
222 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
223 |
formatMethod:mth source:source in:class using: prefs elementsInto: els |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
224 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
225 |
preferences := prefs. |
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
226 |
sourceIndex := els. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
227 |
^self formatMethod:mth source:source in:class using: prefs |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
228 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
229 |
"Created: / 04-08-2011 / 23:42:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2641
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
230 |
! |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
231 |
|
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
232 |
formatMethod:mthd source:newCode line: line number: lnr in:cls using:syntaxPreferences |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
233 |
| scanner | |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
234 |
|
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
235 |
line isEmptyOrNil ifTrue:[ ^ nil ]. |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
236 |
|
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
237 |
sourceText := line asText. |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
238 |
preferences := syntaxPreferences. |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
239 |
preferences isNil ifTrue:[ |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
240 |
preferences := UserPreferences current. |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
241 |
]. |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
242 |
scanner := Scanner for: line asString. |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
243 |
scanner highlighter: self. |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
244 |
[ |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
245 |
[ scanner nextToken ~~ #EOF ] whileTrue. |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
246 |
] on: Error do:[ |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
247 |
|
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
248 |
]. |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
249 |
^ sourceText |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
250 |
|
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
251 |
"Created: / 04-08-2013 / 00:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
252 |
! ! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
253 |
|
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
254 |
!JavaSourceHighlighter methodsFor:'formatting - private'! |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
255 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
256 |
format: source kind: kind in: class |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
257 |
|
2708
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
258 |
| sourceUnit scanner parser marker cacheIt document tree | |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
259 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
260 |
"Optimization - if full class source is to be formatted, |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
261 |
consult cache - when browsing the code or debugging, very |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
262 |
often same same source is to be highlighted" |
2515
bcfe9f4dca6b
Improvements in JavaCompiler.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2429
diff
changeset
|
263 |
|
bcfe9f4dca6b
Improvements in JavaCompiler.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2429
diff
changeset
|
264 |
preferences isNil ifTrue:[ |
bcfe9f4dca6b
Improvements in JavaCompiler.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2429
diff
changeset
|
265 |
preferences := UserPreferences current. |
bcfe9f4dca6b
Improvements in JavaCompiler.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2429
diff
changeset
|
266 |
]. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
267 |
cacheIt := kind == #start and: [class notNil]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
268 |
cacheIt ifTrue:[ |
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
269 |
document := JavaSourceDocument cachedDocumentFor: class. |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
270 |
document notNil ifTrue:[ |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
271 |
(document sourceText notNil and:[document sourceText string = source]) ifTrue:[ |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
272 |
document sourceText copy. |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
273 |
]. |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
274 |
]. |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
275 |
document := JavaSourceDocument for: class. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
276 |
]. |
2708
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
277 |
marker := Marker new. |
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
278 |
marker highlighter: self. |
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
279 |
|
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
280 |
sourceText := source isText |
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
281 |
ifTrue:[source copy] |
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
282 |
ifFalse:[source asText]. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
283 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
284 |
|
2708
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
285 |
"/ sourceUnit := (Java classForName:'stx.libjava.tools.source.JavaSource') new. |
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
286 |
"/ sourceUnit setContents: source string. |
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
287 |
"/ parser := (Java classForName:'stx.libjava.tools.source.JavaSourceHighlighter') new. |
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
288 |
"/ parser setMarker: marker. |
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
289 |
"/ tree := parser parse: sourceUnit. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
290 |
|
2708
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
291 |
scanner := Scanner for: source string. |
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
292 |
scanner highlighter: self. |
2707
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
293 |
[ |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
294 |
[ scanner nextToken ~~ #EOF ] whileTrue. |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
295 |
] on: Error do:[ |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
296 |
|
2708
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
297 |
]. |
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
298 |
|
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
299 |
|
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
300 |
^ cacheIt ifTrue:[ |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
301 |
document sourceText: sourceText. |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
302 |
document sourceIndex: sourceIndex. |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
303 |
document sourceTree: tree. |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
304 |
JavaSourceDocument cachedDocumentFor: class put: document. |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
305 |
|
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
306 |
sourceText copy |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
307 |
] ifFalse:[ |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
308 |
sourceText |
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
309 |
] |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
310 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
311 |
"Created: / 17-03-2012 / 14:02:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2708
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
312 |
"Modified: / 05-09-2013 / 16:31:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
313 |
! ! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
314 |
|
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
315 |
!JavaSourceHighlighter methodsFor:'syntax detection'! |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
316 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
317 |
markArgumentIdentifierFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
318 |
self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
319 |
markFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
320 |
withEmphasis:(preferences argumentIdentifierEmphasis) color:(preferences argumentIdentifierColor) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
321 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
322 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
323 |
markBadIdentifierFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
324 |
self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
325 |
markFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
326 |
withEmphasis:(preferences badIdentifierEmphasis) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
327 |
color:(preferences badIdentifierColor) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
328 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
329 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
330 |
markClassVariableIdentifierFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
331 |
self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
332 |
markFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
333 |
withEmphasis:(preferences classVariableIdentifierEmphasis) color:(preferences classVariableIdentifierColor) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
334 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
335 |
"Modified: / 31.3.1998 / 18:02:14 / cg" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
336 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
337 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
338 |
markCommentFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
339 |
self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
340 |
markFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
341 |
withEmphasis:(preferences commentEmphasis) color:(preferences commentColor) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
342 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
343 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
344 |
markConstantFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
345 |
self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
346 |
markFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
347 |
withEmphasis:(preferences constantEmphasis) color:(preferences constantColor) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
348 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
349 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
350 |
markFrom:pos1 to:pos2 withEmphasis:fontEmp color:clrIn |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
351 |
|e p2 clr| |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
352 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
353 |
clr := clrIn onDevice:Screen current. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
354 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
355 |
clr = Color black ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
356 |
e := fontEmp |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
357 |
] ifFalse:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
358 |
fontEmp isNil ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
359 |
e := (#color->clr) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
360 |
] ifFalse:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
361 |
e := Text addEmphasis:fontEmp to:(#color->clr). |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
362 |
] |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
363 |
]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
364 |
(p2 := pos2) isNil ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
365 |
p2 := sourceText size |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
366 |
] ifFalse:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
367 |
p2 := p2 min:sourceText size |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
368 |
]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
369 |
sourceText emphasizeFrom:pos1 to:p2 with:e |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
370 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
371 |
"Created: / 31.3.1998 / 13:26:53 / cg" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
372 |
"Modified: / 1.4.1998 / 12:51:56 / cg" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
373 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
374 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
375 |
markFunctionNameFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
376 |
self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
377 |
markFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
378 |
withEmphasis:(preferences methodSelectorEmphasis) color:(preferences methodSelectorColor) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
379 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
380 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
381 |
markGlobalClassIdentifierFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
382 |
self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
383 |
markFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
384 |
withEmphasis:(preferences globalClassIdentifierEmphasis) color:(preferences globalClassIdentifierColor) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
385 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
386 |
"Modified: / 31.3.1998 / 18:02:14 / cg" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
387 |
"Created: / 4.3.1999 / 12:53:02 / cg" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
388 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
389 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
390 |
markGlobalIdentifierFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
391 |
self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
392 |
markFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
393 |
withEmphasis:(preferences globalIdentifierEmphasis) color:(preferences globalIdentifierColor) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
394 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
395 |
"Modified: / 31.3.1998 / 18:02:14 / cg" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
396 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
397 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
398 |
markIdentifierFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
399 |
self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
400 |
markFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
401 |
withEmphasis:(preferences identifierEmphasis) color:(preferences identifierColor) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
402 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
403 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
404 |
markInstVarIdentifierFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
405 |
self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
406 |
markFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
407 |
withEmphasis:(preferences instVarIdentifierEmphasis) color:(preferences instVarIdentifierColor) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
408 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
409 |
"Created: / 16.4.1998 / 18:35:40 / cg" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
410 |
"Modified: / 16.4.1998 / 18:37:30 / cg" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
411 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
412 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
413 |
markKeyword:kw from:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
414 |
|em clr| |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
415 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
416 |
( #( 'if' 'else' |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
417 |
'while' |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
418 |
'for' |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
419 |
'do' |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
420 |
'return' |
2646
39856623a013
Added Java compiler problem annotations and popup window.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2645
diff
changeset
|
421 |
'continue' |
39856623a013
Added Java compiler problem annotations and popup window.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2645
diff
changeset
|
422 |
'break' |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
423 |
) includes:kw) ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
424 |
em := preferences controlFlowSelectorEmphasis. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
425 |
clr := preferences controlFlowSelectorColor. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
426 |
] ifFalse:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
427 |
em := preferences jsKeywordEmphasis. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
428 |
clr := preferences jsKeywordColor. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
429 |
]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
430 |
self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
431 |
markFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
432 |
withEmphasis:em color:clr |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
433 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
434 |
"Modified: / 19-05-2010 / 15:07:59 / cg" |
2646
39856623a013
Added Java compiler problem annotations and popup window.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2645
diff
changeset
|
435 |
"Modified: / 07-08-2013 / 00:28:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
436 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
437 |
|
2707
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
438 |
markKeywordFlowFrom:pos1 to:pos2 |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
439 |
self |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
440 |
markFrom:pos1 to:pos2 |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
441 |
withEmphasis:preferences controlFlowSelectorEmphasis |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
442 |
color:preferences controlFlowSelectorColor |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
443 |
|
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
444 |
"Created: / 05-09-2013 / 03:09:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
445 |
! |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
446 |
|
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
447 |
markKeywordFrom:pos1 to:pos2 |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
448 |
self |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
449 |
markFrom:pos1 to:pos2 |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
450 |
withEmphasis:preferences jsKeywordEmphasis |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
451 |
color:preferences jsKeywordColor |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
452 |
|
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
453 |
"Created: / 05-09-2013 / 03:09:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
454 |
! |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
455 |
|
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
456 |
markLocalIdentifierFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
457 |
self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
458 |
markFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
459 |
withEmphasis:(preferences localIdentifierEmphasis) color:(preferences localIdentifierColor) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
460 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
461 |
|
2515
bcfe9f4dca6b
Improvements in JavaCompiler.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2429
diff
changeset
|
462 |
markProblem: problem from:pos1 to:pos2 |
bcfe9f4dca6b
Improvements in JavaCompiler.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2429
diff
changeset
|
463 |
self |
bcfe9f4dca6b
Improvements in JavaCompiler.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2429
diff
changeset
|
464 |
markFrom:pos1 to:pos2 |
bcfe9f4dca6b
Improvements in JavaCompiler.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2429
diff
changeset
|
465 |
withEmphasis:(preferences badIdentifierEmphasis) |
bcfe9f4dca6b
Improvements in JavaCompiler.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2429
diff
changeset
|
466 |
color:(preferences badIdentifierColor) |
bcfe9f4dca6b
Improvements in JavaCompiler.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2429
diff
changeset
|
467 |
|
bcfe9f4dca6b
Improvements in JavaCompiler.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2429
diff
changeset
|
468 |
"Created: / 15-04-2013 / 22:23:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
bcfe9f4dca6b
Improvements in JavaCompiler.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2429
diff
changeset
|
469 |
! |
bcfe9f4dca6b
Improvements in JavaCompiler.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2429
diff
changeset
|
470 |
|
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
471 |
markSelector:selectorString from:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
472 |
| fg em | |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
473 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
474 |
fg := preferences selectorColor. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
475 |
em := preferences selectorEmphasis. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
476 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
477 |
self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
478 |
markFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
479 |
withEmphasis:em color:fg |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
480 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
481 |
"Modified: / 04-10-2011 / 19:48:48 / cg" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
482 |
"Modified: / 17-03-2012 / 13:26:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
483 |
"Created: / 17-03-2012 / 19:12:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
484 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
485 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
486 |
markSelector:selectorString from:pos1 to:pos2 receiverNode:aReceiverNodeOrNil numArgs:numArgs |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
487 |
|fg selectorSymbol check ok rec em currentEnvironment currentSuperclasses currentSubclasses classToCompileFor fullSelectorCheck| |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
488 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
489 |
fg := preferences selectorColor. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
490 |
em := preferences selectorEmphasis. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
491 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
492 |
"/ (currentEnvironment notNil |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
493 |
"/ and:[ (((currentEnvironment _localVariables ? #()) contains:[:local | local name = selectorString]) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
494 |
"/ or:[((currentEnvironment _argVariables ? #()) contains:[:local | local name = selectorString])]) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
495 |
"/ ]) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
496 |
"/ ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
497 |
"/ "/ a local call |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
498 |
"/ ] ifFalse:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
499 |
"/ selectorSymbol := (self translatedSmalltalkSelectorFor:selectorString numArgs:numArgs) asSymbolIfInterned. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
500 |
"/ selectorSymbol isNil ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
501 |
"/ fg := Color red. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
502 |
"/ ] ifFalse:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
503 |
"/ fullSelectorCheck == true ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
504 |
"/ aReceiverNodeOrNil notNil ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
505 |
"/ check := [:cls | (cls includesSelector:selectorSymbol) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
506 |
"/ or:[cls class includesSelector:selectorSymbol]]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
507 |
"/ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
508 |
"/ ok := false. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
509 |
"/ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
510 |
"/ "/ limit search if possible |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
511 |
"/ (classToCompileFor notNil |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
512 |
"/ and:[aReceiverNodeOrNil isSelf or:[aReceiverNodeOrNil isSuper]]) ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
513 |
"/ currentSuperclasses isNil ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
514 |
"/ currentSuperclasses := classToCompileFor withAllSuperclasses. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
515 |
"/ ]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
516 |
"/ ok := currentSuperclasses contains:check. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
517 |
"/ (ok not and:[aReceiverNodeOrNil isSelf]) ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
518 |
"/ currentSubclasses isNil ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
519 |
"/ currentSubclasses := classToCompileFor allSubclasses. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
520 |
"/ ]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
521 |
"/ ok := currentSubclasses contains:check. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
522 |
"/ ]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
523 |
"/ ] ifFalse:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
524 |
"/ aReceiverNodeOrNil isConstant ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
525 |
"/ ok := aReceiverNodeOrNil evaluate class withAllSuperclasses contains:check. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
526 |
"/ ] ifFalse:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
527 |
"/ (aReceiverNodeOrNil isGlobal |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
528 |
"/ and:[(rec := aReceiverNodeOrNil evaluate) isBehavior]) ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
529 |
"/ ok := rec class withAllSuperclasses contains:check. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
530 |
"/ ] ifFalse:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
531 |
"/ ok := Smalltalk allClasses contains:check |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
532 |
"/ ] |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
533 |
"/ ] |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
534 |
"/ ]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
535 |
"/ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
536 |
"/ ok ifFalse:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
537 |
"/ em := preferences unimplementedSelectorEmphasis. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
538 |
"/ fg := preferences unimplementedSelectorColor. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
539 |
"/ ] |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
540 |
"/ ] |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
541 |
"/ ] |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
542 |
"/ ]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
543 |
"/ ]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
544 |
self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
545 |
markFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
546 |
withEmphasis:em color:fg |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
547 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
548 |
"Modified: / 04-10-2011 / 19:48:48 / cg" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
549 |
"Modified: / 17-03-2012 / 13:26:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
550 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
551 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
552 |
markSelfFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
553 |
self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
554 |
markFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
555 |
withEmphasis:(preferences selfEmphasis) color:(preferences selfColor) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
556 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
557 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
558 |
markStringFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
559 |
self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
560 |
markFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
561 |
withEmphasis:(preferences stringEmphasis) color:(preferences stringColor) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
562 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
563 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
564 |
markUnknownIdentifierFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
565 |
self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
566 |
markFrom:pos1 to:pos2 |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
567 |
withEmphasis:(preferences unknownIdentifierEmphasis) color:(preferences unknownIdentifierColor) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
568 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
569 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
570 |
markVariable:v from:pos to:endPos |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
571 |
"support for syntaxColoring" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
572 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
573 |
|type globalValue nameSym| |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
574 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
575 |
type := v type. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
576 |
(type == #BlockArg |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
577 |
or:[type == #MethodArg]) ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
578 |
self markArgumentIdentifierFrom:pos to:endPos. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
579 |
^ self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
580 |
]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
581 |
(type == #BlockVariable |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
582 |
or:[type == #MethodVariable]) ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
583 |
self markLocalIdentifierFrom:pos to:endPos. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
584 |
^ self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
585 |
]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
586 |
(type == #GlobalVariable) ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
587 |
nameSym := v name asSymbolIfInterned. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
588 |
(nameSym isNil |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
589 |
or:[(Smalltalk includesKey:nameSym) not]) ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
590 |
self markUnknownIdentifierFrom:pos to:endPos. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
591 |
^ self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
592 |
]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
593 |
globalValue := Smalltalk at:nameSym ifAbsent:nil. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
594 |
globalValue isBehavior ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
595 |
self markGlobalClassIdentifierFrom:pos to:endPos. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
596 |
] ifFalse:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
597 |
self markGlobalIdentifierFrom:pos to:endPos. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
598 |
]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
599 |
^ self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
600 |
]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
601 |
(type == #ClassVariable) ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
602 |
self markClassVariableIdentifierFrom:pos to:endPos. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
603 |
^ self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
604 |
]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
605 |
(type == #InstanceVariable) ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
606 |
self markInstVarIdentifierFrom:pos to:endPos. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
607 |
^ self |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
608 |
]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
609 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
610 |
self markIdentifierFrom:pos to:endPos. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
611 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
612 |
"Created: / 16.4.1998 / 18:49:34 / cg" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
613 |
"Modified: / 4.3.1999 / 12:56:13 / cg" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
614 |
! ! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
615 |
|
2707
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
616 |
!JavaSourceHighlighter::Marker class methodsFor:'initialization'! |
2703 | 617 |
|
2707
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
618 |
initialize |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
619 |
"Invoked at system start or when the class is dynamically loaded." |
2703 | 620 |
|
621 |
" |
|
2707
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
622 |
!!!! IMPORTANT !!!!!! |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
623 |
When changing / adding constants, make sure they |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
624 |
are in sync with those defined in Smaltalk |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
625 |
stx.libjava.tools.source.JavaSourceMarker !!!!!! |
2703 | 626 |
" |
627 |
||
2707
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
628 |
self lookupObject: JavaLookup instance. |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
629 |
|
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
630 |
MARK_KEYWORD := 1. |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
631 |
MARK_NUMBER := 2. |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
632 |
MARK_STRING := 3. |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
633 |
MARK_CHARACTER := 4. |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
634 |
MARK_COMMENT := 5. |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
635 |
MARK_JAVADOC := 6. |
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
636 |
MARK_KEYWORD_FLOW := 7. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
637 |
|
2707
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
638 |
"Modified: / 05-09-2013 / 03:14:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
639 |
! ! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
640 |
|
2708
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
641 |
!JavaSourceHighlighter::Marker methodsFor:'accessing'! |
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
642 |
|
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
643 |
highlighter:aJavaSourceHighlighter |
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
644 |
highlighter := aJavaSourceHighlighter. |
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
645 |
! ! |
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
646 |
|
2707
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
647 |
!JavaSourceHighlighter::Marker methodsFor:'syntax detection'! |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
648 |
|
2707
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
649 |
mark: kind from:pos1 to:pos2 |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
650 |
|
2708
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
651 |
kind == MARK_KEYWORD ifTrue:[ ^ highlighter markKeywordFrom: pos1 + 1 to: pos2 + 1]. |
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
652 |
kind == MARK_KEYWORD_FLOW ifTrue:[ ^ highlighter markKeywordFlowFrom: pos1 + 1 to: pos2 + 1 ]. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
653 |
|
2708
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
654 |
kind == MARK_NUMBER ifTrue:[ ^ highlighter markConstantFrom: pos1 + 1 to: pos2 + 1 ]. |
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
655 |
kind == MARK_STRING ifTrue:[ ^ highlighter markConstantFrom: pos1 + 1 to: pos2 + 1 ]. |
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
656 |
kind == MARK_CHARACTER ifTrue:[ ^ highlighter markConstantFrom: pos1 + 1 to: pos2 + 1 ]. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
657 |
|
2708
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
658 |
kind == MARK_COMMENT ifTrue:[ ^ highlighter markCommentFrom: pos1 + 1 to: pos2 + 1 ]. |
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
659 |
kind == MARK_JAVADOC ifTrue:[ ^ highlighter markCommentFrom: pos1 + 1 to: pos2 + 1 ]. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
660 |
|
2707
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
661 |
"Created: / 05-09-2013 / 03:03:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2708
648286432b9a
More support fro browser (senders/implementors, field references)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2707
diff
changeset
|
662 |
"Modified: / 05-09-2013 / 09:07:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
663 |
! ! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
664 |
|
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
665 |
!JavaSourceHighlighter::Scanner methodsFor:'accessing'! |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
666 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
667 |
highlighter |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
668 |
^ highlighter |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
669 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
670 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
671 |
highlighter:aJavaSyntaxHighlighter |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
672 |
highlighter := aJavaSyntaxHighlighter. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
673 |
! ! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
674 |
|
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
675 |
!JavaSourceHighlighter::Scanner methodsFor:'error handling'! |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
676 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
677 |
syntaxError:aMessage position:position to:endPos |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
678 |
"a syntax error happened" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
679 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
680 |
endPos notNil ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
681 |
highlighter markBadIdentifierFrom:position to: endPos. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
682 |
] |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
683 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
684 |
"Created: / 13-04-2012 / 18:31:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
685 |
! ! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
686 |
|
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
687 |
!JavaSourceHighlighter::Scanner methodsFor:'initialization'! |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
688 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
689 |
initialize |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
690 |
"initialize the scanner" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
691 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
692 |
super initialize. |
2703 | 693 |
saveComments := true. |
694 |
buffer := Array new: 3. |
|
695 |
bufferFirst := 1. |
|
696 |
bufferLast := 0. |
|
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
697 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
698 |
"Created: / 17-03-2012 / 00:02:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2703 | 699 |
"Modified: / 01-09-2013 / 18:51:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
700 |
! ! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
701 |
|
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
702 |
!JavaSourceHighlighter::Scanner methodsFor:'private'! |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
703 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
704 |
checkForKeyword:string |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
705 |
| isKW | |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
706 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
707 |
isKW := super checkForKeyword:string. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
708 |
isKW ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
709 |
highlighter markKeyword:string from:tokenStartPosition + 1 to:tokenStartPosition + string size |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
710 |
]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
711 |
^isKW |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
712 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
713 |
"Created: / 17-03-2012 / 00:15:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
714 |
! ! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
715 |
|
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
716 |
!JavaSourceHighlighter::Scanner methodsFor:'reading next token'! |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
717 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
718 |
nextToken |
2641
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
719 |
| t | |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
720 |
|
2641
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
721 |
t := super nextToken. |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
722 |
t == #String ifTrue:[ |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
723 |
highlighter markStringFrom:tokenStartPosition + 1 to: tokenEndPosition + 1. |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
724 |
] ifFalse:[ |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
725 |
t == #Integer ifTrue:[ |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
726 |
highlighter markConstantFrom:tokenStartPosition + 1 to: tokenEndPosition + 1. |
79395ea8b58f
Initial support for block and incremental highlighting...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2546
diff
changeset
|
727 |
]]. |
2703 | 728 |
bufferLast := (bufferLast \\ buffer size) + 1. |
729 |
bufferLast == bufferFirst ifTrue:[ |
|
730 |
bufferFirst := (bufferFirst \\ buffer size) + 1. |
|
731 |
]. |
|
732 |
buffer at: bufferLast put: self token. |
|
733 |
"/ Now, do a quick check for some common token sequences...not a full parsing, |
|
734 |
"/ but helps a bit |
|
735 |
((bufferLast - bufferFirst) \\ 10) > 2 ifTrue:[ |
|
736 |
"/ Quick check for method call sequence... |
|
737 |
"/ t == $( ifTrue:[ |
|
738 |
"/ |
|
739 |
"/ ((buffer at:(bufferLast - 1) \\ buffer size) type == #Identifier |
|
740 |
"/ and:[(buffer at:(bufferLast - 2) \\ buffer size) type == $. |
|
741 |
"/ and:[(buffer at:(bufferLast - 1) \\ buffer size) value first isLowercase]]) |
|
742 |
"/ ifTrue:[ |
|
743 |
"/ | nameToken | |
|
744 |
"/ |
|
745 |
"/ nameToken := (buffer at:(bufferLast - 1) \\ buffer size). |
|
746 |
"/ highlighter markSelector: nameToken value from: nameToken startPosition to: nameToken endPosition. |
|
747 |
"/ ^ t |
|
748 |
"/ ]. |
|
749 |
"/ ]. |
|
750 |
"/ Add more patterns here |
|
751 |
]. |
|
752 |
||
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
753 |
^ t |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
754 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
755 |
"Created: / 14-05-1998 / 15:48:04 / cg" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
756 |
"Modified: / 16-05-1998 / 19:12:29 / cg" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
757 |
"Created: / 17-03-2012 / 19:15:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2703 | 758 |
"Modified: / 02-09-2013 / 00:04:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
759 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
760 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
761 |
skipComment |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
762 |
super skipComment. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
763 |
highlighter markCommentFrom:((tokenStartPosition + 1) max: 1) to: source position. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
764 |
^nil |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
765 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
766 |
"Created: / 17-03-2012 / 00:04:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
767 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
768 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
769 |
skipEOLComment |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
770 |
super skipEOLComment. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
771 |
highlighter markCommentFrom:((tokenStartPosition - 1) max: 1) to: source position. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
772 |
^nil |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
773 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
774 |
"Created: / 17-03-2012 / 00:05:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
775 |
! ! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
776 |
|
2697
d5110c6822c6
Introducion a JavaSourceDocument.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2648
diff
changeset
|
777 |
!JavaSourceHighlighter class methodsFor:'documentation'! |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
778 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
779 |
version_CVS |
2711
a00302fe5083
Added version_CVS to all classes and build files regenerated & cleaned.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2708
diff
changeset
|
780 |
^ '$Header$' |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
781 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
782 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
783 |
version_HG |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
784 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
785 |
^ '$Changeset: <not expanded> $' |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
786 |
! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
787 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
788 |
version_SVN |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
789 |
^ 'Id' |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
790 |
! ! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
791 |
|
2707
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
792 |
|
165badf6c997
Optimization on JavaSourceHighlighter.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2703
diff
changeset
|
793 |
JavaSourceHighlighter::Marker initialize! |