aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornyamatongwe <unknown>2002-10-26 04:42:35 +0000
committernyamatongwe <unknown>2002-10-26 04:42:35 +0000
commit6773a490e7087efbe0256e937856c8feac4cd3d6 (patch)
tree7f6a65d909eb72c8395d0fbd43f01696e7017470
parent10eeedde657c16b277803c6d3001c007b03bb643 (diff)
downloadscintilla-mirror-6773a490e7087efbe0256e937856c8feac4cd3d6.tar.gz
Patch from Jakub Vrána to recognise PHP errors.
-rw-r--r--include/SciLexer.h1
-rw-r--r--include/Scintilla.iface1
-rw-r--r--src/LexOthers.cxx2
3 files changed, 4 insertions, 0 deletions
diff --git a/include/SciLexer.h b/include/SciLexer.h
index 8137db8f3..f3bd22d8b 100644
--- a/include/SciLexer.h
+++ b/include/SciLexer.h
@@ -277,6 +277,7 @@
#define SCE_ERR_DIFF_ADDITION 11
#define SCE_ERR_DIFF_DELETION 12
#define SCE_ERR_DIFF_MESSAGE 13
+#define SCE_ERR_PHP 14
#define SCE_BAT_DEFAULT 0
#define SCE_BAT_COMMENT 1
#define SCE_BAT_WORD 2
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index ef5b6d899..cd1bacb70 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -1730,6 +1730,7 @@ val SCE_ERR_DIFF_CHANGED=10
val SCE_ERR_DIFF_ADDITION=11
val SCE_ERR_DIFF_DELETION=12
val SCE_ERR_DIFF_MESSAGE=13
+val SCE_ERR_PHP=14
# Lexical states for SCLEX_BATCH
lex Batch=SCLEX_BATCH SCE_BAT_
val SCE_BAT_DEFAULT=0
diff --git a/src/LexOthers.cxx b/src/LexOthers.cxx
index babb3a0d3..60f91ba5f 100644
--- a/src/LexOthers.cxx
+++ b/src/LexOthers.cxx
@@ -359,6 +359,8 @@ static void ColouriseErrorListLine(
styler.ColourTo(endPos, SCE_ERR_DIFF_DELETION);
} else if (strstr(lineBuffer, "File \"") && strstr(lineBuffer, ", line ")) {
styler.ColourTo(endPos, SCE_ERR_PYTHON);
+ } else if (strstr(lineBuffer, " in ") && strstr(lineBuffer, " on line ")) {
+ styler.ColourTo(endPos, SCE_ERR_PHP);
} else if (0 == strncmp(lineBuffer, "Error ", strlen("Error "))) {
// Borland error message
styler.ColourTo(endPos, SCE_ERR_BORLAND);