Commits July 2012

commits@lists.geany.org

1 participants
381 discussions

[geany/geany] 89b7e0: Fix invalid use of strcpy() on overlapping memory

by Colomban Wendling

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 30 Jul 2012 22:33:53 Commit: 89b7e089c42f52c50dba70bb508d8803fa830f0a https://github.com/geany/geany/commit/89b7e089c42f52c50dba70bb508d8803fa830… Log Message: ----------- Fix invalid use of strcpy() on overlapping memory strcpy()'s behavior on overlapping memory is undefined, so replace such uses with memmove(). Based on CTags r783: https://ctags.svn.sourceforge.net/svnroot/ctags@783 Modified Paths: -------------- tagmanager/ctags/ctags.c Modified: tagmanager/ctags/ctags.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -739,13 +739,13 @@ static char* absoluteFilename (const char *file) else if (cp [0] != '/') cp = slashp; #endif - strcpy (cp, slashp + 3); + memmove (cp, slashp + 3, strlen (slashp + 3) + 1); slashp = cp; continue; } else if (slashp [2] == '/' || slashp [2] == '\0') { - strcpy (slashp, slashp + 2); + memmove (slashp, slashp + 2, strlen (slashp + 2) + 1); continue; } } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

11 years, 4 months

[geany/geany] fd40e4: Mark a few things as static

by Colomban Wendling

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 30 Jul 2012 22:32:53 Commit: fd40e4aa547b4fb8027bd9a5a8946afc7c93fd8d https://github.com/geany/geany/commit/fd40e4aa547b4fb8027bd9a5a8946afc7c93f… Log Message: ----------- Mark a few things as static Based on CTags r779: https://ctags.svn.sourceforge.net/svnroot/ctags@779 Modified Paths: -------------- tagmanager/ctags/objc.c Modified: tagmanager/ctags/objc.c 15 files changed, 8 insertions(+), 7 deletions(-) =================================================================== @@ -431,16 +431,16 @@ static objcKeyword lex (lexingState * st) /********** Helpers */ /* This variable hold the 'parser' which is going to * handle the next token */ -parseNext toDoNext; +static parseNext toDoNext; /* Special variable used by parser eater to * determine which action to put after their * job is finished. */ -parseNext comeAfter; +static parseNext comeAfter; /* Used by some parsers detecting certain token * to revert to previous parser. */ -parseNext fallback; +static parseNext fallback; /********** Grammar */ @@ -466,13 +466,13 @@ static void prepareTag (tagEntryInfo * tag, vString const *name, objcKind kind) } } -void pushEnclosingContext (const vString * parent, objcKind type) +static void pushEnclosingContext (const vString * parent, objcKind type) { vStringCopy (parentName, parent); parentType = type; } -void popEnclosingContext (void) +static void popEnclosingContext (void) { vStringClear (parentName); } @@ -486,7 +486,7 @@ static void addTag (vString * const ident, int kind) makeTagEntry (&toCreate); } -objcToken waitedToken, fallBackToken; +static objcToken waitedToken, fallBackToken; /* Ignore everything till waitedToken and jump to comeAfter. * If the "end" keyword is encountered break, doesn't remember @@ -795,7 +795,8 @@ static void parseStructMembers (vString * const ident, objcToken what) break; /* some types are complex, the only one - * we will loose is the function type. */ + * we will loose is the function type. + */ case Tok_CurlL: /* '{' */ case Tok_PARL: /* '(' */ case Tok_SQUAREL: /* '[' */ @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

11 years, 4 months

[geany/geany] 3a460a: Remove and unused structure member

by Colomban Wendling

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 30 Jul 2012 22:31:43 Commit: 3a460a2c5ba2de3aa01f2bea2a001c36dd01b839 https://github.com/geany/geany/commit/3a460a2c5ba2de3aa01f2bea2a001c36dd01b… Log Message: ----------- Remove and unused structure member Based on CTags r769: https://ctags.svn.sourceforge.net/svnroot/ctags@769 Modified Paths: -------------- tagmanager/ctags/read.c tagmanager/ctags/read.h Modified: tagmanager/ctags/read.c 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -277,7 +277,6 @@ extern boolean fileOpen (const char *const fileName, const langType language) mio_getpos (File.mio, &StartOfLine); mio_getpos (File.mio, &File.filePosition); File.currentLine = NULL; - File.language = language; File.lineNumber = 0L; File.eof = FALSE; File.newLine = TRUE; @@ -324,7 +323,6 @@ extern boolean bufferOpen (unsigned char *buffer, int buffer_size, mio_getpos (File.mio, &StartOfLine); mio_getpos (File.mio, &File.filePosition); File.currentLine = NULL; - File.language = language; File.lineNumber = 0L; File.eof = FALSE; File.newLine = TRUE; Modified: tagmanager/ctags/read.h 1 files changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -79,7 +79,6 @@ enum eCharacters { int ungetch; /* a single character that was ungotten */ boolean eof; /* have we reached the end of file? */ boolean newLine; /* will the next character begin a new line? */ - langType language; /* language of input file */ /* Contains data pertaining to the original source file in which the tag * was defined. This may be different from the input file when #line @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

11 years, 4 months

[geany/geany] 13e5c0: Fix Haskell parsing when a comment is the first thing inside a type

by Colomban Wendling

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 30 Jul 2012 18:15:08 Commit: 13e5c0202a73f70b4aa76dfa23aef7da5493e320 https://github.com/geany/geany/commit/13e5c0202a73f70b4aa76dfa23aef7da5493e… Log Message: ----------- Fix Haskell parsing when a comment is the first thing inside a type Closes #3552129. Modified Paths: -------------- tagmanager/ctags/haskell.c Modified: tagmanager/ctags/haskell.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -189,7 +189,7 @@ static int inside_datatype(vString *name) else if (st == Get_Extr) { do { - c = fileGetc(); + c = get_next_char(); } while (isspace(c)); if (c == EOF) return c; @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

11 years, 4 months

[geany/geany] 03509e: Update Scintilla to version 3.2.1

