From 4667e78aa60ebf4bdb764e130efdffd9834376fd Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Sun, 24 Jul 2016 14:42:50 +0200 Subject: [PATCH] [DEBUG] correct some un-understanding not parse file type like hxx --- data/languages/asm/highlight.xml | 2 +- data/languages/boo/highlight.xml | 2 +- data/languages/c/highlight.xml | 2 +- data/languages/cpp/highlight.xml | 2 +- data/languages/java/highlight.xml | 2 +- data/languages/json/highlight.xml | 2 +- data/languages/php/highlight.xml | 2 +- data/languages/python/highlight.xml | 2 +- data/languages/xml/highlight.xml | 2 +- sources/appl/Highlight.cpp | 3 ++- 10 files changed, 11 insertions(+), 10 deletions(-) diff --git a/data/languages/asm/highlight.xml b/data/languages/asm/highlight.xml index 7957792..2154ac5 100644 --- a/data/languages/asm/highlight.xml +++ b/data/languages/asm/highlight.xml @@ -1,6 +1,6 @@ - .*\.(s|S|asm) + .*\.(s|S|asm|ASM) commentDoxygen diff --git a/data/languages/boo/highlight.xml b/data/languages/boo/highlight.xml index d7fbc8c..7fafc62 100644 --- a/data/languages/boo/highlight.xml +++ b/data/languages/boo/highlight.xml @@ -1,6 +1,6 @@ - .*\.boo + .*\.(boo|BOO) SYNTAX_ERROR diff --git a/data/languages/c/highlight.xml b/data/languages/c/highlight.xml index 21ab3e2..b07fb8a 100644 --- a/data/languages/c/highlight.xml +++ b/data/languages/c/highlight.xml @@ -1,6 +1,6 @@ - .*\.(c|m) + .*\.(c|C|m|M) diff --git a/data/languages/cpp/highlight.xml b/data/languages/cpp/highlight.xml index 080365c..d31477e 100644 --- a/data/languages/cpp/highlight.xml +++ b/data/languages/cpp/highlight.xml @@ -1,6 +1,6 @@ - .*\.(cpp|cxx|cc|h|hpp|hxx|mm) + .*\.(cpp|CPP|cxx|CXX|cc|CC|hpp|HPP|hxx|HXX|h|H|mm|MM|c++|C++|m++|M++|mpp|MPP) commentDoxygen diff --git a/data/languages/java/highlight.xml b/data/languages/java/highlight.xml index 34ea23e..6d6fff8 100644 --- a/data/languages/java/highlight.xml +++ b/data/languages/java/highlight.xml @@ -1,6 +1,6 @@ - .*\.java + .*\.(java|JAVA) commentDoxygen diff --git a/data/languages/json/highlight.xml b/data/languages/json/highlight.xml index fdde185..93d6949 100644 --- a/data/languages/json/highlight.xml +++ b/data/languages/json/highlight.xml @@ -1,6 +1,6 @@ - .*\.json + .*\.(json|JSON) doubleQuoteText diff --git a/data/languages/php/highlight.xml b/data/languages/php/highlight.xml index 44adaff..14f45e6 100644 --- a/data/languages/php/highlight.xml +++ b/data/languages/php/highlight.xml @@ -1,6 +1,6 @@ - .*\.(php|php3|php4|phtml) + .*\.(php(3|4|5|6|7|8)|PHP(3|4|5|6|7|8)|phtml|php|PHP) commentDoxygen diff --git a/data/languages/python/highlight.xml b/data/languages/python/highlight.xml index 32ebb89..b9d8b73 100644 --- a/data/languages/python/highlight.xml +++ b/data/languages/python/highlight.xml @@ -1,6 +1,6 @@ - .*\.py + .*\.(py|PY) comment diff --git a/data/languages/xml/highlight.xml b/data/languages/xml/highlight.xml index 01bfc51..165b39b 100644 --- a/data/languages/xml/highlight.xml +++ b/data/languages/xml/highlight.xml @@ -1,6 +1,6 @@ - .*\.(xml|svg|html|tpl) + .*\.(xml|XML|svg|SVG|html|HTML|htm|HTM|tpl|TPL) comment diff --git a/sources/appl/Highlight.cpp b/sources/appl/Highlight.cpp index 360bfd5..9314b2e 100644 --- a/sources/appl/Highlight.cpp +++ b/sources/appl/Highlight.cpp @@ -121,7 +121,7 @@ appl::Highlight::~Highlight() { bool appl::Highlight::isCompatible(const std::string& _name) { for (auto &it : m_listExtentions) { - APPL_VERBOSE(" check : " << it << "=?=" << _name); + APPL_DEBUG(" check : " << it << "=?=" << _name); std::regex expression; try { expression.assign(it, std::regex_constants::optimize | std::regex_constants::ECMAScript); @@ -134,6 +134,7 @@ bool appl::Highlight::isCompatible(const std::string& _name) { if (resultMatch.size() <= 0) { continue; } + APPL_VERBOSE(" - begin=" << std::distance(_name.begin(), resultMatch[0].first) << " end=" << std::distance(_name.begin(), resultMatch[0].second)); if (resultMatch[0].first != _name.begin()) { continue; }