diff options
| author | nyamatongwe <devnull@localhost> | 2013-02-20 13:41:17 +1100 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2013-02-20 13:41:17 +1100 |
| commit | dd801b3c31c58aae1c1543bb058385dc36863e73 (patch) | |
| tree | fe71f95075f78a13f40b120dcd19a4ec7440e31d | |
| parent | d62c4501e6052c30c820ba0f25c3fc3b9d477970 (diff) | |
| download | scintilla-mirror-dd801b3c31c58aae1c1543bb058385dc36863e73.tar.gz | |
Recognise GCC include path diagnostics that appear before an error.
| -rw-r--r-- | include/SciLexer.h | 1 | ||||
| -rw-r--r-- | include/Scintilla.iface | 1 | ||||
| -rw-r--r-- | lexers/LexOthers.cxx | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/include/SciLexer.h b/include/SciLexer.h index 88d02a6f9..82a39904c 100644 --- a/include/SciLexer.h +++ b/include/SciLexer.h @@ -477,6 +477,7 @@ #define SCE_ERR_TIDY 19 #define SCE_ERR_JAVA_STACK 20 #define SCE_ERR_VALUE 21 +#define SCE_ERR_FROM 22 #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 6ee29a601..f66324572 100644 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -2934,6 +2934,7 @@ val SCE_ERR_ABSF=18 val SCE_ERR_TIDY=19 val SCE_ERR_JAVA_STACK=20 val SCE_ERR_VALUE=21 +val SCE_ERR_FROM=22 # Lexical states for SCLEX_BATCH lex Batch=SCLEX_BATCH SCE_BAT_ val SCE_BAT_DEFAULT=0 diff --git a/lexers/LexOthers.cxx b/lexers/LexOthers.cxx index 8a21f2b55..d73b86f00 100644 --- a/lexers/LexOthers.cxx +++ b/lexers/LexOthers.cxx @@ -942,6 +942,10 @@ static int RecogniseErrorListLine(const char *lineBuffer, unsigned int lengthLin strstr(lineBuffer, ".java:")) { // Java stack back trace return SCE_ERR_JAVA_STACK; + } else if (strstart(lineBuffer, "In file included from ") || + strstart(lineBuffer, " from ")) { + // GCC showing include path to following error + return SCE_ERR_FROM; } else { // Look for one of the following formats: // GCC: <filename>:<line>:<message> |