by Colomban Wendling

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 14 Jul 2012 13:30:03 Commit: 03509ee1a89856256f42a4ada5b635e70dab9472 https://github.com/geany/geany/commit/03509ee1a89856256f42a4ada5b635e70dab9… Log Message: ----------- Update Scintilla to version 3.2.1 Closes #3540469 Modified Paths: -------------- NEWS scintilla/include/Platform.h scintilla/include/SciLexer.h scintilla/include/Scintilla.h scintilla/include/Scintilla.iface scintilla/lexers/LexCPP.cxx scintilla/lexers/LexCSS.cxx scintilla/lexers/LexFortran.cxx scintilla/lexers/LexHTML.cxx scintilla/lexlib/CharacterSet.h scintilla/src/AutoComplete.cxx scintilla/src/AutoComplete.h scintilla/src/CharClassify.cxx scintilla/src/CharClassify.h scintilla/src/Document.cxx scintilla/src/Document.h scintilla/src/Editor.cxx scintilla/src/Editor.h scintilla/src/PerLine.cxx scintilla/src/PerLine.h scintilla/src/ScintillaBase.cxx scintilla/src/ViewStyle.h scintilla/version.txt Modified: NEWS 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ Geany 1.23 (unreleased) Editor - * Update Scintilla to version 3.2.0. + * Update Scintilla to version 3.2.1 (#3540469). Geany 1.22 (June 18, 2012) Modified: scintilla/include/Platform.h 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -31,14 +31,14 @@ #undef PLAT_WX #define PLAT_WX 1 -#elif defined(GTK) -#undef PLAT_GTK -#define PLAT_GTK 1 - #elif defined(SCINTILLA_QT) #undef PLAT_QT #define PLAT_QT 1 +#elif defined(GTK) +#undef PLAT_GTK +#define PLAT_GTK 1 + #if defined(__WIN32__) || defined(_MSC_VER) #undef PLAT_GTK_WIN32 #define PLAT_GTK_WIN32 1 Modified: scintilla/include/SciLexer.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -160,6 +160,7 @@ #define SCE_C_STRINGRAW 20 #define SCE_C_TRIPLEVERBATIM 21 #define SCE_C_HASHQUOTEDSTRING 22 +#define SCE_C_PREPROCESSORCOMMENT 23 #define SCE_D_DEFAULT 0 #define SCE_D_COMMENT 1 #define SCE_D_COMMENTLINE 2 Modified: scintilla/include/Scintilla.h 4 files changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -246,6 +246,7 @@ #define SCI_GETCARETPERIOD 2075 #define SCI_SETCARETPERIOD 2076 #define SCI_SETWORDCHARS 2077 +#define SCI_GETWORDCHARS 2646 #define SCI_BEGINUNDOACTION 2078 #define SCI_ENDUNDOACTION 2079 #define INDIC_PLAIN 0 @@ -684,6 +685,9 @@ #define SCI_WORDRIGHTEND 2441 #define SCI_WORDRIGHTENDEXTEND 2442 #define SCI_SETWHITESPACECHARS 2443 +#define SCI_GETWHITESPACECHARS 2647 +#define SCI_SETPUNCTUATIONCHARS 2648 +#define SCI_GETPUNCTUATIONCHARS 2649 #define SCI_SETCHARSDEFAULT 2444 #define SCI_AUTOCGETCURRENT 2445 #define SCI_AUTOCGETCURRENTTEXT 2610 Modified: scintilla/include/Scintilla.iface 63 files changed, 39 insertions(+), 24 deletions(-) =================================================================== @@ -287,13 +287,13 @@ val SC_MASK_FOLDERS=0xFE000000 fun void MarkerDefine=2040(int markerNumber, int markerSymbol) # Set the foreground colour used for a particular marker number. -fun void MarkerSetFore=2041(int markerNumber, colour fore) +set void MarkerSetFore=2041(int markerNumber, colour fore) # Set the background colour used for a particular marker number. -fun void MarkerSetBack=2042(int markerNumber, colour back) +set void MarkerSetBack=2042(int markerNumber, colour back) # Set the background colour used for a particular marker number when its folding block is selected. -fun void MarkerSetBackSelected=2292(int markerNumber, colour back) +set void MarkerSetBackSelected=2292(int markerNumber, colour back) # Enable/disable highlight for current folding bloc (smallest one that contains the caret) fun void MarkerEnableHighlight=2293(bool enabled,) @@ -324,7 +324,7 @@ fun void MarkerDefinePixmap=2049(int markerNumber, string pixmap) fun void MarkerAddSet=2466(int line, int set) # Set the alpha used for a marker that is drawn in the text area, not the margin. -fun void MarkerSetAlpha=2476(int markerNumber, int alpha) +set void MarkerSetAlpha=2476(int markerNumber, int alpha) enu MarginType=SC_MARGIN_ val SC_MARGIN_SYMBOL=0 @@ -403,7 +403,7 @@ val SC_CHARSET_THAI=222 val SC_CHARSET_8859_15=1000 # Clear all the styles and make equivalent to the global default style. -set void StyleClearAll=2050(,) +fun void StyleClearAll=2050(,) # Set the foreground colour of a style. set void StyleSetFore=2051(int style, colour fore) @@ -454,7 +454,7 @@ get int StyleGetSize=2485(int style,) # Get the font of a style. # Returns the length of the fontName -fun int StyleGetFont=2486(int style, stringresult fontName) +get int StyleGetFont=2486(int style, stringresult fontName) # Get is a style to have its end of line filled or not. get bool StyleGetEOLFilled=2487(int style,) @@ -552,6 +552,10 @@ set void SetCaretPeriod=2076(int periodMilliseconds,) # First sets defaults like SetCharsDefault. set void SetWordChars=2077(, string characters) +# Get the set of characters making up words for when moving or selecting by word. +# Retuns the number of characters +get int GetWordChars=2646(, stringresult characters) + # Start a sequence of actions that is undone and redone as a unit. # May be nested. fun void BeginUndoAction=2078(,) @@ -1108,7 +1112,7 @@ val SC_FOLDFLAG_LINEAFTER_CONTRACTED=0x0010 val SC_FOLDFLAG_LEVELNUMBERS=0x0040 # Set some style options for folding. -fun void SetFoldFlags=2233(int flags,) +set void SetFoldFlags=2233(int flags,) # Ensure a particular line is visible by expanding any header line hiding it. # Use the currently set visibility policy to determine which range to display. @@ -1277,7 +1281,7 @@ set void SetMultiPaste=2614(int multiPaste,) get int GetMultiPaste=2615(,) # Retrieve the value of a tag from a regular expression search. -fun int GetTag=2616(int tagNumber, stringresult tagValue) +get int GetTag=2616(int tagNumber, stringresult tagValue) # Make the target range start and end be the same as the selection range start and end. fun void TargetFromSelection=2287(,) @@ -1629,7 +1633,7 @@ fun void DelLineLeft=2395(,) # Delete forwards from the current position to the end of the line. fun void DelLineRight=2396(,) -# Get and Set the xOffset (ie, horizonal scroll position). +# Get and Set the xOffset (ie, horizontal scroll position). set void SetXOffset=2397(int newOffset,) get int GetXOffset=2398(,) @@ -1663,7 +1667,7 @@ val CARET_JUMPS=0x10 # where most code reside, and the lines after the caret, eg. the body of a function. val CARET_EVEN=0x08 -# Set the way the caret is kept visible when going sideway. +# Set the way the caret is kept visible when going sideways. # The exclusion zone is given in pixels. fun void SetXCaretPolicy=2402(int caretPolicy, int caretSlop) @@ -1800,15 +1804,25 @@ fun void WordRightEndExtend=2442(,) # Should be called after SetWordChars. set void SetWhitespaceChars=2443(, string characters) +# Get the set of characters making up whitespace for when moving or selecting by word. +get int GetWhitespaceChars=2647(, stringresult characters) + +# Set the set of characters making up punctuation characters +# Should be called after SetWordChars. +set void SetPunctuationChars=2648(, string characters) + +# Get the set of characters making up punctuation characters +get int GetPunctuationChars=2649(, stringresult characters) + # Reset the set of characters for whitespace and word characters to the defaults. fun void SetCharsDefault=2444(,) # Get currently selected item position in the auto-completion list -fun int AutoCGetCurrent=2445(,) +get int AutoCGetCurrent=2445(,) # Get currently selected item text in the auto-completion list # Returns the length of the item text -fun int AutoCGetCurrentText=2610(, stringresult s) +get int AutoCGetCurrentText=2610(, stringresult s) enu CaseInsensitiveBehaviour=SC_CASEINSENSITIVEBEHAVIOUR_ val SC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE=0 @@ -1893,7 +1907,7 @@ get int GetIndicatorCurrent=2501(,) # Set the value used for IndicatorFillRange set void SetIndicatorValue=2502(int value,) -# Get the current indicator vaue +# Get the current indicator value get int GetIndicatorValue=2503(,) # Turn a indicator on over a range. @@ -2090,10 +2104,10 @@ get int GetSelections=2570(,) fun void ClearSelections=2571(,) # Set a simple selection -fun int SetSelection=2572(int caret,int anchor) +fun int SetSelection=2572(int caret, int anchor) # Add a selection -fun int AddSelection=2573(int caret,int anchor) +fun int AddSelection=2573(int caret, int anchor) # Set the main selection set void SetMainSelection=2574(int selection,) @@ -2117,7 +2131,7 @@ set void SetSelectionNStart=2584(int selection, position pos) get position GetSelectionNStart=2585(int selection,) # Sets the position that ends the selection - this becomes the currentPosition. -set void SetSelectionNEnd=2586(int selection, position pos,) +set void SetSelectionNEnd=2586(int selection, position pos) # Returns the position at the end of the selection. get position GetSelectionNEnd=2587(int selection,) @@ -2221,7 +2235,7 @@ fun void ScrollToEnd=2629(,) val SC_TECHNOLOGY_DEFAULT=0 val SC_TECHNOLOGY_DIRECTWRITE=1 -# Set the technolgy used. +# Set the technology used. set void SetTechnology=2630(int technology,) # Get the tech. @@ -2270,11 +2284,11 @@ set void SetLexerLanguage=4006(, string language) fun void LoadLexerLibrary=4007(, string path) # Retrieve a "property" value previously set with SetProperty. -fun int GetProperty=4008(string key, stringresult buf) +get int GetProperty=4008(string key, stringresult buf) # Retrieve a "property" value previously set with SetProperty, # with "$()" variable replacement on returned buffer. -fun int GetPropertyExpanded=4009(string key, stringresult buf) +get int GetPropertyExpanded=4009(string key, stringresult buf) # Retrieve a "property" value previously set with SetProperty, # interpreted as an int AFTER any "$()" variable replacement. @@ -2311,7 +2325,7 @@ fun int DescribeKeyWordSets=4017(, stringresult descriptions) # Type of modification and the action which caused the modification. # These are defined as a bit mask to make it easy to specify which notifications are wanted. # One bit is set from each of SC_MOD_* and SC_PERFORMED_*. -enu ModificationFlags=SC_MOD_ SC_PERFORMED_ SC_LAST +enu ModificationFlags=SC_MOD_ SC_PERFORMED_ SC_MULTISTEPUNDOREDO SC_LASTSTEPINUNDOREDO SC_MULTILINEUNDOREDO SC_STARTACTION SC_MODEVENTMASKALL val SC_MOD_INSERTTEXT=0x1 val SC_MOD_DELETETEXT=0x2 val SC_MOD_CHANGESTYLE=0x4 @@ -2540,6 +2554,7 @@ val SCE_C_GLOBALCLASS=19 val SCE_C_STRINGRAW=20 val SCE_C_TRIPLEVERBATIM=21 val SCE_C_HASHQUOTEDSTRING=22 +val SCE_C_PREPROCESSORCOMMENT=23 # Lexical states for SCLEX_D lex D=SCLEX_D SCE_D_ val SCE_D_DEFAULT=0 @@ -2590,10 +2605,10 @@ val SCE_TCL_WORD8=19 val SCE_TCL_COMMENT_BOX=20 val SCE_TCL_BLOCK_COMMENT=21 # Lexical states for SCLEX_HTML, SCLEX_XML -lex HTML=SCLEX_HTML SCE_H -lex XML=SCLEX_XML SCE_H -lex ASP=SCLEX_ASP SCE_H -lex PHP=SCLEX_PHP SCE_H +lex HTML=SCLEX_HTML SCE_H_ SCE_HJ_ SCE_HJA_ SCE_HB_ SCE_HBA_ SCE_HP_ SCE_HPHP_ SCE_HPA_ +lex XML=SCLEX_XML SCE_H_ SCE_HJ_ SCE_HJA_ SCE_HB_ SCE_HBA_ SCE_HP_ SCE_HPHP_ SCE_HPA_ +lex ASP=SCLEX_ASP SCE_H_ SCE_HJ_ SCE_HJA_ SCE_HB_ SCE_HBA_ SCE_HP_ SCE_HPHP_ SCE_HPA_ +lex PHP=SCLEX_PHP SCE_H_ SCE_HJ_ SCE_HJA_ SCE_HB_ SCE_HBA_ SCE_HP_ SCE_HPHP_ SCE_HPA_ val SCE_H_DEFAULT=0 val SCE_H_TAG=1 val SCE_H_TAGUNKNOWN=2 Modified: scintilla/lexers/LexCPP.cxx 32 files changed, 25 insertions(+), 7 deletions(-) =================================================================== @@ -379,6 +379,12 @@ class LexerCPP : public ILexer { int SCI_METHOD LexerCPP::PropertySet(const char *key, const char *val) { if (osCPP.PropertySet(&options, key, val)) { + if (strcmp(key, "lexer.cpp.allow.dollars") == 0) { + setWord = CharacterSet(CharacterSet::setAlphaNum, "._", 0x80, true); + if (options.identifiersAllowDollars) { + setWord.Add('$'); + } + } return 0; } return -1; @@ -453,7 +459,6 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, if (options.identifiersAllowDollars) { setWordStart.Add('$'); - setWord.Add('$'); } int chPrevNonWhite = ' '; @@ -517,7 +522,7 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, int activitySet = preproc.IsInactive() ? activeFlag : 0; - for (; sc.More(); sc.Forward()) { + for (; sc.More();) { if (sc.atLineStart) { // Using MaskActive() is not needed in the following statement. @@ -527,6 +532,9 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, // ends with a line continuation by locking in the state upto this position. sc.SetState(sc.state); } + if ((MaskActive(sc.state) == SCE_C_PREPROCESSOR) && (!continuationLine)) { + sc.SetState(SCE_C_DEFAULT|activitySet); + } // Reset states to begining of colourise so no surprises // if different sets of lines lexed. visibleChars = 0; @@ -556,6 +564,7 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, sc.Forward(); } continuationLine = true; + sc.Forward(); continue; } } @@ -610,18 +619,26 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, } break; case SCE_C_PREPROCESSOR: - if (sc.atLineStart && !continuationLine) { - sc.SetState(SCE_C_DEFAULT|activitySet); - } else if (options.stylingWithinPreprocessor) { + if (options.stylingWithinPreprocessor) { if (IsASpace(sc.ch)) { sc.SetState(SCE_C_DEFAULT|activitySet); } } else { - if (sc.Match('/', '*') || sc.Match('/', '/')) { + if (sc.Match('/', '*')) { + sc.SetState(SCE_C_PREPROCESSORCOMMENT|activitySet); + sc.Forward(); // Eat the * + } else if (sc.Match('/', '/')) { sc.SetState(SCE_C_DEFAULT|activitySet); } } break; + case SCE_C_PREPROCESSORCOMMENT: + if (sc.Match('*', '/')) { + sc.Forward(); + sc.ForwardSetState(SCE_C_PREPROCESSOR|activitySet); + continue; // Without advancing in case of '\'. + } + break; case SCE_C_COMMENT: if (sc.Match('*', '/')) { sc.Forward(); @@ -918,11 +935,12 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, } } - if (!IsASpace(sc.ch) && !IsSpaceEquiv(sc.state)) { + if (!IsASpace(sc.ch) && !IsSpaceEquiv(MaskActive(sc.state))) { chPrevNonWhite = sc.ch; visibleChars++; } continuationLine = false; + sc.Forward(); } const bool rawStringsChanged = rawStringTerminators.Merge(rawSTNew, lineCurrent); if (definitionsChanged || rawStringsChanged) Modified: scintilla/lexers/LexCSS.cxx 29 files changed, 21 insertions(+), 8 deletions(-) =================================================================== @@ -98,18 +98,29 @@ static void ColouriseCssDoc(unsigned int startPos, int length, int initStyle, Wo // Set to 1 for Sassy CSS (.scss) bool isScssDocument = styler.GetPropertyInt("lexer.css.scss.language") != 0; - // TODO: implement Less support - bool isLessDocument = false; + // property lexer.css.less.language + // Set to 1 for Less CSS (.less) + bool isLessDocument = styler.GetPropertyInt("lexer.css.less.language") != 0; - // SCSS and Less both support single-line comments + // property lexer.css.hss.language + // Set to 1 for HSS (.hss) + bool isHssDocument = styler.GetPropertyInt("lexer.css.hss.language") != 0; + + // SCSS/LESS/HSS have the concept of variable + bool hasVariables = isScssDocument || isLessDocument || isHssDocument; + char varPrefix = 0; + if (hasVariables) + varPrefix = isLessDocument ? '@' : '$'; + + // SCSS/LESS/HSS support single-line comments typedef enum _CommentModes { eCommentBlock = 0, eCommentLine = 1} CommentMode; CommentMode comment_mode = eCommentBlock; - bool hasSingleLineComments = isScssDocument || isLessDocument; + bool hasSingleLineComments = isScssDocument || isLessDocument || isHssDocument; - // must keep track of nesting level in document types that support it (SCSS, Less) + // must keep track of nesting level in document types that support it (SCSS/LESS/HSS) bool hasNesting = false; int nestingLevel = 0; - if (isScssDocument || isLessDocument) { + if (isScssDocument || isLessDocument || isHssDocument) { hasNesting = true; nestingLevel = NestingLevelLookBehind(startPos, styler); } @@ -329,11 +340,13 @@ static void ColouriseCssDoc(unsigned int startPos, int length, int initStyle, Wo insideParentheses = false; // SCSS special modes - if (isScssDocument) { + if (hasVariables) { // variable name - if (sc.ch == '$') { + if (sc.ch == varPrefix) { switch (sc.state) { case SCE_CSS_DEFAULT: + if (isLessDocument) // give priority to pseudo elements + break; case SCE_CSS_VALUE: lastStateVar = sc.state; sc.SetState(SCE_CSS_VARIABLE); Modified: scintilla/lexers/LexFortran.cxx 33 files changed, 23 insertions(+), 10 deletions(-) =================================================================== @@ -87,7 +87,7 @@ static void ColouriseFortranDoc(unsigned int startPos, int length, int initStyle /***********************************************/ // Handle the fix format generically int toLineStart = sc.currentPos - posLineStart; - if (isFixFormat && (toLineStart < 6 || toLineStart > 72)) { + if (isFixFormat && (toLineStart < 6 || toLineStart >= 72)) { if ((toLineStart == 0 && (tolower(sc.ch) == 'c' || sc.ch == '*')) || sc.ch == '!') { if (sc.MatchIgnoreCase("cdec$") || sc.MatchIgnoreCase("*dec$") || sc.MatchIgnoreCase("!dec$") || sc.MatchIgnoreCase("cdir$") || sc.MatchIgnoreCase("*dir$") || sc.MatchIgnoreCase("!dir$") || @@ -99,7 +99,7 @@ static void ColouriseFortranDoc(unsigned int startPos, int length, int initStyle } while (!sc.atLineEnd && sc.More()) sc.Forward(); // Until line end - } else if (toLineStart > 72) { + } else if (toLineStart >= 72) { sc.SetState(SCE_F_COMMENT); while (!sc.atLineEnd && sc.More()) sc.Forward(); // Until line end } else if (toLineStart < 5) { @@ -108,17 +108,27 @@ static void ColouriseFortranDoc(unsigned int startPos, int length, int initStyle else sc.SetState(SCE_F_DEFAULT); } else if (toLineStart == 5) { - if (!IsASpace(sc.ch) && sc.ch != '0') { + //if (!IsASpace(sc.ch) && sc.ch != '0') { + if (sc.ch != '\r' && sc.ch != '\n') { sc.SetState(SCE_F_CONTINUATION); - sc.ForwardSetState(prevState); + if (!IsASpace(sc.ch) && sc.ch != '0') + sc.ForwardSetState(prevState); } else sc.SetState(SCE_F_DEFAULT); } continue; } /***************************************/ + // Hanndle preprocessor directives + if (sc.ch == '#' && numNonBlank == 1) + { + sc.SetState(SCE_F_PREPROCESSOR); + while (!sc.atLineEnd && sc.More()) + sc.Forward(); // Until line end + } + /***************************************/ // Handle line continuation generically. - if (!isFixFormat && sc.ch == '&') { + if (!isFixFormat && sc.ch == '&' && sc.state != SCE_F_COMMENT) { char chTemp = ' '; int j = 1; while (IsABlank(chTemp) && j<132) { @@ -252,7 +262,8 @@ static int classifyFoldPointFortran(const char* s, const char* prevWord, const c || strcmp(s, "function") == 0 || strcmp(s, "interface") == 0 || strcmp(s, "module") == 0 || strcmp(s, "program") == 0 || strcmp(s, "subroutine") == 0 || strcmp(s, "then") == 0 - || (strcmp(s, "type") == 0 && chNextNonBlank != '(') ){ + || (strcmp(s, "type") == 0 && chNextNonBlank != '(') + || strcmp(s, "critical") == 0){ if (strcmp(prevWord, "end") == 0) lev = 0; else @@ -265,12 +276,14 @@ static int classifyFoldPointFortran(const char* s, const char* prevWord, const c || strcmp(s, "endfunction") == 0 || strcmp(s, "endinterface") == 0 || strcmp(s, "endmodule") == 0 || strcmp(s, "endprogram") == 0 || strcmp(s, "endsubroutine") == 0 || strcmp(s, "endtype") == 0 - || strcmp(s, "endwhere") == 0 - || (strcmp(s, "procedure") == 0 && strcmp(prevWord,"module")==0) ) { // Take care of the module procedure statement + || strcmp(s, "endwhere") == 0 || strcmp(s, "endcritical") == 0 + || (strcmp(s, "procedure") == 0 && strcmp(prevWord, "module") == 0) ) { // Take care of the "module procedure" statement lev = -1; } else if (strcmp(prevWord, "end") == 0 && strcmp(s, "if") == 0){ // end if lev = 0; - } + } else if (strcmp(prevWord, "type") == 0 && strcmp(s, "is") == 0){ // type is + lev = -1; + } return lev; } // Folding the code @@ -312,7 +325,7 @@ static void FoldFortranDoc(unsigned int startPos, int length, int initStyle, styleNext = styler.StyleAt(i + 1); bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); // - if (stylePrev == SCE_F_DEFAULT && (style == SCE_F_WORD || style == SCE_F_LABEL)) { + if (((isFixFormat && stylePrev == SCE_F_CONTINUATION) || stylePrev == SCE_F_DEFAULT || stylePrev == SCE_F_OPERATOR) && (style == SCE_F_WORD || style == SCE_F_LABEL)) { // Store last word and label start point. lastStart = i; } Modified: scintilla/lexers/LexHTML.cxx 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1089,7 +1089,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty state = SCE_H_SGML_COMMAND; // wait for a pending command } // fold whole tag (-- when closing the tag) - if (foldHTMLPreprocessor || (state == SCE_H_COMMENT)) + if (foldHTMLPreprocessor || state == SCE_H_COMMENT || state == SCE_H_CDATA) levelCurrent++; continue; } Modified: scintilla/lexlib/CharacterSet.h 37 files changed, 33 insertions(+), 4 deletions(-) =================================================================== @@ -40,11 +40,32 @@ class CharacterSet { if (base & setDigits) AddString("0123456789"); } + CharacterSet(const CharacterSet &other) { + size = other.size; + valueAfter = other.valueAfter; + bset = new bool[size]; + for (int i=0; i < size; i++) { + bset[i] = other.bset[i]; + } + } ~CharacterSet() { delete []bset; bset = 0; size = 0; } + CharacterSet &operator=(const CharacterSet &other) { + if (this != &other) { + bool *bsetNew = new bool[other.size]; + for (int i=0; i < other.size; i++) { + bsetNew[i] = other.bset[i]; + } + delete []bset; + size = other.size; + valueAfter = other.valueAfter; + bset = bsetNew; + } + return *this; + } void Add(int val) { assert(val >= 0); assert(val < size); @@ -90,7 +111,15 @@ inline bool IsADigit(int ch, int base) { } inline bool IsASCII(int ch) { - return ch < 0x80; + return (ch >= 0) && (ch < 0x80); +} + +inline bool IsLowerCase(int ch) { + return (ch >= 'a') && (ch <= 'z'); +} + +inline bool IsUpperCase(int ch) { + return (ch >= 'A') && (ch <= 'Z'); } inline bool IsAlphaNumeric(int ch) { @@ -109,15 +138,15 @@ inline bool isspacechar(int ch) { } inline bool iswordchar(int ch) { - return IsASCII(ch) && (IsAlphaNumeric(ch) || ch == '.' || ch == '_'); + return IsAlphaNumeric(ch) || ch == '.' || ch == '_'; } inline bool iswordstart(int ch) { - return IsASCII(ch) && (IsAlphaNumeric(ch) || ch == '_'); + return IsAlphaNumeric(ch) || ch == '_'; } inline bool isoperator(int ch) { - if (IsASCII(ch) && IsAlphaNumeric(ch)) + if (IsAlphaNumeric(ch)) return false; if (ch == '%' || ch == '^' || ch == '&' || ch == '*' || ch == '(' || ch == ')' || ch == '-' || ch == '+' || Modified: scintilla/src/AutoComplete.cxx 13 files changed, 12 insertions(+), 1 deletions(-) =================================================================== @@ -10,6 +10,8 @@ #include <stdio.h> #include <assert.h> +#include <string> + #include "Platform.h" #include "CharacterSet.h" @@ -101,6 +103,16 @@ void AutoComplete::SetList(const char *list) { lb->SetList(list, separator, typesep); } +int AutoComplete::GetSelection() const { + return lb->GetSelection(); +} + +std::string AutoComplete::GetValue(int item) const { + char value[maxItemLen]; + lb->GetValue(item, value, sizeof(value)); + return std::string(value); +} + void AutoComplete::Show(bool show) { lb->Show(show); if (show) @@ -130,7 +142,6 @@ void AutoComplete::Move(int delta) { void AutoComplete::Select(const char *word) { size_t lenWord = strlen(word); int location = -1; - const int maxItemLen=1000; int start = 0; // lower bound of the api array block to search int end = lb->Length() - 1; // upper bound of the api array block to search while ((start <= end) && (location == -1)) { // Binary searching loop Modified: scintilla/src/AutoComplete.h 8 files changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -20,8 +20,10 @@ class AutoComplete { char fillUpChars[256]; char separator; char typesep; // Type seperator + enum { maxItemLen=1000 }; public: + bool ignoreCase; bool chooseSingle; ListBox *lb; @@ -61,6 +63,12 @@ class AutoComplete { /// The list string contains a sequence of words separated by the separator character void SetList(const char *list); + + /// Return the position of the currently selected list item + int GetSelection() const; + + /// Return the value of an item in the list + std::string GetValue(int item) const; void Show(bool show); void Cancel(); Modified: scintilla/src/CharClassify.cxx 16 files changed, 16 insertions(+), 0 deletions(-) =================================================================== @@ -46,3 +46,19 @@ void CharClassify::SetCharClasses(const unsigned char *chars, cc newCharClass) { } } } + +int CharClassify::GetCharsOfClass(cc characterClass, unsigned char *buffer) { + // Get characters belonging to the given char class; return the number + // of characters (if the buffer is NULL, don't write to it). + int count = 0; + for (int ch = maxChar - 1; ch >= 0; --ch) { + if (charClass[ch] == characterClass) { + ++count; + if (buffer) { + *buffer = static_cast<unsigned char>(ch); + buffer++; + } + } + } + return count; +} Modified: scintilla/src/CharClassify.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -19,6 +19,7 @@ class CharClassify { enum cc { ccSpace, ccNewLine, ccWord, ccPunctuation }; void SetDefaultCharClasses(bool includeWordClass); void SetCharClasses(const unsigned char *chars, cc newCharClass); + int GetCharsOfClass(cc charClass, unsigned char *buffer); cc GetClass(unsigned char ch) const { return static_cast<cc>(charClass[ch]);} bool IsWord(unsigned char ch) const { return static_cast<cc>(charClass[ch]) == ccWord;} Modified: scintilla/src/Document.cxx 77 files changed, 43 insertions(+), 34 deletions(-) =================================================================== @@ -35,27 +35,10 @@ using namespace Scintilla; #endif -// This is ASCII specific but is safe with chars >= 0x80 -static inline bool isspacechar(unsigned char ch) { - return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d)); -} - static inline bool IsPunctuation(char ch) { return isascii(ch) && ispunct(ch); } -static inline bool IsADigit(char ch) { - return isascii(ch) && isdigit(ch); -} - -static inline bool IsLowerCase(char ch) { - return isascii(ch) && islower(ch); -} - -static inline bool IsUpperCase(char ch) { - return isascii(ch) && isupper(ch); -} - void LexInterface::Colourise(int start, int end) { if (pdoc && instance && !performingStyle) { // Protect against reentrance, which may occur, for example, when @@ -751,7 +734,7 @@ void Document::CheckReadOnly() { // SetStyleAt does not change the persistent state of a document bool Document::DeleteChars(int pos, int len) { - if (len == 0) + if (len <= 0) return false; if ((pos + len) > Length()) return false; @@ -849,6 +832,10 @@ int Document::Undo() { bool multiLine = false; int steps = cb.StartUndo(); //Platform::DebugPrintf("Steps=%d\n", steps); + int coalescedRemovePos = -1; + int coalescedRemoveLen = 0; + int prevRemoveActionPos = -1; + int prevRemoveActionLen = 0; for (int step = 0; step < steps; step++) { const int prevLinesTotal = LinesTotal(); const Action &action = cb.GetUndoStep(); @@ -859,15 +846,20 @@ int Document::Undo() { DocModification dm(SC_MOD_CONTAINER | SC_PERFORMED_UNDO); dm.token = action.position; NotifyModified(dm); + if (!action.mayCoalesce) { + coalescedRemovePos = -1; + coalescedRemoveLen = 0; + prevRemoveActionPos = -1; + prevRemoveActionLen = 0; + } } else { NotifyModified(DocModification( SC_MOD_BEFOREDELETE | SC_PERFORMED_UNDO, action)); } cb.PerformUndoStep(); - int cellPosition = action.position; if (action.at != containerAction) { - ModifiedAt(cellPosition); - newPos = cellPosition; + ModifiedAt(action.position); + newPos = action.position; } int modFlags = SC_PERFORMED_UNDO; @@ -875,8 +867,22 @@ int Document::Undo() { if (action.at == removeAction) { newPos += action.lenData; modFlags |= SC_MOD_INSERTTEXT; + if ((coalescedRemoveLen > 0) && + (action.position == prevRemoveActionPos || action.position == (prevRemoveActionPos + prevRemoveActionLen))) { + coalescedRemoveLen += action.lenData; + newPos = coalescedRemovePos + coalescedRemoveLen; + } else { + coalescedRemovePos = action.position; + coalescedRemoveLen = action.lenData; + } + prevRemoveActionPos = action.position; + prevRemoveActionLen = action.lenData; } else if (action.at == insertAction) { modFlags |= SC_MOD_DELETETEXT; + coalescedRemovePos = -1; + coalescedRemoveLen = 0; + prevRemoveActionPos = -1; + prevRemoveActionLen = 0; } if (steps > 1) modFlags |= SC_MULTISTEPUNDOREDO; @@ -888,7 +894,7 @@ int Document::Undo() { if (multiLine) modFlags |= SC_MULTILINEUNDOREDO; } - NotifyModified(DocModification(modFlags, cellPosition, action.lenData, + NotifyModified(DocModification(modFlags, action.position, action.lenData, linesAdded, action.data)); } @@ -1003,21 +1009,19 @@ static int NextTab(int pos, int tabSize) { return ((pos / tabSize) + 1) * tabSize; } -static void CreateIndentation(char *linebuf, int length, int indent, int tabSize, bool insertSpaces) { - length--; // ensure space for \0 +static std::string CreateIndentation(int indent, int tabSize, bool insertSpaces) { + std::string indentation; if (!insertSpaces) { - while ((indent >= tabSize) && (length > 0)) { - *linebuf++ = '\t'; + while (indent >= tabSize) { + indentation += '\t'; indent -= tabSize; - length--; } } - while ((indent > 0) && (length > 0)) { - *linebuf++ = ' '; + while (indent > 0) { + indentation += ' '; indent--; - length--; } - *linebuf = '\0'; + return indentation; } int SCI_METHOD Document::GetLineIndentation(int line) { @@ -1043,13 +1047,12 @@ void Document::SetLineIndentation(int line, int indent) { if (indent < 0) indent = 0; if (indent != indentOfLine) { - char linebuf[1000]; - CreateIndentation(linebuf, sizeof(linebuf), indent, tabInChars, !useTabs); + std::string linebuf = CreateIndentation(indent, tabInChars, !useTabs); int thisLineStart = LineStart(line); int indentPos = GetLineIndentPosition(line); UndoGroup ug(this); DeleteChars(thisLineStart, indentPos - thisLineStart); - InsertCString(thisLineStart, linebuf); + InsertCString(thisLineStart, linebuf.c_str()); } } @@ -1615,6 +1618,10 @@ void Document::SetCharClasses(const unsigned char *chars, CharClassify::cc newCh charClass.SetCharClasses(chars, newCharClass); } +int Document::GetCharsOfClass(CharClassify::cc characterClass, unsigned char *buffer) { + return charClass.GetCharsOfClass(characterClass, buffer); +} + void Document::SetStylingBits(int bits) { stylingBits = bits; stylingBitsMask = (1 << stylingBits) - 1; @@ -1730,10 +1737,12 @@ void Document::MarginSetText(int line, const char *text) { void Document::MarginSetStyle(int line, int style) { static_cast<LineAnnotation *>(perLineData[ldMargin])->SetStyle(line, style); + NotifyModified(DocModification(SC_MOD_CHANGEMARGIN, LineStart(line), 0, 0, 0, line)); } void Document::MarginSetStyles(int line, const unsigned char *styles) { static_cast<LineAnnotation *>(perLineData[ldMargin])->SetStyles(line, styles); + NotifyModified(DocModification(SC_MOD_CHANGEMARGIN, LineStart(line), 0, 0, 0, line)); } int Document::MarginLength(int line) const { Modified: scintilla/src/Document.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -364,6 +364,7 @@ class Document : PerLine, public IDocument, public ILoader { void SetDefaultCharClasses(bool includeWordClass); void SetCharClasses(const unsigned char *chars, CharClassify::cc newCharClass); + int GetCharsOfClass(CharClassify::cc charClass, unsigned char *buffer); void SetStylingBits(int bits); void SCI_METHOD StartStyling(int position, char mask); bool SCI_METHOD SetStyleFor(int length, char style); Modified: scintilla/src/Editor.cxx 60 files changed, 52 insertions(+), 8 deletions(-) =================================================================== @@ -663,7 +663,8 @@ PRectangle Editor::RectangleFromRange(int start, int end) { int maxLine = cs.DisplayFromDoc(lineDocMax) + cs.GetHeight(lineDocMax) - 1; PRectangle rcClient = GetTextRectangle(); PRectangle rc; - rc.left = vs.fixedColumnWidth; + const int leftTextOverlap = ((xOffset == 0) && (vs.leftMarginWidth > 0)) ? 1 : 0; + rc.left = vs.fixedColumnWidth - leftTextOverlap; rc.top = (minLine - topLine) * vs.lineHeight; if (rc.top < 0) rc.top = 0; @@ -3228,7 +3229,7 @@ void Editor::DrawBlockCaret(Surface *surface, ViewStyle &vsDraw, LineLayout *ll, // glyph / combining character. If so we'll need to draw that too. int offsetFirstChar = offset; int offsetLastChar = offset + (posAfter - posCaret); - while ((offsetLastChar - numCharsToDraw) >= lineStart) { + while ((posBefore > 0) && ((offsetLastChar - numCharsToDraw) >= lineStart)) { if ((ll->positions[offsetLastChar] - ll->positions[offsetLastChar - numCharsToDraw]) > 0) { // The char does not share horizontal space break; @@ -3242,6 +3243,8 @@ void Editor::DrawBlockCaret(Surface *surface, ViewStyle &vsDraw, LineLayout *ll, // See if the next character shares horizontal space, if so we'll // need to draw that too. + if (offsetFirstChar < 0) + offsetFirstChar = 0; numCharsToDraw = offsetLastChar - offsetFirstChar; while ((offsetLastChar < ll->LineStart(subLine + 1)) && (offsetLastChar <= ll->numCharsInLine)) { // Update posAfter to point to the 2nd next char, this is where @@ -3501,8 +3504,12 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) { } //Platform::DebugPrintf("start display %d, offset = %d\n", pdoc->Length(), xOffset); + // Allow text at start of line to overlap 1 pixel into the margin as this displays + // serifs and italic stems for aliased text. + const int leftTextOverlap = ((xOffset == 0) && (vs.leftMarginWidth > 0)) ? 1 : 0; + // Do the painting - if (rcArea.right > vs.fixedColumnWidth) { + if (rcArea.right > vs.fixedColumnWidth - leftTextOverlap) { Surface *surface = surfaceWindow; if (bufferedDraw) { @@ -3526,7 +3533,9 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) { // Remove selection margin from drawing area so text will not be drawn // on it in unbuffered mode. if (!bufferedDraw) { - surfaceWindow->SetClip(rcTextArea); + PRectangle rcClipText = rcTextArea; + rcClipText.left -= leftTextOverlap; + surfaceWindow->SetClip(rcClipText); } // Loop on visible lines @@ -3577,6 +3586,13 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) { ll->SetBracesHighlight(rangeLine, braces, static_cast<char>(bracesMatchStyle), highlightGuideColumn * vs.spaceWidth, bracesIgnoreStyle); + if (leftTextOverlap && bufferedDraw) { + PRectangle rcSpacer = rcLine; + rcSpacer.right = rcSpacer.left; + rcSpacer.left -= 1; + surface->FillRectangle(rcSpacer, vs.styles[STYLE_DEFAULT].back); + } + // Draw the line DrawLine(surface, vs, lineDoc, visibleLine, xStart, rcLine, ll, subLine); //durPaint += et.Duration(true); @@ -3610,8 +3626,8 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) { DrawCarets(surface, vs, lineDoc, xStart, rcLine, ll, subLine); if (bufferedDraw) { - Point from(vs.fixedColumnWidth, 0); - PRectangle rcCopyArea(vs.fixedColumnWidth, yposScreen, + Point from(vs.fixedColumnWidth-leftTextOverlap, 0); + PRectangle rcCopyArea(vs.fixedColumnWidth-leftTextOverlap, yposScreen, rcClient.right - vs.rightMarginWidth, yposScreen + vs.lineHeight); surfaceWindow->Copy(rcCopyArea, from, *pixmapLine); } @@ -4422,7 +4438,7 @@ bool Editor::NotifyMarginClick(Point pt, bool shift, bool ctrl, bool alt) { int marginClicked = -1; int x = 0; for (int margin = 0; margin < ViewStyle::margins; margin++) { - if ((pt.x > x) && (pt.x < x + vs.ms[margin].width)) + if ((pt.x >= x) && (pt.x < x + vs.ms[margin].width)) marginClicked = margin; x += vs.ms[margin].width; } @@ -5845,6 +5861,18 @@ char *Editor::CopyRange(int start, int end) { return text; } +std::string Editor::RangeText(int start, int end) const { + if (start < end) { + int len = end - start; + std::string ret(len, '\0'); + for (int i = 0; i < len; i++) { + ret[i] = pdoc->CharAt(start + i); + } + return ret; + } + return std::string(); +} + void Editor::CopySelectionRange(SelectionText *ss, bool allowLineCopy) { if (sel.Empty()) { if (allowLineCopy) { @@ -6919,10 +6947,10 @@ void Editor::EnsureLineVisible(int lineDoc, bool enforcePolicy) { } int Editor::GetTag(char *tagValue, int tagNumber) { - char name[3] = "\\?"; const char *text = 0; int length = 0; if ((tagNumber >= 1) && (tagNumber <= 9)) { + char name[3] = "\\?"; name[1] = static_cast<char>(tagNumber + '0'); length = 2; text = pdoc->SubstituteByPosition(name, &length); @@ -7510,6 +7538,9 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { caret.period = wParam; break; + case SCI_GETWORDCHARS: + return pdoc->GetCharsOfClass(CharClassify::ccWord, reinterpret_cast<unsigned char *>(lParam)); + case SCI_SETWORDCHARS: { pdoc->SetDefaultCharClasses(false); if (lParam == 0) @@ -7518,6 +7549,9 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { } break; + case SCI_GETWHITESPACECHARS: + return pdoc->GetCharsOfClass(CharClassify::ccSpace, reinterpret_cast<unsigned char *>(lParam)); + case SCI_SETWHITESPACECHARS: { if (lParam == 0) return 0; @@ -7525,6 +7559,16 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { } break; + case SCI_GETPUNCTUATIONCHARS: + return pdoc->GetCharsOfClass(CharClassify::ccPunctuation, reinterpret_cast<unsigned char *>(lParam)); + + case SCI_SETPUNCTUATIONCHARS: { + if (lParam == 0) + return 0; + pdoc->SetCharClasses(reinterpret_cast<unsigned char *>(lParam), CharClassify::ccPunctuation); + } + break; + case SCI_SETCHARSDEFAULT: pdoc->SetDefaultCharClasses(true); break; Modified: scintilla/src/Editor.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -480,6 +480,7 @@ class Editor : public DocWatcher { virtual void CopyToClipboard(const SelectionText &selectedText) = 0; char *CopyRange(int start, int end); + std::string RangeText(int start, int end) const; void CopySelectionRange(SelectionText *ss, bool allowLineCopy=false); void CopyRangeToClipboard(int start, int end); void CopyText(int length, const char *text); Modified: scintilla/src/PerLine.cxx 11 files changed, 4 insertions(+), 7 deletions(-) =================================================================== @@ -99,7 +99,7 @@ void MarkerHandleSet::RemoveHandle(int handle) { } } -bool MarkerHandleSet::RemoveNumber(int markerNum) { +bool MarkerHandleSet::RemoveNumber(int markerNum, bool all) { bool performedDeletion = false; MarkerHandleNumber **pmhn = &root; while (*pmhn) { @@ -108,6 +108,8 @@ bool MarkerHandleSet::RemoveNumber(int markerNum) { *pmhn = mhn->next; delete mhn; performedDeletion = true; + if (!all) + break; } else { pmhn = &((*pmhn)->next); } @@ -223,12 +225,7 @@ bool LineMarkers::DeleteMark(int line, int markerNum, bool all) { delete markers[line]; markers[line] = NULL; } else { - bool performedDeletion = markers[line]->RemoveNumber(markerNum); - someChanges = someChanges || performedDeletion; - while (all && performedDeletion) { - performedDeletion = markers[line]->RemoveNumber(markerNum); - someChanges = someChanges || performedDeletion; - } + someChanges = markers[line]->RemoveNumber(markerNum, all); if (markers[line]->Length() == 0) { delete markers[line]; markers[line] = NULL; Modified: scintilla/src/PerLine.h 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -37,7 +37,7 @@ class MarkerHandleSet { bool Contains(int handle) const; bool InsertHandle(int handle, int markerNum); void RemoveHandle(int handle); - bool RemoveNumber(int markerNum); + bool RemoveNumber(int markerNum, bool all); void CombineWith(MarkerHandleSet *other); }; Modified: scintilla/src/ScintillaBase.cxx 37 files changed, 14 insertions(+), 23 deletions(-) =================================================================== @@ -213,6 +213,7 @@ void ScintillaBase::AutoCompleteStart(int lenEntered, const char *list) { pdoc->InsertString(sel.MainCaret(), list + lenEntered, lenInsert - lenEntered); SetEmptySelection(sel.MainCaret() + lenInsert - lenEntered); } + ac.Cancel(); return; } } @@ -293,13 +294,8 @@ void ScintillaBase::AutoCompleteMove(int delta) { } void ScintillaBase::AutoCompleteMoveToCurrentWord() { - char wordCurrent[1000]; - int i; - int startWord = ac.posStart - ac.startLen; - for (i = startWord; i < sel.MainCaret() && i - startWord < 1000; i++) - wordCurrent[i - startWord] = pdoc->CharAt(i); - wordCurrent[Platform::Minimum(i - startWord, 999)] = '\0'; - ac.Select(wordCurrent); + std::string wordCurrent = RangeText(ac.posStart - ac.startLen, sel.MainCaret()); + ac.Select(wordCurrent.c_str()); } void ScintillaBase::AutoCompleteCharacterAdded(char ch) { @@ -328,15 +324,12 @@ void ScintillaBase::AutoCompleteCharacterDeleted() { } void ScintillaBase::AutoCompleteCompleted() { - int item = ac.lb->GetSelection(); - char selected[1000]; - selected[0] = '\0'; - if (item != -1) { - ac.lb->GetValue(item, selected, sizeof(selected)); - } else { + int item = ac.GetSelection(); + if (item == -1) { AutoCompleteCancel(); return; } + const std::string selected = ac.GetValue(item); ac.Show(false); @@ -348,7 +341,7 @@ void ScintillaBase::AutoCompleteCompleted() { Position firstPos = ac.posStart - ac.startLen; scn.position = firstPos; scn.lParam = firstPos; - scn.text = selected; + scn.text = selected.c_str(); NotifyParent(scn); if (!ac.Active()) @@ -369,8 +362,8 @@ void ScintillaBase::AutoCompleteCompleted() { } SetEmptySelection(ac.posStart); if (item != -1) { - pdoc->InsertCString(firstPos, selected); - SetEmptySelection(firstPos + static_cast<int>(strlen(selected))); + pdoc->InsertCString(firstPos, selected.c_str()); + SetEmptySelection(firstPos + static_cast<int>(selected.length())); } SetLastXChosen(); } @@ -378,19 +371,17 @@ void ScintillaBase::AutoCompleteCompleted() { int ScintillaBase::AutoCompleteGetCurrent() { if (!ac.Active()) return -1; - return ac.lb->GetSelection(); + return ac.GetSelection(); } int ScintillaBase::AutoCompleteGetCurrentText(char *buffer) { if (ac.Active()) { - int item = ac.lb->GetSelection(); - char selected[1000]; - selected[0] = '\0'; + int item = ac.GetSelection(); if (item != -1) { - ac.lb->GetValue(item, selected, sizeof(selected)); + const std::string selected = ac.GetValue(item); if (buffer != NULL) - strcpy(buffer, selected); - return static_cast<int>(strlen(selected)); + strcpy(buffer, selected.c_str()); + return static_cast<int>(selected.length()); } } if (buffer != NULL) Modified: scintilla/src/ViewStyle.h 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -103,7 +103,7 @@ class ViewStyle { /// Margins are ordered: Line Numbers, Selection Margin, Spacing Margin enum { margins=5 }; int leftMarginWidth; ///< Spacing margin on left of text - int rightMarginWidth; ///< Spacing margin on left of text + int rightMarginWidth; ///< Spacing margin on right of text int maskInLine; ///< Mask for markers to be put into text because there is nowhere for them to go in margin MarginStyle ms[margins]; int fixedColumnWidth; Modified: scintilla/version.txt 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1 +1 @@ -320 +321 @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

