Applied patch [ 571965 ] update stc contrib stuff

[wxWidgets.git] / contrib / src / stc / scintilla / src / DocumentAccessor.cxx

diff --git a/contrib/src/stc/scintilla/src/DocumentAccessor.cxx b/contrib/src/stc/scintilla/src/DocumentAccessor.cxx
index d28840c166b5cba6be5d101e390176ba32d017d1..f115f193045d89f16f2d478bf73b22fefc11a796 100644 (file)
--- a/contrib/src/stc/scintilla/src/DocumentAccessor.cxx
+++ b/contrib/src/stc/scintilla/src/DocumentAccessor.cxx
@@ -1,10 +1,13 @@
-// SciTE - Scintilla based Text Editor
-// Accessor.cxx - rapid easy access to contents of a Scintilla
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
+// Scintilla source code edit control
+/** @file DocumentAccessor.cxx
+ ** Rapid easy access to contents of a Scintilla.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>

 // The License.txt file describes the conditions under which this software may be distributed.
 
 #include <stdlib.h>
 // The License.txt file describes the conditions under which this software may be distributed.
 
 #include <stdlib.h>

-#include <ctype.h> 
+#include <string.h>
+#include <ctype.h>

 #include <stdio.h>
 
 #include "Platform.h"
 #include <stdio.h>
 
 #include "Platform.h"


@@ -21,19 +24,12 @@ DocumentAccessor::~DocumentAccessor() {
 }
 
 bool DocumentAccessor::InternalIsLeadByte(char ch) {
 }
 
 bool DocumentAccessor::InternalIsLeadByte(char ch) {

-#if PLAT_GTK
-       // TODO: support DBCS under GTK+
-       return false;
-#elif PLAT_WIN 

        if (SC_CP_UTF8 == codePage)
                // For lexing, all characters >= 0x80 are treated the
                // same so none is considered a lead byte.
        if (SC_CP_UTF8 == codePage)
                // For lexing, all characters >= 0x80 are treated the
                // same so none is considered a lead byte.

-               return false;   
+               return false;

        else
        else

-               return IsDBCSLeadByteEx(codePage, ch);
-#elif PLAT_WX 
-       return false;
-#endif 
+               return Platform::IsDBCSLeadByte(codePage, ch);

 }
 
 void DocumentAccessor::Fill(int position) {
 }
 
 void DocumentAccessor::Fill(int position) {


@@ -68,10 +64,10 @@ int DocumentAccessor::LevelAt(int line) {
        return pdoc->GetLevel(line);
 }
 
        return pdoc->GetLevel(line);
 }
 

-int DocumentAccessor::Length() { 
-       if (lenDoc == -1) 
+int DocumentAccessor::Length() {
+       if (lenDoc == -1)

                lenDoc = pdoc->Length();
                lenDoc = pdoc->Length();

-       return lenDoc; 
+       return lenDoc;

 }
 
 int DocumentAccessor::GetLineState(int line) {
 }
 
 int DocumentAccessor::GetLineState(int line) {


@@ -84,6 +80,7 @@ int DocumentAccessor::SetLineState(int line, int state) {
 
 void DocumentAccessor::StartAt(unsigned int start, char chMask) {
        pdoc->StartStyling(start, chMask);
 
 void DocumentAccessor::StartAt(unsigned int start, char chMask) {
        pdoc->StartStyling(start, chMask);

+       startPosStyling = start;

 }
 
 void DocumentAccessor::StartSegment(unsigned int pos) {
 }
 
 void DocumentAccessor::StartSegment(unsigned int pos) {


@@ -107,6 +104,7 @@ void DocumentAccessor::ColourTo(unsigned int pos, int chAttr) {
                                chFlags = 0;
                        chAttr |= chFlags;
                        for (unsigned int i = startSeg; i <= pos; i++) {
                                chFlags = 0;
                        chAttr |= chFlags;
                        for (unsigned int i = startSeg; i <= pos; i++) {

+                               PLATFORM_ASSERT((startPosStyling + validLen) < Length());

                                styleBuf[validLen++] = static_cast<char>(chAttr);
                        }
                }
                                styleBuf[validLen++] = static_cast<char>(chAttr);
                        }
                }


@@ -124,18 +122,19 @@ void DocumentAccessor::Flush() {
        if (validLen > 0) {
                pdoc->SetStyles(validLen, styleBuf);
                validLen = 0;
        if (validLen > 0) {
                pdoc->SetStyles(validLen, styleBuf);
                validLen = 0;

+               startPosStyling += validLen;

        }
 }
 
 int DocumentAccessor::IndentAmount(int line, int *flags, PFNIsCommentLeader pfnIsCommentLeader) {
        int end = Length();
        int spaceFlags = 0;
        }
 }
 
 int DocumentAccessor::IndentAmount(int line, int *flags, PFNIsCommentLeader pfnIsCommentLeader) {
        int end = Length();
        int spaceFlags = 0;

-       
-       // Determines the indentation level of the current line and also checks for consistent 
+
+       // Determines the indentation level of the current line and also checks for consistent

        // indentation compared to the previous line.
        // indentation compared to the previous line.

-       // Indentation is judged consistent when the indentation whitespace of each line lines 
+       // Indentation is judged consistent when the indentation whitespace of each line lines

        // the same or the indentation of one line is a prefix of the other.
        // the same or the indentation of one line is a prefix of the other.

-       
+

        int pos = LineStart(line);
        char ch = (*this)[pos];
        int indent = 0;
        int pos = LineStart(line);
        char ch = (*this)[pos];
        int indent = 0;


@@ -162,11 +161,12 @@ int DocumentAccessor::IndentAmount(int line, int *flags, PFNIsCommentLeader pfnI
                }
                ch = (*this)[++pos];
        }
                }
                ch = (*this)[++pos];
        }

-       
+

        *flags = spaceFlags;
        indent += SC_FOLDLEVELBASE;
        // if completely empty line or the start of a comment...
        *flags = spaceFlags;
        indent += SC_FOLDLEVELBASE;
        // if completely empty line or the start of a comment...

-       if (isspace(ch) || (pfnIsCommentLeader && (*pfnIsCommentLeader)(*this, pos, end-pos)) )
+       if ((ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r') || 
+               (pfnIsCommentLeader && (*pfnIsCommentLeader)(*this, pos, end-pos)) )

                return indent | SC_FOLDLEVELWHITEFLAG;
        else
                return indent;
                return indent | SC_FOLDLEVELWHITEFLAG;
        else
                return indent;