@@ -145,20 +145,25 @@ import org.fife.ui.rsyntaxtextarea.*;
145
145
* @return The first <code >Token</code> in a linked list representing
146
146
* the syntax highlighted text.
147
147
*/
148
+ @Override
148
149
public Token getTokenList(Segment text, int initialTokenType, int startOffset) {
149
150
150
151
resetTokenList();
151
152
this . offsetShift = - text. offset + startOffset;
152
153
153
154
// Start off in the proper state.
154
- int state = Token . NULL ;
155
+ int state = YYINITIAL ;
155
156
switch (initialTokenType) {
157
+ case Token . COMMENT_EOL:
158
+ state = EOL_COMMENT ;
159
+ start = text. offset;
160
+ break ;
156
161
case Token . COMMENT_MULTILINE:
157
162
state = MLC ;
158
163
start = text. offset;
159
164
break ;
160
165
default :
161
- state = Token . NULL ;
166
+ state = YYINITIAL ;
162
167
}
163
168
164
169
s = text;
@@ -195,7 +200,7 @@ import org.fife.ui.rsyntaxtextarea.*;
195
200
*
196
201
* @param reader the new input stream
197
202
*/
198
- public final void yyreset(java.io . Reader reader) {
203
+ public final void yyreset(Reader reader) {
199
204
// 's' has been updated.
200
205
zzBuffer = s. array;
201
206
/*
@@ -666,10 +671,15 @@ URL = (((https?|f(tp|ile))"://"|"www.")({URLCharacters}{URLEndCharacter})?)
666
671
}
667
672
668
673
<EOL_COMMENT> {
669
- [^ hwf\n] + {}
674
+ [^ hwf\\ \ n]+ {}
670
675
{URL} { int temp= zzStartRead; addToken(start,zzStartRead- 1 , Token . COMMENT_EOL ); addHyperlinkToken(temp,zzMarkedPos- 1 , Token . COMMENT_EOL ); start = zzMarkedPos; }
671
676
[ hwf] {}
672
- \n { addToken(start,zzStartRead- 1 , Token . COMMENT_EOL ); addNullToken(); return firstToken; }
677
+ \\ . { /* Skip all escaped chars. */ }
678
+ \\ { /* Line ending in '\' => continue to next line. */
679
+ addToken(start,zzStartRead, Token . COMMENT_EOL );
680
+ return firstToken;
681
+ }
682
+ \n |
673
683
<<EOF>> { addToken(start,zzStartRead- 1 , Token . COMMENT_EOL ); addNullToken(); return firstToken; }
674
684
675
685
}
0 commit comments