11 years, 4 months

[geany/geany] 4cdcaa: Update for new Scintilla styles

by Colomban Wendling

11 years, 4 months

[geany/geany] cb54cc: Merge branch 'scintilla-update'

by Colomban Wendling

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 30 Jul 2012 15:06:00 Commit: cb54ccf8e1b8af381fa8d65f7ecf0872e5807fd2 https://github.com/geany/geany/commit/cb54ccf8e1b8af381fa8d65f7ecf0872e5807… Log Message: ----------- Merge branch 'scintilla-update' Modified Paths: -------------- NEWS data/filetypes.c scintilla/include/Platform.h scintilla/include/SciLexer.h scintilla/include/Scintilla.h scintilla/include/Scintilla.iface scintilla/lexers/LexCPP.cxx scintilla/lexers/LexCSS.cxx scintilla/lexers/LexFortran.cxx scintilla/lexers/LexHTML.cxx scintilla/lexlib/CharacterSet.h scintilla/src/AutoComplete.cxx scintilla/src/AutoComplete.h scintilla/src/CharClassify.cxx scintilla/src/CharClassify.h scintilla/src/Document.cxx scintilla/src/Document.h scintilla/src/Editor.cxx scintilla/src/Editor.h scintilla/src/PerLine.cxx scintilla/src/PerLine.h scintilla/src/ScintillaBase.cxx scintilla/src/ViewStyle.h scintilla/version.txt src/highlighting.c src/highlightingmappings.h Modified: NEWS 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ Geany 1.23 (unreleased) Editor - * Update Scintilla to version 3.2.0. + * Update Scintilla to version 3.2.1 (#3540469). Geany 1.22 (June 18, 2012) Modified: data/filetypes.c 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -5,6 +5,7 @@ comment=comment commentline=comment_line commentdoc=comment_doc +preprocessorcomment=comment number=number_1 word=keyword_1 word2=keyword_2 Modified: scintilla/include/Platform.h 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -31,14 +31,14 @@ #undef PLAT_WX #define PLAT_WX 1 -#elif defined(GTK) -#undef PLAT_GTK -#define PLAT_GTK 1 - #elif defined(SCINTILLA_QT) #undef PLAT_QT #define PLAT_QT 1 +#elif defined(GTK) +#undef PLAT_GTK +#define PLAT_GTK 1 + #if defined(__WIN32__) || defined(_MSC_VER) #undef PLAT_GTK_WIN32 #define PLAT_GTK_WIN32 1 Modified: scintilla/include/SciLexer.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -160,6 +160,7 @@ #define SCE_C_STRINGRAW 20 #define SCE_C_TRIPLEVERBATIM 21 #define SCE_C_HASHQUOTEDSTRING 22 +#define SCE_C_PREPROCESSORCOMMENT 23 #define SCE_D_DEFAULT 0 #define SCE_D_COMMENT 1 #define SCE_D_COMMENTLINE 2 Modified: scintilla/include/Scintilla.h 4 files changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -246,6 +246,7 @@ #define SCI_GETCARETPERIOD 2075 #define SCI_SETCARETPERIOD 2076 #define SCI_SETWORDCHARS 2077 +#define SCI_GETWORDCHARS 2646 #define SCI_BEGINUNDOACTION 2078 #define SCI_ENDUNDOACTION 2079 #define INDIC_PLAIN 0 @@ -684,6 +685,9 @@ #define SCI_WORDRIGHTEND 2441 #define SCI_WORDRIGHTENDEXTEND 2442 #define SCI_SETWHITESPACECHARS 2443 +#define SCI_GETWHITESPACECHARS 2647 +#define SCI_SETPUNCTUATIONCHARS 2648 +#define SCI_GETPUNCTUATIONCHARS 2649 #define SCI_SETCHARSDEFAULT 2444 #define SCI_AUTOCGETCURRENT 2445 #define SCI_AUTOCGETCURRENTTEXT 2610 Modified: scintilla/include/Scintilla.iface 63 files changed, 39 insertions(+), 24 deletions(-) =================================================================== @@ -287,13 +287,13 @@ val SC_MASK_FOLDERS=0xFE000000 fun void MarkerDefine=2040(int markerNumber, int markerSymbol) # Set the foreground colour used for a particular marker number. -fun void MarkerSetFore=2041(int markerNumber, colour fore) +set void MarkerSetFore=2041(int markerNumber, colour fore) # Set the background colour used for a particular marker number. -fun void MarkerSetBack=2042(int markerNumber, colour back) +set void MarkerSetBack=2042(int markerNumber, colour back) # Set the background colour used for a particular marker number when its folding block is selected. -fun void MarkerSetBackSelected=2292(int markerNumber, colour back) +set void MarkerSetBackSelected=2292(int markerNumber, colour back) # Enable/disable highlight for current folding bloc (smallest one that contains the caret) fun void MarkerEnableHighlight=2293(bool enabled,) @@ -324,7 +324,7 @@ fun void MarkerDefinePixmap=2049(int markerNumber, string pixmap) fun void MarkerAddSet=2466(int line, int set) # Set the alpha used for a marker that is drawn in the text area, not the margin. -fun void MarkerSetAlpha=2476(int markerNumber, int alpha) +set void MarkerSetAlpha=2476(int markerNumber, int alpha) enu MarginType=SC_MARGIN_ val SC_MARGIN_SYMBOL=0 @@ -403,7 +403,7 @@ val SC_CHARSET_THAI=222 val SC_CHARSET_8859_15=1000 # Clear all the styles and make equivalent to the global default style. -set void StyleClearAll=2050(,) +fun void StyleClearAll=2050(,) # Set the foreground colour of a style. set void StyleSetFore=2051(int style, colour fore) @@ -454,7 +454,7 @@ get int StyleGetSize=2485(int style,) # Get the font of a style. # Returns the length of the fontName -fun int StyleGetFont=2486(int style, stringresult fontName) +get int StyleGetFont=2486(int style, stringresult fontName) # Get is a style to have its end of line filled or not. get bool StyleGetEOLFilled=2487(int style,) @@ -552,6 +552,10 @@ set void SetCaretPeriod=2076(int periodMilliseconds,) # First sets defaults like SetCharsDefault. set void SetWordChars=2077(, string characters) +# Get the set of characters making up words for when moving or selecting by word. +# Retuns the number of characters +get int GetWordChars=2646(, stringresult characters) + # Start a sequence of actions that is undone and redone as a unit. # May be nested. fun void BeginUndoAction=2078(,) @@ -1108,7 +1112,7 @@ val SC_FOLDFLAG_LINEAFTER_CONTRACTED=0x0010 val SC_FOLDFLAG_LEVELNUMBERS=0x0040 # Set some style options for folding. -fun void SetFoldFlags=2233(int flags,) +set void SetFoldFlags=2233(int flags,) # Ensure a particular line is visible by expanding any header line hiding it. # Use the currently set visibility policy to determine which range to display. @@ -1277,7 +1281,7 @@ set void SetMultiPaste=2614(int multiPaste,) get int GetMultiPaste=2615(,) # Retrieve the value of a tag from a regular expression search. -fun int GetTag=2616(int tagNumber, stringresult tagValue) +get int GetTag=2616(int tagNumber, stringresult tagValue) # Make the target range start and end be the same as the selection range start and end. fun void TargetFromSelection=2287(,) @@ -1629,7 +1633,7 @@ fun void DelLineLeft=2395(,) # Delete forwards from the current position to the end of the line. fun void DelLineRight=2396(,) -# Get and Set the xOffset (ie, horizonal scroll position). +# Get and Set the xOffset (ie, horizontal scroll position). set void SetXOffset=2397(int newOffset,) get int GetXOffset=2398(,) @@ -1663,7 +1667,7 @@ val CARET_JUMPS=0x10 # where most code reside, and the lines after the caret, eg. the body of a function. val CARET_EVEN=0x08 -# Set the way the caret is kept visible when going sideway. +# Set the way the caret is kept visible when going sideways. # The exclusion zone is given in pixels. fun void SetXCaretPolicy=2402(int caretPolicy, int caretSlop) @@ -1800,15 +1804,25 @@ fun void WordRightEndExtend=2442(,) # Should be called after SetWordChars. set void SetWhitespaceChars=2443(, string characters) +# Get the set of characters making up whitespace for when moving or selecting by word. +get int GetWhitespaceChars=2647(, stringresult characters) + +# Set the set of characters making up punctuation characters +# Should be called after SetWordChars. +set void SetPunctuationChars=2648(, string characters) + +# Get the set of characters making up punctuation characters +get int GetPunctuationChars=2649(, stringresult characters) + # Reset the set of characters for whitespace and word characters to the defaults. fun void SetCharsDefault=2444(,) # Get currently selected item position in the auto-completion list -fun int AutoCGetCurrent=2445(,) +get int AutoCGetCurrent=2445(,) # Get currently selected item text in the auto-completion list # Returns the length of the item text -fun int AutoCGetCurrentText=2610(, stringresult s) +get int AutoCGetCurrentText=2610(, stringresult s) enu CaseInsensitiveBehaviour=SC_CASEINSENSITIVEBEHAVIOUR_ val SC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE=0 @@ -1893,7 +1907,7 @@ get int GetIndicatorCurrent=2501(,) # Set the value used for IndicatorFillRange set void SetIndicatorValue=2502(int value,) -# Get the current indicator vaue +# Get the current indicator value get int GetIndicatorValue=2503(,) # Turn a indicator on over a range. @@ -2090,10 +2104,10 @@ get int GetSelections=2570(,) fun void ClearSelections=2571(,) # Set a simple selection -fun int SetSelection=2572(int caret,int anchor) +fun int SetSelection=2572(int caret, int anchor) # Add a selection -fun int AddSelection=2573(int caret,int anchor) +fun int AddSelection=2573(int caret, int anchor) # Set the main selection set void SetMainSelection=2574(int selection,) @@ -2117,7 +2131,7 @@ set void SetSelectionNStart=2584(int selection, position pos) get position GetSelectionNStart=2585(int selection,) # Sets the position that ends the selection - this becomes the currentPosition. -set void SetSelectionNEnd=2586(int selection, position pos,) +set void SetSelectionNEnd=2586(int selection, position pos) # Returns the position at the end of the selection. get position GetSelectionNEnd=2587(int selection,) @@ -2221,7 +2235,7 @@ fun void ScrollToEnd=2629(,) val SC_TECHNOLOGY_DEFAULT=0 val SC_TECHNOLOGY_DIRECTWRITE=1 -# Set the technolgy used. +# Set the technology used. set void SetTechnology=2630(int technology,) # Get the tech. @@ -2270,11 +2284,11 @@ set void SetLexerLanguage=4006(, string language) fun void LoadLexerLibrary=4007(, string path) # Retrieve a "property" value previously set with SetProperty. -fun int GetProperty=4008(string key, stringresult buf) +get int GetProperty=4008(string key, stringresult buf) # Retrieve a "property" value previously set with SetProperty, # with "$()" variable replacement on returned buffer. -fun int GetPropertyExpanded=4009(string key, stringresult buf) +get int GetPropertyExpanded=4009(string key, stringresult buf) # Retrieve a "property" value previously set with SetProperty, # interpreted as an int AFTER any "$()" variable replacement. @@ -2311,7 +2325,7 @@ fun int DescribeKeyWordSets=4017(, stringresult descriptions) # Type of modification and the action which caused the modification. # These are defined as a bit mask to make it easy to specify which notifications are wanted. # One bit is set from each of SC_MOD_* and SC_PERFORMED_*. -enu ModificationFlags=SC_MOD_ SC_PERFORMED_ SC_LAST +enu ModificationFlags=SC_MOD_ SC_PERFORMED_ SC_MULTISTEPUNDOREDO SC_LASTSTEPINUNDOREDO SC_MULTILINEUNDOREDO SC_STARTACTION SC_MODEVENTMASKALL val SC_MOD_INSERTTEXT=0x1 val SC_MOD_DELETETEXT=0x2 val SC_MOD_CHANGESTYLE=0x4 @@ -2540,6 +2554,7 @@ val SCE_C_GLOBALCLASS=19 val SCE_C_STRINGRAW=20 val SCE_C_TRIPLEVERBATIM=21 val SCE_C_HASHQUOTEDSTRING=22 +val SCE_C_PREPROCESSORCOMMENT=23 # Lexical states for SCLEX_D lex D=SCLEX_D SCE_D_ val SCE_D_DEFAULT=0 @@ -2590,10 +2605,10 @@ val SCE_TCL_WORD8=19 val SCE_TCL_COMMENT_BOX=20 val SCE_TCL_BLOCK_COMMENT=21 # Lexical states for SCLEX_HTML, SCLEX_XML -lex HTML=SCLEX_HTML SCE_H -lex XML=SCLEX_XML SCE_H -lex ASP=SCLEX_ASP SCE_H -lex PHP=SCLEX_PHP SCE_H +lex HTML=SCLEX_HTML SCE_H_ SCE_HJ_ SCE_HJA_ SCE_HB_ SCE_HBA_ SCE_HP_ SCE_HPHP_ SCE_HPA_ +lex XML=SCLEX_XML SCE_H_ SCE_HJ_ SCE_HJA_ SCE_HB_ SCE_HBA_ SCE_HP_ SCE_HPHP_ SCE_HPA_ +lex ASP=SCLEX_ASP SCE_H_ SCE_HJ_ SCE_HJA_ SCE_HB_ SCE_HBA_ SCE_HP_ SCE_HPHP_ SCE_HPA_ +lex PHP=SCLEX_PHP SCE_H_ SCE_HJ_ SCE_HJA_ SCE_HB_ SCE_HBA_ SCE_HP_ SCE_HPHP_ SCE_HPA_ val SCE_H_DEFAULT=0 val SCE_H_TAG=1 val SCE_H_TAGUNKNOWN=2 Modified: scintilla/lexers/LexCPP.cxx 32 files changed, 25 insertions(+), 7 deletions(-) =================================================================== @@ -379,6 +379,12 @@ class LexerCPP : public ILexer { int SCI_METHOD LexerCPP::PropertySet(const char *key, const char *val) { if (osCPP.PropertySet(&options, key, val)) { + if (strcmp(key, "lexer.cpp.allow.dollars") == 0) { + setWord = CharacterSet(CharacterSet::setAlphaNum, "._", 0x80, true); + if (options.identifiersAllowDollars) { + setWord.Add('$'); + } + } return 0; } return -1; @@ -453,7 +459,6 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, if (options.identifiersAllowDollars) { setWordStart.Add('$'); - setWord.Add('$'); } int chPrevNonWhite = ' '; @@ -517,7 +522,7 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, int activitySet = preproc.IsInactive() ? activeFlag : 0; - for (; sc.More(); sc.Forward()) { + for (; sc.More();) { if (sc.atLineStart) { // Using MaskActive() is not needed in the following statement. @@ -527,6 +532,9 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, // ends with a line continuation by locking in the state upto this position. sc.SetState(sc.state); } + if ((MaskActive(sc.state) == SCE_C_PREPROCESSOR) && (!continuationLine)) { + sc.SetState(SCE_C_DEFAULT|activitySet); + } // Reset states to begining of colourise so no surprises // if different sets of lines lexed. visibleChars = 0; @@ -556,6 +564,7 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, sc.Forward(); } continuationLine = true; + sc.Forward(); continue; } } @@ -610,18 +619,26 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, } break; case SCE_C_PREPROCESSOR: - if (sc.atLineStart && !continuationLine) { - sc.SetState(SCE_C_DEFAULT|activitySet); - } else if (options.stylingWithinPreprocessor) { + if (options.stylingWithinPreprocessor) { if (IsASpace(sc.ch)) { sc.SetState(SCE_C_DEFAULT|activitySet); } } else { - if (sc.Match('/', '*') || sc.Match('/', '/')) { + if (sc.Match('/', '*')) { + sc.SetState(SCE_C_PREPROCESSORCOMMENT|activitySet); + sc.Forward(); // Eat the * + } else if (sc.Match('/', '/')) { sc.SetState(SCE_C_DEFAULT|activitySet); } } break; + case SCE_C_PREPROCESSORCOMMENT: + if (sc.Match('*', '/')) { + sc.Forward(); + sc.ForwardSetState(SCE_C_PREPROCESSOR|activitySet); + continue; // Without advancing in case of '\'. + } + break; case SCE_C_COMMENT: if (sc.Match('*', '/')) { sc.Forward(); @@ -918,11 +935,12 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, } } - if (!IsASpace(sc.ch) && !IsSpaceEquiv(sc.state)) { + if (!IsASpace(sc.ch) && !IsSpaceEquiv(MaskActive(sc.state))) { chPrevNonWhite = sc.ch; visibleChars++; } continuationLine = false; + sc.Forward(); } const bool rawStringsChanged = rawStringTerminators.Merge(rawSTNew, lineCurrent); if (definitionsChanged || rawStringsChanged) Modified: scintilla/lexers/LexCSS.cxx 29 files changed, 21 insertions(+), 8 deletions(-) =================================================================== @@ -98,18 +98,29 @@ static void ColouriseCssDoc(unsigned int startPos, int length, int initStyle, Wo // Set to 1 for Sassy CSS (.scss) bool isScssDocument = styler.GetPropertyInt("lexer.css.scss.language") != 0; - // TODO: implement Less support - bool isLessDocument = false; + // property lexer.css.less.language + // Set to 1 for Less CSS (.less) + bool isLessDocument = styler.GetPropertyInt("lexer.css.less.language") != 0; - // SCSS and Less both support single-line comments + // property lexer.css.hss.language + // Set to 1 for HSS (.hss) + bool isHssDocument = styler.GetPropertyInt("lexer.css.hss.language") != 0; + + // SCSS/LESS/HSS have the concept of variable + bool hasVariables = isScssDocument || isLessDocument || isHssDocument; + char varPrefix = 0; + if (hasVariables) + varPrefix = isLessDocument ? '@' : '$'; + + // SCSS/LESS/HSS support single-line comments typedef enum _CommentModes { eCommentBlock = 0, eCommentLine = 1} CommentMode; CommentMode comment_mode = eCommentBlock; - bool hasSingleLineComments = isScssDocument || isLessDocument; + bool hasSingleLineComments = isScssDocument || isLessDocument || isHssDocument; - // must keep track of nesting level in document types that support it (SCSS, Less) + // must keep track of nesting level in document types that support it (SCSS/LESS/HSS) bool hasNesting = false; int nestingLevel = 0; - if (isScssDocument || isLessDocument) { + if (isScssDocument || isLessDocument || isHssDocument) { hasNesting = true; nestingLevel = NestingLevelLookBehind(startPos, styler); } @@ -329,11 +340,13 @@ static void ColouriseCssDoc(unsigned int startPos, int length, int initStyle, Wo insideParentheses = false; // SCSS special modes - if (isScssDocument) { + if (hasVariables) { // variable name - if (sc.ch == '$') { + if (sc.ch == varPrefix) { switch (sc.state) { case SCE_CSS_DEFAULT: + if (isLessDocument) // give priority to pseudo elements + break; case SCE_CSS_VALUE: lastStateVar = sc.state; sc.SetState(SCE_CSS_VARIABLE); Modified: scintilla/lexers/LexFortran.cxx 33 files changed, 23 insertions(+), 10 deletions(-) =================================================================== @@ -87,7 +87,7 @@ static void ColouriseFortranDoc(unsigned int startPos, int length, int initStyle /***********************************************/ // Handle the fix format generically int toLineStart = sc.currentPos - posLineStart; - if (isFixFormat && (toLineStart < 6 || toLineStart > 72)) { + if (isFixFormat && (toLineStart < 6 || toLineStart >= 72)) { if ((toLineStart == 0 && (tolower(sc.ch) == 'c' || sc.ch == '*')) || sc.ch == '!') { if (sc.MatchIgnoreCase("cdec$") || sc.MatchIgnoreCase("*dec$") || sc.MatchIgnoreCase("!dec$") || sc.MatchIgnoreCase("cdir$") || sc.MatchIgnoreCase("*dir$") || sc.MatchIgnoreCase("!dir$") || @@ -99,7 +99,7 @@ static void ColouriseFortranDoc(unsigned int startPos, int length, int initStyle } while (!sc.atLineEnd && sc.More()) sc.Forward(); // Until line end - } else if (toLineStart > 72) { + } else if (toLineStart >= 72) { sc.SetState(SCE_F_COMMENT); while (!sc.atLineEnd && sc.More()) sc.Forward(); // Until line end } else if (toLineStart < 5) { @@ -108,17 +108,27 @@ static void ColouriseFortranDoc(unsigned int startPos, int length, int initStyle else sc.SetState(SCE_F_DEFAULT); } else if (toLineStart == 5) { - if (!IsASpace(sc.ch) && sc.ch != '0') { + //if (!IsASpace(sc.ch) && sc.ch != '0') { + if (sc.ch != '\r' && sc.ch != '\n') { sc.SetState(SCE_F_CONTINUATION); - sc.ForwardSetState(prevState); + if (!IsASpace(sc.ch) && sc.ch != '0') + sc.ForwardSetState(prevState); } else sc.SetState(SCE_F_DEFAULT); } continue; } /***************************************/ + // Hanndle preprocessor directives + if (sc.ch == '#' && numNonBlank == 1) + { + sc.SetState(SCE_F_PREPROCESSOR); + while (!sc.atLineEnd && sc.More()) + sc.Forward(); // Until line end + } + /***************************************/ // Handle line continuation generically. - if (!isFixFormat && sc.ch == '&') { + if (!isFixFormat && sc.ch == '&' && sc.state != SCE_F_COMMENT) { char chTemp = ' '; int j = 1; while (IsABlank(chTemp) && j<132) { @@ -252,7 +262,8 @@ static int classifyFoldPointFortran(const char* s, const char* prevWord, const c || strcmp(s, "function") == 0 || strcmp(s, "interface") == 0 || strcmp(s, "module") == 0 || strcmp(s, "program") == 0 || strcmp(s, "subroutine") == 0 || strcmp(s, "then") == 0 - || (strcmp(s, "type") == 0 && chNextNonBlank != '(') ){ + || (strcmp(s, "type") == 0 && chNextNonBlank != '(') + || strcmp(s, "critical") == 0){ if (strcmp(prevWord, "end") == 0) lev = 0; else @@ -265,12 +276,14 @@ static int classifyFoldPointFortran(const char* s, const char* prevWord, const c || strcmp(s, "endfunction") == 0 || strcmp(s, "endinterface") == 0 || strcmp(s, "endmodule") == 0 || strcmp(s, "endprogram") == 0 || strcmp(s, "endsubroutine") == 0 || strcmp(s, "endtype") == 0 - || strcmp(s, "endwhere") == 0 - || (strcmp(s, "procedure") == 0 && strcmp(prevWord,"module")==0) ) { // Take care of the module procedure statement + || strcmp(s, "endwhere") == 0 || strcmp(s, "endcritical") == 0 + || (strcmp(s, "procedure") == 0 && strcmp(prevWord, "module") == 0) ) { // Take care of the "module procedure" statement lev = -1; } else if (strcmp(prevWord, "end") == 0 && strcmp(s, "if") == 0){ // end if lev = 0; - } + } else if (strcmp(prevWord, "type") == 0 && strcmp(s, "is") == 0){ // type is + lev = -1; + } return lev; } // Folding the code @@ -312,7 +325,7 @@ static void FoldFortranDoc(unsigned int startPos, int length, int initStyle, styleNext = styler.StyleAt(i + 1); bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); // - if (stylePrev == SCE_F_DEFAULT && (style == SCE_F_WORD || style == SCE_F_LABEL)) { + if (((isFixFormat && stylePrev == SCE_F_CONTINUATION) || stylePrev == SCE_F_DEFAULT || stylePrev == SCE_F_OPERATOR) && (style == SCE_F_WORD || style == SCE_F_LABEL)) { // Store last word and label start point. lastStart = i; } Modified: scintilla/lexers/LexHTML.cxx 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1089,7 +1089,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty state = SCE_H_SGML_COMMAND; // wait for a pending command } // fold whole tag (-- when closing the tag) - if (foldHTMLPreprocessor || (state == SCE_H_COMMENT)) + if (foldHTMLPreprocessor || state == SCE_H_COMMENT || state == SCE_H_CDATA) levelCurrent++; continue; } Modified: scintilla/lexlib/CharacterSet.h 37 files changed, 33 insertions(+), 4 deletions(-) =================================================================== @@ -40,11 +40,32 @@ class CharacterSet { if (base & setDigits) AddString("0123456789"); } + CharacterSet(const CharacterSet &other) { + size = other.size; + valueAfter = other.valueAfter; + bset = new bool[size]; + for (int i=0; i < size; i++) { + bset[i] = other.bset[i]; + } + } ~CharacterSet() { delete []bset; bset = 0; size = 0; } + CharacterSet &operator=(const CharacterSet &other) { + if (this != &other) { + bool *bsetNew = new bool[other.size]; + for (int i=0; i < other.size; i++) { + bsetNew[i] = other.bset[i]; + } + delete []bset; + size = other.size; + valueAfter = other.valueAfter; + bset = bsetNew; + } + return *this; + } void Add(int val) { assert(val >= 0); assert(val < size); @@ -90,7 +111,15 @@ inline bool IsADigit(int ch, int base) { } inline bool IsASCII(int ch) { - return ch < 0x80; + return (ch >= 0) && (ch < 0x80); +} + +inline bool IsLowerCase(int ch) { + return (ch >= 'a') && (ch <= 'z'); +} + +inline bool IsUpperCase(int ch) { + return (ch >= 'A') && (ch <= 'Z'); } inline bool IsAlphaNumeric(int ch) { @@ -109,15 +138,15 @@ inline bool isspacechar(int ch) { } inline bool iswordchar(int ch) { - return IsASCII(ch) && (IsAlphaNumeric(ch) || ch == '.' || ch == '_'); + return IsAlphaNumeric(ch) || ch == '.' || ch == '_'; } inline bool iswordstart(int ch) { - return IsASCII(ch) && (IsAlphaNumeric(ch) || ch == '_'); + return IsAlphaNumeric(ch) || ch == '_'; } inline bool isoperator(int ch) { - if (IsASCII(ch) && IsAlphaNumeric(ch)) + if (IsAlphaNumeric(ch)) return false; if (ch == '%' || ch == '^' || ch == '&' || ch == '*' || ch == '(' || ch == ')' || ch == '-' || ch == '+' || Modified: scintilla/src/AutoComplete.cxx 13 files changed, 12 insertions(+), 1 deletions(-) =================================================================== @@ -10,6 +10,8 @@ #include <stdio.h> #include <assert.h> +#include <string> + #include "Platform.h" #include "CharacterSet.h" @@ -101,6 +103,16 @@ void AutoComplete::SetList(const char *list) { lb->SetList(list, separator, typesep); } +int AutoComplete::GetSelection() const { + return lb->GetSelection(); +} + +std::string AutoComplete::GetValue(int item) const { + char value[maxItemLen]; + lb->GetValue(item, value, sizeof(value)); + return std::string(value); +} + void AutoComplete::Show(bool show) { lb->Show(show); if (show) @@ -130,7 +142,6 @@ void AutoComplete::Move(int delta) { void AutoComplete::Select(const char *word) { size_t lenWord = strlen(word); int location = -1; - const int maxItemLen=1000; int start = 0; // lower bound of the api array block to search int end = lb->Length() - 1; // upper bound of the api array block to search while ((start <= end) && (location == -1)) { // Binary searching loop Modified: scintilla/src/AutoComplete.h 8 files changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -20,8 +20,10 @@ class AutoComplete { char fillUpChars[256]; char separator; char typesep; // Type seperator + enum { maxItemLen=1000 }; public: + bool ignoreCase; bool chooseSingle; ListBox *lb; @@ -61,6 +63,12 @@ class AutoComplete { /// The list string contains a sequence of words separated by the separator character void SetList(const char *list); + + /// Return the position of the currently selected list item + int GetSelection() const; + + /// Return the value of an item in the list + std::string GetValue(int item) const; void Show(bool show); void Cancel(); Modified: scintilla/src/CharClassify.cxx 16 files changed, 16 insertions(+), 0 deletions(-) =================================================================== @@ -46,3 +46,19 @@ void CharClassify::SetCharClasses(const unsigned char *chars, cc newCharClass) { } } } + +int CharClassify::GetCharsOfClass(cc characterClass, unsigned char *buffer) { + // Get characters belonging to the given char class; return the number + // of characters (if the buffer is NULL, don't write to it). + int count = 0; + for (int ch = maxChar - 1; ch >= 0; --ch) { + if (charClass[ch] == characterClass) { + ++count; + if (buffer) { + *buffer = static_cast<unsigned char>(ch); + buffer++; + } + } + } + return count; +} Modified: scintilla/src/CharClassify.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -19,6 +19,7 @@ class CharClassify { enum cc { ccSpace, ccNewLine, ccWord, ccPunctuation }; void SetDefaultCharClasses(bool includeWordClass); void SetCharClasses(const unsigned char *chars, cc newCharClass); + int GetCharsOfClass(cc charClass, unsigned char *buffer); cc GetClass(unsigned char ch) const { return static_cast<cc>(charClass[ch]);} bool IsWord(unsigned char ch) const { return static_cast<cc>(charClass[ch]) == ccWord;} Modified: scintilla/src/Document.cxx 77 files changed, 43 insertions(+), 34 deletions(-) =================================================================== @@ -35,27 +35,10 @@ using namespace Scintilla; #endif -// This is ASCII specific but is safe with chars >= 0x80 -static inline bool isspacechar(unsigned char ch) { - return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d)); -} - static inline bool IsPunctuation(char ch) { return isascii(ch) && ispunct(ch); } -static inline bool IsADigit(char ch) { - return isascii(ch) && isdigit(ch); -} - -static inline bool IsLowerCase(char ch) { - return isascii(ch) && islower(ch); -} - -static inline bool IsUpperCase(char ch) { - return isascii(ch) && isupper(ch); -} - void LexInterface::Colourise(int start, int end) { if (pdoc && instance && !performingStyle) { // Protect against reentrance, which may occur, for example, when @@ -751,7 +734,7 @@ void Document::CheckReadOnly() { // SetStyleAt does not change the persistent state of a document bool Document::DeleteChars(int pos, int len) { - if (len == 0) + if (len <= 0) return false; if ((pos + len) > Length()) return false; @@ -849,6 +832,10 @@ int Document::Undo() { bool multiLine = false; int steps = cb.StartUndo(); //Platform::DebugPrintf("Steps=%d\n", steps); + int coalescedRemovePos = -1; + int coalescedRemoveLen = 0; + int prevRemoveActionPos = -1; + int prevRemoveActionLen = 0; for (int step = 0; step < steps; step++) { const int prevLinesTotal = LinesTotal(); const Action &action = cb.GetUndoStep(); @@ -859,15 +846,20 @@ int Document::Undo() { DocModification dm(SC_MOD_CONTAINER | SC_PERFORMED_UNDO); dm.token = action.position; NotifyModified(dm); + if (!action.mayCoalesce) { + coalescedRemovePos = -1; + coalescedRemoveLen = 0; + prevRemoveActionPos = -1; + prevRemoveActionLen = 0; + } } else { NotifyModified(DocModification( SC_MOD_BEFOREDELETE | SC_PERFORMED_UNDO, action)); } cb.PerformUndoStep(); - int cellPosition = action.position; if (action.at != containerAction) { - ModifiedAt(cellPosition); - newPos = cellPosition; + ModifiedAt(action.position); + newPos = action.position; } int modFlags = SC_PERFORMED_UNDO; @@ -875,8 +867,22 @@ int Document::Undo() { if (action.at == removeAction) { newPos += action.lenData; modFlags |= SC_MOD_INSERTTEXT; + if ((coalescedRemoveLen > 0) && + (action.position == prevRemoveActionPos || action.position == (prevRemoveActionPos + prevRemoveActionLen))) { + coalescedRemoveLen += action.lenData; + newPos = coalescedRemovePos + coalescedRemoveLen; + } else { + coalescedRemovePos = action.position; + coalescedRemoveLen = action.lenData; + } + prevRemoveActionPos = action.position; + prevRemoveActionLen = action.lenData; } else if (action.at == insertAction) { modFlags |= SC_MOD_DELETETEXT; + coalescedRemovePos = -1; + coalescedRemoveLen = 0; + prevRemoveActionPos = -1; + prevRemoveActionLen = 0; } if (steps > 1) modFlags |= SC_MULTISTEPUNDOREDO; @@ -888,7 +894,7 @@ int Document::Undo() { if (multiLine) modFlags |= SC_MULTILINEUNDOREDO; } - NotifyModified(DocModification(modFlags, cellPosition, action.lenData, + NotifyModified(DocModification(modFlags, action.position, action.lenData, linesAdded, action.data)); } @@ -1003,21 +1009,19 @@ static int NextTab(int pos, int tabSize) { return ((pos / tabSize) + 1) * tabSize; } -static void CreateIndentation(char *linebuf, int length, int indent, int tabSize, bool insertSpaces) { - length--; // ensure space for \0 +static std::string CreateIndentation(int indent, int tabSize, bool insertSpaces) { + std::string indentation; if (!insertSpaces) { - while ((indent >= tabSize) && (length > 0)) { - *linebuf++ = '\t'; + while (indent >= tabSize) { + indentation += '\t'; indent -= tabSize; - length--; } } - while ((indent > 0) && (length > 0)) { - *linebuf++ = ' '; + while (indent > 0) { + indentation += ' '; indent--; - length--; } - *linebuf = '\0'; + return indentation; } int SCI_METHOD Document::GetLineIndentation(int line) { @@ -1043,13 +1047,12 @@ void Document::SetLineIndentation(int line, int indent) { if (indent < 0) indent = 0; if (indent != indentOfLine) { - char linebuf[1000]; - CreateIndentation(linebuf, sizeof(linebuf), indent, tabInChars, !useTabs); + std::string linebuf = CreateIndentation(indent, tabInChars, !useTabs); int thisLineStart = LineStart(line); int indentPos = GetLineIndentPosition(line); UndoGroup ug(this); DeleteChars(thisLineStart, indentPos - thisLineStart); - InsertCString(thisLineStart, linebuf); + InsertCString(thisLineStart, linebuf.c_str()); } } @@ -1615,6 +1618,10 @@ void Document::SetCharClasses(const unsigned char *chars, CharClassify::cc newCh charClass.SetCharClasses(chars, newCharClass); } +int Document::GetCharsOfClass(CharClassify::cc characterClass, unsigned char *buffer) { + return charClass.GetCharsOfClass(characterClass, buffer); +} + void Document::SetStylingBits(int bits) { stylingBits = bits; stylingBitsMask = (1 << stylingBits) - 1; @@ -1730,10 +1737,12 @@ void Document::MarginSetText(int line, const char *text) { void Document::MarginSetStyle(int line, int style) { static_cast<LineAnnotation *>(perLineData[ldMargin])->SetStyle(line, style); + NotifyModified(DocModification(SC_MOD_CHANGEMARGIN, LineStart(line), 0, 0, 0, line)); } void Document::MarginSetStyles(int line, const unsigned char *styles) { static_cast<LineAnnotation *>(perLineData[ldMargin])->SetStyles(line, styles); + NotifyModified(DocModification(SC_MOD_CHANGEMARGIN, LineStart(line), 0, 0, 0, line)); } int Document::MarginLength(int line) const { Modified: scintilla/src/Document.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -364,6 +364,7 @@ class Document : PerLine, public IDocument, public ILoader { void SetDefaultCharClasses(bool includeWordClass); void SetCharClasses(const unsigned char *chars, CharClassify::cc newCharClass); + int GetCharsOfClass(CharClassify::cc charClass, unsigned char *buffer); void SetStylingBits(int bits); void SCI_METHOD StartStyling(int position, char mask); bool SCI_METHOD SetStyleFor(int length, char style); Modified: scintilla/src/Editor.cxx 60 files changed, 52 insertions(+), 8 deletions(-) =================================================================== @@ -663,7 +663,8 @@ PRectangle Editor::RectangleFromRange(int start, int end) { int maxLine = cs.DisplayFromDoc(lineDocMax) + cs.GetHeight(lineDocMax) - 1; PRectangle rcClient = GetTextRectangle(); PRectangle rc; - rc.left = vs.fixedColumnWidth; + const int leftTextOverlap = ((xOffset == 0) && (vs.leftMarginWidth > 0)) ? 1 : 0; + rc.left = vs.fixedColumnWidth - leftTextOverlap; rc.top = (minLine - topLine) * vs.lineHeight; if (rc.top < 0) rc.top = 0; @@ -3228,7 +3229,7 @@ void Editor::DrawBlockCaret(Surface *surface, ViewStyle &vsDraw, LineLayout *ll, // glyph / combining character. If so we'll need to draw that too. int offsetFirstChar = offset; int offsetLastChar = offset + (posAfter - posCaret); - while ((offsetLastChar - numCharsToDraw) >= lineStart) { + while ((posBefore > 0) && ((offsetLastChar - numCharsToDraw) >= lineStart)) { if ((ll->positions[offsetLastChar] - ll->positions[offsetLastChar - numCharsToDraw]) > 0) { // The char does not share horizontal space break; @@ -3242,6 +3243,8 @@ void Editor::DrawBlockCaret(Surface *surface, ViewStyle &vsDraw, LineLayout *ll, // See if the next character shares horizontal space, if so we'll // need to draw that too. + if (offsetFirstChar < 0) + offsetFirstChar = 0; numCharsToDraw = offsetLastChar - offsetFirstChar; while ((offsetLastChar < ll->LineStart(subLine + 1)) && (offsetLastChar <= ll->numCharsInLine)) { // Update posAfter to point to the 2nd next char, this is where @@ -3501,8 +3504,12 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) { } //Platform::DebugPrintf("start display %d, offset = %d\n", pdoc->Length(), xOffset); + // Allow text at start of line to overlap 1 pixel into the margin as this displays + // serifs and italic stems for aliased text. + const int leftTextOverlap = ((xOffset == 0) && (vs.leftMarginWidth > 0)) ? 1 : 0; + // Do the painting - if (rcArea.right > vs.fixedColumnWidth) { + if (rcArea.right > vs.fixedColumnWidth - leftTextOverlap) { Surface *surface = surfaceWindow; if (bufferedDraw) { @@ -3526,7 +3533,9 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) { // Remove selection margin from drawing area so text will not be drawn // on it in unbuffered mode. if (!bufferedDraw) { - surfaceWindow->SetClip(rcTextArea); + PRectangle rcClipText = rcTextArea; + rcClipText.left -= leftTextOverlap; + surfaceWindow->SetClip(rcClipText); } // Loop on visible lines @@ -3577,6 +3586,13 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) { ll->SetBracesHighlight(rangeLine, braces, static_cast<char>(bracesMatchStyle), highlightGuideColumn * vs.spaceWidth, bracesIgnoreStyle); + if (leftTextOverlap && bufferedDraw) { + PRectangle rcSpacer = rcLine; + rcSpacer.right = rcSpacer.left; + rcSpacer.left -= 1; + surface->FillRectangle(rcSpacer, vs.styles[STYLE_DEFAULT].back); + } + // Draw the line DrawLine(surface, vs, lineDoc, visibleLine, xStart, rcLine, ll, subLine); //durPaint += et.Duration(true); @@ -3610,8 +3626,8 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) { DrawCarets(surface, vs, lineDoc, xStart, rcLine, ll, subLine); if (bufferedDraw) { - Point from(vs.fixedColumnWidth, 0); - PRectangle rcCopyArea(vs.fixedColumnWidth, yposScreen, + Point from(vs.fixedColumnWidth-leftTextOverlap, 0); + PRectangle rcCopyArea(vs.fixedColumnWidth-leftTextOverlap, yposScreen, rcClient.right - vs.rightMarginWidth, yposScreen + vs.lineHeight); surfaceWindow->Copy(rcCopyArea, from, *pixmapLine); } @@ -4422,7 +4438,7 @@ bool Editor::NotifyMarginClick(Point pt, bool shift, bool ctrl, bool alt) { int marginClicked = -1; int x = 0; for (int margin = 0; margin < ViewStyle::margins; margin++) { - if ((pt.x > x) && (pt.x < x + vs.ms[margin].width)) + if ((pt.x >= x) && (pt.x < x + vs.ms[margin].width)) marginClicked = margin; x += vs.ms[margin].width; } @@ -5845,6 +5861,18 @@ char *Editor::CopyRange(int start, int end) { return text; } +std::string Editor::RangeText(int start, int end) const { + if (start < end) { + int len = end - start; + std::string ret(len, '\0'); + for (int i = 0; i < len; i++) { + ret[i] = pdoc->CharAt(start + i); + } + return ret; + } + return std::string(); +} + void Editor::CopySelectionRange(SelectionText *ss, bool allowLineCopy) { if (sel.Empty()) { if (allowLineCopy) { @@ -6919,10 +6947,10 @@ void Editor::EnsureLineVisible(int lineDoc, bool enforcePolicy) { } int Editor::GetTag(char *tagValue, int tagNumber) { - char name[3] = "\\?"; const char *text = 0; int length = 0; if ((tagNumber >= 1) && (tagNumber <= 9)) { + char name[3] = "\\?"; name[1] = static_cast<char>(tagNumber + '0'); length = 2; text = pdoc->SubstituteByPosition(name, &length); @@ -7510,6 +7538,9 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { caret.period = wParam; break; + case SCI_GETWORDCHARS: + return pdoc->GetCharsOfClass(CharClassify::ccWord, reinterpret_cast<unsigned char *>(lParam)); + case SCI_SETWORDCHARS: { pdoc->SetDefaultCharClasses(false); if (lParam == 0) @@ -7518,6 +7549,9 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { } break; + case SCI_GETWHITESPACECHARS: + return pdoc->GetCharsOfClass(CharClassify::ccSpace, reinterpret_cast<unsigned char *>(lParam)); + case SCI_SETWHITESPACECHARS: { if (lParam == 0) return 0; @@ -7525,6 +7559,16 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { } break; + case SCI_GETPUNCTUATIONCHARS: + return pdoc->GetCharsOfClass(CharClassify::ccPunctuation, reinterpret_cast<unsigned char *>(lParam)); + + case SCI_SETPUNCTUATIONCHARS: { + if (lParam == 0) + return 0; + pdoc->SetCharClasses(reinterpret_cast<unsigned char *>(lParam), CharClassify::ccPunctuation); + } + break; + case SCI_SETCHARSDEFAULT: pdoc->SetDefaultCharClasses(true); break; Modified: scintilla/src/Editor.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -480,6 +480,7 @@ class Editor : public DocWatcher { virtual void CopyToClipboard(const SelectionText &selectedText) = 0; char *CopyRange(int start, int end); + std::string RangeText(int start, int end) const; void CopySelectionRange(SelectionText *ss, bool allowLineCopy=false); void CopyRangeToClipboard(int start, int end); void CopyText(int length, const char *text); Modified: scintilla/src/PerLine.cxx 11 files changed, 4 insertions(+), 7 deletions(-) =================================================================== @@ -99,7 +99,7 @@ void MarkerHandleSet::RemoveHandle(int handle) { } } -bool MarkerHandleSet::RemoveNumber(int markerNum) { +bool MarkerHandleSet::RemoveNumber(int markerNum, bool all) { bool performedDeletion = false; MarkerHandleNumber **pmhn = &root; while (*pmhn) { @@ -108,6 +108,8 @@ bool MarkerHandleSet::RemoveNumber(int markerNum) { *pmhn = mhn->next; delete mhn; performedDeletion = true; + if (!all) + break; } else { pmhn = &((*pmhn)->next); } @@ -223,12 +225,7 @@ bool LineMarkers::DeleteMark(int line, int markerNum, bool all) { delete markers[line]; markers[line] = NULL; } else { - bool performedDeletion = markers[line]->RemoveNumber(markerNum); - someChanges = someChanges || performedDeletion; - while (all && performedDeletion) { - performedDeletion = markers[line]->RemoveNumber(markerNum); - someChanges = someChanges || performedDeletion; - } + someChanges = markers[line]->RemoveNumber(markerNum, all); if (markers[line]->Length() == 0) { delete markers[line]; markers[line] = NULL; Modified: scintilla/src/PerLine.h 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -37,7 +37,7 @@ class MarkerHandleSet { bool Contains(int handle) const; bool InsertHandle(int handle, int markerNum); void RemoveHandle(int handle); - bool RemoveNumber(int markerNum); + bool RemoveNumber(int markerNum, bool all); void CombineWith(MarkerHandleSet *other); }; Modified: scintilla/src/ScintillaBase.cxx 37 files changed, 14 insertions(+), 23 deletions(-) =================================================================== @@ -213,6 +213,7 @@ void ScintillaBase::AutoCompleteStart(int lenEntered, const char *list) { pdoc->InsertString(sel.MainCaret(), list + lenEntered, lenInsert - lenEntered); SetEmptySelection(sel.MainCaret() + lenInsert - lenEntered); } + ac.Cancel(); return; } } @@ -293,13 +294,8 @@ void ScintillaBase::AutoCompleteMove(int delta) { } void ScintillaBase::AutoCompleteMoveToCurrentWord() { - char wordCurrent[1000]; - int i; - int startWord = ac.posStart - ac.startLen; - for (i = startWord; i < sel.MainCaret() && i - startWord < 1000; i++) - wordCurrent[i - startWord] = pdoc->CharAt(i); - wordCurrent[Platform::Minimum(i - startWord, 999)] = '\0'; - ac.Select(wordCurrent); + std::string wordCurrent = RangeText(ac.posStart - ac.startLen, sel.MainCaret()); + ac.Select(wordCurrent.c_str()); } void ScintillaBase::AutoCompleteCharacterAdded(char ch) { @@ -328,15 +324,12 @@ void ScintillaBase::AutoCompleteCharacterDeleted() { } void ScintillaBase::AutoCompleteCompleted() { - int item = ac.lb->GetSelection(); - char selected[1000]; - selected[0] = '\0'; - if (item != -1) { - ac.lb->GetValue(item, selected, sizeof(selected)); - } else { + int item = ac.GetSelection(); + if (item == -1) { AutoCompleteCancel(); return; } + const std::string selected = ac.GetValue(item); ac.Show(false); @@ -348,7 +341,7 @@ void ScintillaBase::AutoCompleteCompleted() { Position firstPos = ac.posStart - ac.startLen; scn.position = firstPos; scn.lParam = firstPos; - scn.text = selected; + scn.text = selected.c_str(); NotifyParent(scn); if (!ac.Active()) @@ -369,8 +362,8 @@ void ScintillaBase::AutoCompleteCompleted() { } SetEmptySelection(ac.posStart); if (item != -1) { - pdoc->InsertCString(firstPos, selected); - SetEmptySelection(firstPos + static_cast<int>(strlen(selected))); + pdoc->InsertCString(firstPos, selected.c_str()); + SetEmptySelection(firstPos + static_cast<int>(selected.length())); } SetLastXChosen(); } @@ -378,19 +371,17 @@ void ScintillaBase::AutoCompleteCompleted() { int ScintillaBase::AutoCompleteGetCurrent() { if (!ac.Active()) return -1; - return ac.lb->GetSelection(); + return ac.GetSelection(); } int ScintillaBase::AutoCompleteGetCurrentText(char *buffer) { if (ac.Active()) { - int item = ac.lb->GetSelection(); - char selected[1000]; - selected[0] = '\0'; + int item = ac.GetSelection(); if (item != -1) { - ac.lb->GetValue(item, selected, sizeof(selected)); + const std::string selected = ac.GetValue(item); if (buffer != NULL) - strcpy(buffer, selected); - return static_cast<int>(strlen(selected)); + strcpy(buffer, selected.c_str()); + return static_cast<int>(selected.length()); } } if (buffer != NULL) Modified: scintilla/src/ViewStyle.h 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -103,7 +103,7 @@ class ViewStyle { /// Margins are ordered: Line Numbers, Selection Margin, Spacing Margin enum { margins=5 }; int leftMarginWidth; ///< Spacing margin on left of text - int rightMarginWidth; ///< Spacing margin on left of text + int rightMarginWidth; ///< Spacing margin on right of text int maskInLine; ///< Mask for markers to be put into text because there is nowhere for them to go in margin MarginStyle ms[margins]; int fixedColumnWidth; Modified: scintilla/version.txt 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1 +1 @@ -320 +321 Modified: src/highlighting.c 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1554,6 +1554,7 @@ gboolean highlighting_is_comment_style(gint lexer, gint style) return (style == SCE_C_COMMENT || style == SCE_C_COMMENTLINE || style == SCE_C_COMMENTDOC || + style == SCE_C_PREPROCESSORCOMMENT || style == SCE_C_COMMENTLINEDOC || style == SCE_C_COMMENTDOCKEYWORD || style == SCE_C_COMMENTDOCKEYWORDERROR); Modified: src/highlightingmappings.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -180,6 +180,7 @@ { SCE_C_COMMENT, "comment", FALSE }, { SCE_C_COMMENTLINE, "commentline", FALSE }, { SCE_C_COMMENTDOC, "commentdoc", FALSE }, + { SCE_C_PREPROCESSORCOMMENT, "preprocessorcomment", FALSE }, { SCE_C_NUMBER, "number", FALSE }, { SCE_C_WORD, "word", FALSE }, { SCE_C_WORD2, "word2", FALSE }, @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

