github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-25 06:12:47 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CodeEditor: PHP comments fix #1365

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@9414 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-01-17 07:13:02 +00:00
parent b70592e335
commit 6bddbd52fc
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
uppsrc/CodeEditor/CHighlight.cpp
View file

@ -157,7 +157,7 @@ void CSyntax::Highlight(const wchar *ltext, const wchar *e, HighlightOutput& hls
p++;
hls.Put(hl_style[INK_NORMAL]);
}
if(*p == '#' && findarg(highlight, HIGHLIGHT_JAVASCRIPT, HIGHLIGHT_CSS, HIGHLIGHT_JSON) < 0) {
if(*p == '#' && findarg(highlight, HIGHLIGHT_CPP, HIGHLIGHT_CS) >= 0) {
static Index<String> macro;
ONCELOCK {
static const char *pd[] = {
@ -191,7 +191,8 @@ void CSyntax::Highlight(const wchar *ltext, const wchar *e, HighlightOutput& hls
while(p < e) {
int pair = MAKELONG(p[0], p[1]);
if(linecomment && linecont || pair == MAKELONG('/', '/') &&
highlight != HIGHLIGHT_CSS && highlight != HIGHLIGHT_JSON) {
highlight != HIGHLIGHT_CSS && highlight != HIGHLIGHT_JSON ||
highlight == HIGHLIGHT_PHP && *p == '#') {
while(p < e)
p = DoComment(hls, p, e);
is_comment = true;