Skip to content
This repository has been archived by the owner on Aug 12, 2018. It is now read-only.

Commit

Permalink
Update Scintilla to 3.4.4.
Browse files Browse the repository at this point in the history
  • Loading branch information
@XhmikosR
XhmikosR committed Jul 3, 2014
1 parent 80a1ee6 commit 6668227
Show file tree
Hide file tree
Showing 25 changed files with 336 additions and 244 deletions.
10 changes: 5 additions & 5 deletions scintilla/doc/ScintillaDownload.html
View file
Expand Up @@ -25,9 +25,9 @@
<table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
<tr>
<td>
<font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla343.zip?download">
<font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla344.zip?download">
Windows</a>&nbsp;&nbsp;
<a href="http://prdownloads.sourceforge.net/scintilla/scintilla343.tgz?download">
<a href="http://prdownloads.sourceforge.net/scintilla/scintilla344.tgz?download">
GTK+/Linux</a>&nbsp;&nbsp;
</font>
</td>
Expand All @@ -41,16 +41,16 @@ <h2>
containing very few restrictions.
</p>
<h3>
Release 3.4.3
Release 3.4.4
</h3>
<h4>
Source Code
</h4>
The source code package contains all of the source code for Scintilla but no binary
executable code and is available in
<ul>
<li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla343.zip?download">zip format</a> (1450K) commonly used on Windows</li>
<li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla343.tgz?download">tgz format</a> (1300K) commonly used on Linux and compatible operating systems</li>
<li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla344.zip?download">zip format</a> (1450K) commonly used on Windows</li>
<li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla344.tgz?download">tgz format</a> (1300K) commonly used on Linux and compatible operating systems</li>
</ul>
Instructions for building on both Windows and Linux are included in the readme file.
<h4>
Expand Down
65 changes: 64 additions & 1 deletion scintilla/doc/ScintillaHistory.html
View file
Expand Up @@ -464,15 +464,78 @@ <h3>
</h3>
<ul>
<li>
Released 27 May 2014.
Released 3 July 2014.
</li>
<li>
Style byte indicators removed. They were deprecated in 2007. Standard indicators should be used instead.
</li>
<li>
When multiple selections are active, autocompletion text may be inserted at each selection with new
SCI_AUTOCSETMULTI method.
</li>
<li>
C++ lexer fixes crash for "#define x(".
<a href="http://sourceforge.net/p/scintilla/bugs/1614/">Bug #1614</a>.
</li>
<li>
C++ lexer fixes raw string recognition so that R"xxx(blah)xxx" is styled as SCE_C_STRINGRAW.
</li>
<li>
The Postscript lexer no longer marks token edges with indicators as this used style byte indicators.
</li>
<li>
The Scriptol lexer no longer displays indicators for poor indentation as this used style byte indicators.
</li>
<li>
TCL lexer fixes names of keyword sets.
<a href="http://sourceforge.net/p/scintilla/bugs/1615/">Bug #1615</a>.
</li>
<li>
Shell lexer fixes fold matching problem caused by "&lt;&lt;&lt;".
<a href="http://sourceforge.net/p/scintilla/bugs/1605/">Bug #1605</a>.
</li>
<li>
Fix bug where indicators were not removed when fold highlighting on.
<a href="http://sourceforge.net/p/scintilla/bugs/1604/">Bug #1604</a>.
</li>
<li>
Fix bug on Cocoa where emoji were treated as being zero width.
</li>
<li>
Fix crash on GTK+ with Ubuntu 12.04 and overlay scroll bars.
</li>
<li>
Avoid creating a Cairo context when measuring text on GTK+ as future versions of GTK+
may prohibit calling gdk_cairo_create except inside drawing handlers. This prohibition may
be required on Wayland.
</li>
<li>
On Cocoa, the registerNotifyCallback method is now marked as deprecated so client code that
uses it will display an error message.
Client code should use the delegate mechanism or subclassing instead.
The method will be removed in the next version.
</li>
<li>
On Cocoa, package Scintilla more in compliance with platform conventions.
Only publish public headers in the framework headers directory.
Only define the Scintilla namespace in Scintilla.h when compiling as C++.
Use the Cocoa NS_ENUM and NS_OPTIONS macros for exposed enumerations.
Hide internal methods from public headers.
These changes are aimed towards publishing Scintilla as a module which will allow it to
be used from the Swift programming language, although more changes will be needed here.
</li>
<li>
Fix crash in SciTE when stream comment performed at line end.
<a href="http://sourceforge.net/p/scintilla/bugs/1610/">Bug #1610</a>.
</li>
<li>
For SciTE on Windows, display error message when common dialogs fail.
<a href="http://sourceforge.net/p/scintilla/bugs/156/">Bug #156</a>.
</li>
<li>
For SciTE on GTK+ fix bug with initialisation of toggle buttons in find and replace strips.
<a href="http://sourceforge.net/p/scintilla/bugs/1612/">Bug #1612</a>.
</li>
</ul>
<h3>
<a href="http://prdownloads.sourceforge.net/scintilla/scite343.zip?download">Release 3.4.3</a>
Expand Down
7 changes: 4 additions & 3 deletions scintilla/doc/index.html
View file
Expand Up @@ -9,7 +9,7 @@
<meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
<meta name="Description"
content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
<meta name="Date.Modified" content="20140527" />
<meta name="Date.Modified" content="20140703" />
<style type="text/css">
#versionlist {
margin: 0;
Expand Down Expand Up @@ -55,8 +55,8 @@
GTK+, and OS X</font>
</td>
<td width="40%" align="right">
<font color="#FFCC99" size="3"> Release version 3.4.3<br />
Site last modified May 27 2014</font>
<font color="#FFCC99" size="3"> Release version 3.4.4<br />
Site last modified July 3 2014</font>
</td>
<td width="20%">
&nbsp;
Expand All @@ -71,6 +71,7 @@
</tr>
</table>
<ul id="versionlist">
<li>Version 3.4.4 removes style byte indicators.</li>
<li>Version 3.4.3 fixes hangs and crashes at shutdown on Windows.</li>
<li>Version 3.4.2 allows the application to filter input from typing, paste, drag &amp; drop and similar.</li>
<li>Version 3.4.1 fixes a regression in 3.4.0 that stopped the caret moving when lines were wrapped.</li>
Expand Down
4 changes: 2 additions & 2 deletions scintilla/include/Scintilla.h
View file
Expand Up @@ -1021,7 +1021,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
* CHARRANGE, TEXTRANGE, FINDTEXTEX, FORMATRANGE, and NMHDR structs.
* So older code that treats Scintilla as a RichEdit will work. */