11 years, 4 months

[geany/geany] 5110fa: Fix search and replacement of empty matches (again)

by Colomban Wendling

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 28 Jul 2012 17:23:37 Commit: 5110fab0e10b2f352ce4dbf66d991820a97079dd https://github.com/geany/geany/commit/5110fab0e10b2f352ce4dbf66d991820a9707… Log Message: ----------- Fix search and replacement of empty matches (again) f4eb89cd7d79738a9c6c45e29abdd9d15d22e4fd was partially wrong and removed legitimate re-matches when two different matches ends at the same position. Particularly, the replacement changes are reverted. Interestingly, Perl and Python does not agree on how to do such replacements. Python does what I did in the above-cited commit, e.g. doesn't replace twice if the match end overlaps, but Perl does. Perl looks more legitimate here since both Python and Perl does find the overlapping matches when performing a search, so Python is the odd guy here doing it differently on replace than it does upon search. For example, replacing using the pattern "a?(?=b)" and the replacement string "_": Python: ababcdb -> _b_bcd_b Perl: ababcdb -> __b__bcd_b But finding using the same pattern on the same input gives the same results on both: Python: ababcdb -> ['a', '', 'a', '', ''] Perl: ababcdb -> ['a', '', 'a', '', ''] Anyway, GLib and us claim to support "Perl-compatible regular expressions", so we gotta follow Perl, especially in such doubtful situations. Modified Paths: -------------- src/search.c Modified: src/search.c 47 files changed, 16 insertions(+), 31 deletions(-) =================================================================== @@ -2028,7 +2028,6 @@ static gint find_document_usage(GeanyDocument *doc, const gchar *search_text, gi struct Sci_TextToFind ttf; gint count = 0; gint prev_line = -1; - gint prev_end = -1; g_return_val_if_fail(doc != NULL, 0); @@ -2045,27 +2044,22 @@ static gint find_document_usage(GeanyDocument *doc, const gchar *search_text, gi if (pos == -1) break; /* no more matches */ - /* avoid rematching with empty matches like "(?=[a-z])" or "^$". - * note we cannot assume a match will always be empty or not, like with "a?(?=b)"*/ - if (ttf.chrgText.cpMax != prev_end) + count++; + line = sci_get_line_from_position(doc->editor->sci, pos); + if (line != prev_line) { - count++; - line = sci_get_line_from_position(doc->editor->sci, pos); - if (line != prev_line) - { - buffer = sci_get_line(doc->editor->sci, line); - msgwin_msg_add(COLOR_BLACK, line + 1, doc, - "%s:%d: %s", short_file_name, line + 1, g_strstrip(buffer)); - g_free(buffer); - prev_line = line; - } + buffer = sci_get_line(doc->editor->sci, line); + msgwin_msg_add(COLOR_BLACK, line + 1, doc, + "%s:%d: %s", short_file_name, line + 1, g_strstrip(buffer)); + g_free(buffer); + prev_line = line; } - prev_end = ttf.chrgText.cpMax; - - if (ttf.chrg.cpMin < ttf.chrgText.cpMax) - ttf.chrg.cpMin = ttf.chrgText.cpMax; - else + ttf.chrg.cpMin = ttf.chrgText.cpMax; + /* avoid rematching with empty matches like "(?=[a-z])" or "^$". + * note we cannot assume a match will always be empty or not and then break out, since + * matches like "a?(?=b)" will me sometimes empty and sometimes not */ + if ((ttf.chrgText.cpMax - ttf.chrgText.cpMin) == 0) ttf.chrg.cpMin ++; } g_free(short_file_name); @@ -2136,7 +2130,6 @@ guint search_replace_range(ScintillaObject *sci, struct Sci_TextToFind *ttf, const gchar *find_text = ttf->lpstrText; gint start = ttf->chrg.cpMin; gint end = ttf->chrg.cpMax; - gint prev_find_end = -1; g_return_val_if_fail(sci != NULL && find_text != NULL && replace_text != NULL, 0); if (! *find_text) @@ -2168,14 +2161,9 @@ guint search_replace_range(ScintillaObject *sci, struct Sci_TextToFind *ttf, if (chNext == '\r' || chNext == '\n') movepastEOL = 1; } - /* make sure we don't replace the same position twice, in case of pattern - * like "a?(?=b)" (would match "a"b and then ""b -- empty match the 2nd time) */ - if (prev_find_end != ttf->chrgText.cpMax) - { - replace_len = search_replace_target(sci, replace_text, - flags & SCFIND_REGEXP); - count++; - } + replace_len = search_replace_target(sci, replace_text, + flags & SCFIND_REGEXP); + count++; if (search_pos == end) break; /* Prevent hang when replacing regex $ */ @@ -2186,9 +2174,6 @@ guint search_replace_range(ScintillaObject *sci, struct Sci_TextToFind *ttf, ttf->chrg.cpMin = start; end += replace_len - find_len; /* update end of range now text has changed */ ttf->chrg.cpMax = end; - - /* match end + replacement offset */ - prev_find_end = ttf->chrgText.cpMax + replace_len - find_len; } } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

