diff options
| author | XhmikosR <xhmikosr@gmail.com> | 2015-08-04 00:52:40 +0300 |
|---|---|---|
| committer | XhmikosR <xhmikosr@gmail.com> | 2015-08-04 09:29:48 +0300 |
| commit | af3a1a1dbfbf017e6a192a89c55f92238010336c (patch) | |
| tree | 71083fac10b3561a2877f98e6c4587dc62087cda /scintilla/lexers/LexEScript.cxx | |
| parent | 26e3e3c2440c5fa2cbbe080bfc228687bec8574a (diff) | |
| download | notepad2-mod-af3a1a1dbfbf017e6a192a89c55f92238010336c.zip notepad2-mod-af3a1a1dbfbf017e6a192a89c55f92238010336c.tar.gz notepad2-mod-af3a1a1dbfbf017e6a192a89c55f92238010336c.tar.bz2 | |
Update Scintilla to 3.6.0.
Diffstat (limited to 'scintilla/lexers/LexEScript.cxx')
| -rw-r--r-- | scintilla/lexers/LexEScript.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scintilla/lexers/LexEScript.cxx b/scintilla/lexers/LexEScript.cxx index 9dd38ac..d0a6d73 100644 --- a/scintilla/lexers/LexEScript.cxx +++ b/scintilla/lexers/LexEScript.cxx @@ -37,7 +37,7 @@ static inline bool IsAWordStart(const int ch) { -static void ColouriseESCRIPTDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+static void ColouriseESCRIPTDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
Accessor &styler) {
WordList &keywords = *keywordlists[0];
@@ -176,24 +176,24 @@ static bool IsStreamCommentStyle(int style) { style == SCE_ESCRIPT_COMMENTLINE;
}
-static void FoldESCRIPTDoc(unsigned int startPos, int length, int initStyle, WordList *[], Accessor &styler) {
+static void FoldESCRIPTDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) {
//~ bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
// Do not know how to fold the comment at the moment.
bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
bool foldComment = true;
- unsigned int endPos = startPos + length;
+ Sci_PositionU endPos = startPos + length;
int visibleChars = 0;
- int lineCurrent = styler.GetLine(startPos);
+ Sci_Position lineCurrent = styler.GetLine(startPos);
int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
int levelCurrent = levelPrev;
char chNext = styler[startPos];
int styleNext = styler.StyleAt(startPos);
int style = initStyle;
- int lastStart = 0;
+ Sci_Position lastStart = 0;
char prevWord[32] = "";
- for (unsigned int i = startPos; i < endPos; i++) {
+ for (Sci_PositionU i = startPos; i < endPos; i++) {
char ch = chNext;
chNext = styler.SafeGetCharAt(i + 1);
int stylePrev = style;
@@ -231,7 +231,7 @@ static void FoldESCRIPTDoc(unsigned int startPos, int length, int initStyle, Wor if (style == SCE_ESCRIPT_WORD3) {
if(iswordchar(ch) && !iswordchar(chNext)) {
char s[32];
- unsigned int j;
+ Sci_PositionU j;
for(j = 0; ( j < 31 ) && ( j < i-lastStart+1 ); j++) {
s[j] = static_cast<char>(tolower(styler[lastStart + j]));
}
|