#ifdef SCI_NAMESPACE
#if defined(__cplusplus) && defined(SCI_NAMESPACE)
namespace Scintilla {
#endif

Expand Down Expand Up @@ -1113,7 +1113,7 @@ struct SCNotification {
int updated; /* SCN_UPDATEUI */
};

#ifdef SCI_NAMESPACE
#if defined(__cplusplus) && defined(SCI_NAMESPACE)
}
#endif

Expand Down
11 changes: 10 additions & 1 deletion scintilla/lexers/LexBash.cxx
View file
Expand Up @@ -767,6 +767,7 @@ static void FoldBashDoc(unsigned int startPos, int length, int, WordList *[],
bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
unsigned int endPos = startPos + length;
int visibleChars = 0;
int skipHereCh = 0;
int lineCurrent = styler.GetLine(startPos);
int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
int levelCurrent = levelPrev;
Expand Down Expand Up @@ -798,7 +799,15 @@ static void FoldBashDoc(unsigned int startPos, int length, int, WordList *[],
// Here Document folding
if (style == SCE_SH_HERE_DELIM) {
if (ch == '<' && chNext == '<') {
levelCurrent++;
if (styler.SafeGetCharAt(i + 2) == '<') {
skipHereCh = 1;
} else {
if (skipHereCh == 0) {
levelCurrent++;
} else {
skipHereCh = 0;
}
}
}
} else if (style == SCE_SH_HERE_Q && styler.StyleAt(i+1) == SCE_SH_DEFAULT) {
levelCurrent--;
Expand Down
4 changes: 3 additions & 1 deletion scintilla/lexers/LexCPP.cxx
View file
Expand Up @@ -1220,7 +1220,9 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle,
size_t startValue = endArgs+1;
while ((startValue < restOfLine.length()) && IsSpaceOrTab(restOfLine[startValue]))
startValue++;
std::string value = restOfLine.substr(startValue);
std::string value;
if (startValue < restOfLine.length())
value = restOfLine.substr(startValue);
preprocessorDefinitions[key] = SymbolValue(value, args);
ppDefineHistory.push_back(PPDefinition(lineCurrent, key, value, false, args));
definitionsChanged = true;
Expand Down
2 changes: 1 addition & 1 deletion scintilla/lexers/LexTCL.cxx
View file
Expand Up @@ -358,7 +358,7 @@ static const char * const tclWordListDesc[] = {
"TK Keywords",
"iTCL Keywords",
"tkCommands",
"expand"
"expand",
"user1",
"user2",
"user3",
Expand Down
2 changes: 1 addition & 1 deletion scintilla/lexlib/CharacterCategory.cxx
View file
Expand Up @@ -3287,7 +3287,7 @@ const int nRanges = ELEMENTS(catRanges);
// Initial version has 3249 entries and adds about 13K to the executable.
// The array is in ascending order so can be searched using binary search.
// Therefore the average call takes log2(3249) = 12 comparisons.
// For speed, it may be an useful to make a linear table for the common values,
// For speed, it may be useful to make a linear table for the common values,
// possibly for 0..0xff for most Western European text or 0..0xfff for most
// alphabetic languages.

Expand Down
4 changes: 4 additions & 0 deletions scintilla/src/Document.h
View file
Expand Up @@ -39,6 +39,10 @@ class Range {
start(start_), end(end_) {
}

bool operator==(const Range &other) const {
return (start == other.start) && (end == other.end);
}

bool Valid() const {
return (start != invalidPosition) && (end != invalidPosition);
}
Expand Down

0 comments on commit 6668227

Please sign in to comment.