11 years, 4 months

[geany/geany] a09123: Fix searching out of document range

by Colomban Wendling

11 years, 4 months

[geany/geany] f4eb89: Fix search and replacement of empty matches

by Colomban Wendling

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 27 Jul 2012 22:32:26 Commit: f4eb89cd7d79738a9c6c45e29abdd9d15d22e4fd https://github.com/geany/geany/commit/f4eb89cd7d79738a9c6c45e29abdd9d15d22e… Log Message: ----------- Fix search and replacement of empty matches Regular expressions might match empty ranges, which weren't handled properly, but generally simply omitted. For example, the regular expression "^$" (empty line) never matched because we assumed empty results were not interesting, and actually needed more care in the code. Alike, an expression matching only on its lookahead part, like "a?(?=b)" against "b", would stop further search, although it could even match a non-empty range if "ab" is present later in the input. This last kind of expressions also lead to double-replacement because they first matched "ab" and then "b" alone when re-matching after the "a" replacement. This commit fixes: * searching when the matched range is empty; * step-by-step search when matching an empty range; * double replacement when the pattern re-matches an empty range straight after a replacement; * replacement to and empty string when the matching an empty range. A know issue though is the step-by-step replacement that won't replace an empty match but rather find the next match. Modified Paths: -------------- src/search.c Modified: src/search.c 55 files changed, 37 insertions(+), 18 deletions(-) =================================================================== @@ -1940,6 +1940,9 @@ gint search_find_next(ScintillaObject *sci, const gchar *str, gint flags) pos = sci_get_current_position(sci); ret = find_regex(sci, pos, regex); + /* avoid re-matching the same position in case of empty matches */ + if (ret == pos && regex_matches[0].start == regex_matches[0].end) + ret = find_regex(sci, pos + 1, regex); if (ret >= 0) sci_set_selection(sci, ret, regex_matches[0].end); @@ -2025,6 +2028,7 @@ static gint find_document_usage(GeanyDocument *doc, const gchar *search_text, gi struct Sci_TextToFind ttf; gint count = 0; gint prev_line = -1; + gint prev_end = -1; g_return_val_if_fail(doc != NULL, 0); @@ -2035,27 +2039,34 @@ static gint find_document_usage(GeanyDocument *doc, const gchar *search_text, gi ttf.lpstrText = (gchar *)search_text; while (1) { - gint pos, line, find_len; + gint pos, line; pos = search_find_text(doc->editor->sci, flags, &ttf); if (pos == -1) break; /* no more matches */ - find_len = ttf.chrgText.cpMax - ttf.chrgText.cpMin; - if (find_len == 0) - break; /* Ignore regex ^ or $ */ - count++; - line = sci_get_line_from_position(doc->editor->sci, pos); - if (line != prev_line) + /* avoid rematching with empty matches like "(?=[a-z])" or "^$". + * note we cannot assume a match will always be empty or not, like with "a?(?=b)"*/ + if (ttf.chrgText.cpMax != prev_end) { - buffer = sci_get_line(doc->editor->sci, line); - msgwin_msg_add(COLOR_BLACK, line + 1, doc, - "%s:%d: %s", short_file_name, line + 1, g_strstrip(buffer)); - g_free(buffer); - prev_line = line; + count++; + line = sci_get_line_from_position(doc->editor->sci, pos); + if (line != prev_line) + { + buffer = sci_get_line(doc->editor->sci, line); + msgwin_msg_add(COLOR_BLACK, line + 1, doc, + "%s:%d: %s", short_file_name, line + 1, g_strstrip(buffer)); + g_free(buffer); + prev_line = line; + } } - ttf.chrg.cpMin = ttf.chrgText.cpMax; + prev_end = ttf.chrgText.cpMax; + + if (ttf.chrg.cpMin < ttf.chrgText.cpMax) + ttf.chrg.cpMin = ttf.chrgText.cpMax; + else + ttf.chrg.cpMin ++; } g_free(short_file_name); return count; @@ -2125,6 +2136,7 @@ guint search_replace_range(ScintillaObject *sci, struct Sci_TextToFind *ttf, const gchar *find_text = ttf->lpstrText; gint start = ttf->chrg.cpMin; gint end = ttf->chrg.cpMax; + gint prev_find_end = -1; g_return_val_if_fail(sci != NULL && find_text != NULL && replace_text != NULL, 0); if (! *find_text) @@ -2139,8 +2151,6 @@ guint search_replace_range(ScintillaObject *sci, struct Sci_TextToFind *ttf, find_len = ttf->chrgText.cpMax - ttf->chrgText.cpMin; if (search_pos == -1) break; /* no more matches */ - if (find_len == 0 && ! NZV(replace_text)) - break; /* nothing to do */ if (search_pos + find_len > end) break; /* found text is partly out of range */ @@ -2158,9 +2168,14 @@ guint search_replace_range(ScintillaObject *sci, struct Sci_TextToFind *ttf, if (chNext == '\r' || chNext == '\n') movepastEOL = 1; } - replace_len = search_replace_target(sci, replace_text, - flags & SCFIND_REGEXP); - count++; + /* make sure we don't replace the same position twice, in case of pattern + * like "a?(?=b)" (would match "a"b and then ""b -- empty match the 2nd time) */ + if (prev_find_end != ttf->chrgText.cpMax) + { + replace_len = search_replace_target(sci, replace_text, + flags & SCFIND_REGEXP); + count++; + } if (search_pos == end) break; /* Prevent hang when replacing regex $ */ @@ -2171,7 +2186,11 @@ guint search_replace_range(ScintillaObject *sci, struct Sci_TextToFind *ttf, ttf->chrg.cpMin = start; end += replace_len - find_len; /* update end of range now text has changed */ ttf->chrg.cpMax = end; + + /* match end + replacement offset */ + prev_find_end = ttf->chrgText.cpMax + replace_len - find_len; } + } return count; } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

11 years, 4 months

Jump to page:

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2012