diff options
| author | nyamatongwe <devnull@localhost> | 2011-04-29 19:48:39 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2011-04-29 19:48:39 +1000 |
| commit | 6c97f9c411593118bfd807b8a1b8370b17120454 (patch) | |
| tree | a5d6928b10f3b4979a8a4afdf30087bad9e9eaad /src/PositionCache.cxx | |
| parent | b3d1c9dd20616fc0e6276571a5bd7faa5141bcdd (diff) | |
| download | scintilla-mirror-6c97f9c411593118bfd807b8a1b8370b17120454.tar.gz | |
Use indicators to show matching braces. Feature #3290434.
From Marko Njezic.
Diffstat (limited to 'src/PositionCache.cxx')
| -rw-r--r-- | src/PositionCache.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/PositionCache.cxx b/src/PositionCache.cxx index 2ed152455..52c4326c0 100644 --- a/src/PositionCache.cxx +++ b/src/PositionCache.cxx @@ -151,15 +151,15 @@ void LineLayout::SetLineStart(int line, int start) { } void LineLayout::SetBracesHighlight(Range rangeLine, Position braces[], - char bracesMatchStyle, int xHighlight) { - if (rangeLine.ContainsCharacter(braces[0])) { + char bracesMatchStyle, int xHighlight, bool ignoreStyle) { + if (!ignoreStyle && rangeLine.ContainsCharacter(braces[0])) { int braceOffset = braces[0] - rangeLine.start; if (braceOffset < numCharsInLine) { bracePreviousStyles[0] = styles[braceOffset]; styles[braceOffset] = bracesMatchStyle; } } - if (rangeLine.ContainsCharacter(braces[1])) { + if (!ignoreStyle && rangeLine.ContainsCharacter(braces[1])) { int braceOffset = braces[1] - rangeLine.start; if (braceOffset < numCharsInLine) { bracePreviousStyles[1] = styles[braceOffset]; @@ -172,14 +172,14 @@ void LineLayout::SetBracesHighlight(Range rangeLine, Position braces[], } } -void LineLayout::RestoreBracesHighlight(Range rangeLine, Position braces[]) { - if (rangeLine.ContainsCharacter(braces[0])) { +void LineLayout::RestoreBracesHighlight(Range rangeLine, Position braces[], bool ignoreStyle) { + if (!ignoreStyle && rangeLine.ContainsCharacter(braces[0])) { int braceOffset = braces[0] - rangeLine.start; if (braceOffset < numCharsInLine) { styles[braceOffset] = bracePreviousStyles[0]; } } - if (rangeLine.ContainsCharacter(braces[1])) { + if (!ignoreStyle && rangeLine.ContainsCharacter(braces[1])) { int braceOffset = braces[1] - rangeLine.start; if (braceOffset < numCharsInLine) { styles[braceOffset] = bracePreviousStyles[1]; |