diff options
| author | kudah <kudahkukarek@gmail.com> | 2013-05-26 06:36:49 +0300 |
|---|---|---|
| committer | kudah <kudahkukarek@gmail.com> | 2013-05-26 06:36:49 +0300 |
| commit | 66b1524abb478a1606880f1445909c7e303a0e0f (patch) | |
| tree | 2795d20e5d0c69eeb4e9cb49c2b6ce222a2daae0 /lexers/LexHaskell.cxx | |
| parent | 8f57e546fe942c3fdfb2c221262b6b9b1875a290 (diff) | |
| download | scintilla-mirror-66b1524abb478a1606880f1445909c7e303a0e0f.tar.gz | |
* Fixed a bug in incremental lexing which often caused a full redraw
* Don't highlight CPP inside comments when styling.within.preprocessor is on, to avoid incoherent coloring.
Diffstat (limited to 'lexers/LexHaskell.cxx')
| -rw-r--r-- | lexers/LexHaskell.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lexers/LexHaskell.cxx b/lexers/LexHaskell.cxx index e56906b81..9b4ad14e9 100644 --- a/lexers/LexHaskell.cxx +++ b/lexers/LexHaskell.cxx @@ -597,7 +597,8 @@ void SCI_METHOD LexerHaskell::Lex(unsigned int startPos, int length, int initSty hs.lmode = LITERATE_BIRD; } // Preprocessor - else if (sc.atLineStart && sc.ch == '#' && options.cpp) { + else if (sc.atLineStart && sc.ch == '#' && options.cpp + && (!options.stylingWithinPreprocessor || sc.state == SCE_HA_DEFAULT)) { sc.SetState(SCE_HA_PREPROCESSOR); sc.Forward(); } @@ -960,7 +961,6 @@ void SCI_METHOD LexerHaskell::Lex(unsigned int startPos, int length, int initSty sc.Forward(); } } - styler.SetLineState(lineCurrent, hs.ToLineState()); sc.Complete(); } |