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 v3.6.4.
Browse files Browse the repository at this point in the history
XhmikosR committed Mar 28, 2016
1 parent b465206 commit 97a3afa
Showing 23 changed files with 887 additions and 153 deletions.
10 changes: 5 additions & 5 deletions scintilla/doc/ScintillaDownload.html
Original file line number Diff line number Diff line change
@@ -26,9 +26,9 @@
<table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
<tr>
<td>
<font size="4"> <a href="http://www.scintilla.org/scintilla363.zip">
<font size="4"> <a href="http://www.scintilla.org/scintilla364.zip">
Windows</a>&nbsp;&nbsp;
<a href="http://www.scintilla.org/scintilla363.tgz">
<a href="http://www.scintilla.org/scintilla364.tgz">
GTK+/Linux</a>&nbsp;&nbsp;
</font>
</td>
@@ -42,16 +42,16 @@ <h2>
containing very few restrictions.
</p>
<h3>
Release 3.6.3
Release 3.6.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://www.scintilla.org/scintilla363.zip">zip format</a> (1500K) commonly used on Windows</li>
<li><a href="http://www.scintilla.org/scintilla363.tgz">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li>
<li><a href="http://www.scintilla.org/scintilla364.zip">zip format</a> (1500K) commonly used on Windows</li>
<li><a href="http://www.scintilla.org/scintilla364.tgz">tgz format</a> (1400K) 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>
77 changes: 76 additions & 1 deletion scintilla/doc/ScintillaHistory.html
Original file line number Diff line number Diff line change
@@ -480,6 +480,10 @@ <h3>
<td>Yury Dubinsky</td>
<td>Sam Hocevar</td>
<td>Luyomi</td>
<td>Matt Gilarde</td>
</tr><tr>
<td>Mark C</td>
<td>Johannes Sasongko</td>
</tr>
</table>
<p>
@@ -491,18 +495,72 @@ <h3>
Icons</a> Copyright(C) 1998 by Dean S. Jones<br />
</li>
</ul>
<h3>
<a href="http://www.scintilla.org/scite365.zip">Release 3.6.5</a>
</h3>
<ul>
<li>
Released 13 March 2016.
</li>
<li>
JSON lexer added.
<a href="http://sourceforge.net/p/scintilla/feature-requests/1140/">Feature #1140.</a>
</li>
<li>
The Python lexer treats '@' as an operator except when it is the first visible character on a line.
This is for Python 3.5.
</li>
<li>
SciTE bug fixed with exported HTML where extra line shown.
<a href="http://sourceforge.net/p/scintilla/bugs/1816/">Bug #1816</a>.
</li>
<li>
SciTE on Windows fixes bugs with pop-up menus in the find and replace strips.
For the replace strip, menu choices change the state.
For the find strip, menu choices are reflected in the appearance of their corresponding buttons.
</li>
</ul>
<h3>
<a href="http://www.scintilla.org/scite364.zip">Release 3.6.4</a>
</h3>
<ul>
<li>
Released 18 January 2016.
Released 13 March 2016.
</li>
<li>
SciTE allows setting the autocompletion type separator character.
</li>
<li>
The C++ folder folds code on '(' and ')' to allow multi-line calls to be folded.
<a href="http://sourceforge.net/p/scintilla/feature-requests/1138/">Feature #1138.</a>
</li>
<li>
For the HTML lexer, limit the extent of Mako line comments to finish before
the line end characters.
</li>
<li>
Folds unfolded when two fold regions are merged by either deleting an intervening line
or changing its fold level by adding characters.
This was fixed both in Scintilla and in SciTE's equivalent code.
<a href="http://sourceforge.net/p/scintilla/bugs/1799/">Bug #1799</a>.<br />
</li>
<li>
The Progress lexer supports hexadecimal numeric literals,
single-line comments, abbreviated keywords and
extends nested comments to unlimited levels.
</li>
<li>
Ruby lexer treats alternate hash key syntax "key:" as a symbol.
<a href="http://sourceforge.net/p/scintilla/bugs/1810/">Bug #1810</a>.
</li>
<li>
Rust lexer handles bracketed Unicode string escapes like "\u{123abc}".
<a href="http://sourceforge.net/p/scintilla/bugs/1809/">Bug #1809</a>.
</li>
<li>
For GTK+ on Windows fix 64-bit build which was broken in 3.6.3.
</li>
<li>
For Qt, release builds have assertions turned off.
</li>
<li>
@@ -511,6 +569,23 @@ <h3>
<li>
IME target range displayed on Qt for OS X.
</li>
<li>
On Windows, make clipboard operations more robust by retrying OpenClipboard if it fails
as this may occur when another application has opened the clipboard.
</li>
<li>
On Windows back out change that removed use of def file to ensure
Scintilla_DirectFunction exported without name mangling.
<a href="http://sourceforge.net/p/scintilla/bugs/1813/">Bug #1813</a>.
</li>
<li>
On GTK+ and Qt over Win32 in Korean fix bug caused by last release's word input change.
</li>
<li>
For SciTE, more descriptive error messages are displayed when there are problems loading the
Lua startup script.
<a href="http://sourceforge.net/p/scintilla/feature-requests/1139/">Feature #1139.</a>
</li>
</ul>
<h3>
<a href="http://www.scintilla.org/scite363.zip">Release 3.6.3</a>
7 changes: 4 additions & 3 deletions scintilla/doc/index.html
Original file line number Diff line number Diff line change
@@ -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="20160118" />
<meta name="Date.Modified" content="20160313" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<style type="text/css">
#versionlist {
@@ -56,8 +56,8 @@
GTK+, and OS X</font>
</td>
<td width="40%" align="right">
<font color="#FFCC99" size="3"> Release version 3.6.3<br />
Site last modified January 18 2016</font>
<font color="#FFCC99" size="3"> Release version 3.6.4<br />
Site last modified March 13 2016</font>
</td>
<td width="20%">
&nbsp;
@@ -72,6 +72,7 @@
</tr>
</table>
<ul id="versionlist">
<li>Version 3.6.4 avoids some folding bugs by automatically unfolding and improves clipboard robustness on Win32.</li>
<li>Version 3.6.3 supports idle-time styling.</li>
<li>Version 3.6.2 fixes crashes and other bugs, particularly on Cocoa.</li>
<li>Version 3.6.1 adds minor features and fixes bugs.</li>
15 changes: 15 additions & 0 deletions scintilla/include/SciLexer.h
Original file line number Diff line number Diff line change
@@ -132,6 +132,7 @@
#define SCLEX_SREC 117
#define SCLEX_IHEX 118
#define SCLEX_TEHEX 119
#define SCLEX_JSON 120
#define SCLEX_AHK 200
#define SCLEX_AUTOMATIC 1000
#define SCE_P_DEFAULT 0
@@ -1809,6 +1810,20 @@
#define SCE_HEX_CHECKSUM 16
#define SCE_HEX_CHECKSUM_WRONG 17
#define SCE_HEX_GARBAGE 18
#define SCE_JSON_DEFAULT 0
#define SCE_JSON_NUMBER 1
#define SCE_JSON_STRING 2
#define SCE_JSON_STRINGEOL 3
#define SCE_JSON_PROPERTYNAME 4
#define SCE_JSON_ESCAPESEQUENCE 5
#define SCE_JSON_LINECOMMENT 6
#define SCE_JSON_BLOCKCOMMENT 7
#define SCE_JSON_OPERATOR 8
#define SCE_JSON_URI 9
#define SCE_JSON_COMPACTIRI 10
#define SCE_JSON_KEYWORD 11
#define SCE_JSON_LDKEYWORD 12
#define SCE_JSON_ERROR 13
/* --Autogenerated -- end of section automatically generated from Scintilla.iface */

#endif
17 changes: 17 additions & 0 deletions scintilla/include/Scintilla.iface
Original file line number Diff line number Diff line change
@@ -2799,6 +2799,7 @@ val SCLEX_BIBTEX=116
val SCLEX_SREC=117
val SCLEX_IHEX=118
val SCLEX_TEHEX=119
val SCLEX_JSON=120
## notepad2 custom code for the AHK lexer - start
val SCLEX_AHK=200
## notepad2 custom code for the AHK lexer - end
@@ -4705,6 +4706,22 @@ val SCE_HEX_GARBAGE=18
lex IHex=SCLEX_IHEX SCE_HEX_
# Lexical state for SCLEX_TEHEX (shared with Srec)
lex TEHex=SCLEX_TEHEX SCE_HEX_
# Lexical states for SCLEX_JSON
lex JSON=SCLEX_JSON SCE_JSON_
val SCE_JSON_DEFAULT=0
val SCE_JSON_NUMBER=1
val SCE_JSON_STRING=2
val SCE_JSON_STRINGEOL=3
val SCE_JSON_PROPERTYNAME=4
val SCE_JSON_ESCAPESEQUENCE=5
val SCE_JSON_LINECOMMENT=6
val SCE_JSON_BLOCKCOMMENT=7
val SCE_JSON_OPERATOR=8
val SCE_JSON_URI=9
val SCE_JSON_COMPACTIRI=10
val SCE_JSON_KEYWORD=11
val SCE_JSON_LDKEYWORD=12
val SCE_JSON_ERROR=13

# Events

2 changes: 1 addition & 1 deletion scintilla/include/ScintillaWidget.h
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ struct _ScintillaClass {

GType scintilla_object_get_type (void);
GtkWidget* scintilla_object_new (void);
long scintilla_object_send_message (ScintillaObject *sci, unsigned int iMessage, guintptr wParam, gintptr lParam);
gintptr scintilla_object_send_message (ScintillaObject *sci, unsigned int iMessage, guintptr wParam, gintptr lParam);

#ifndef G_IR_SCANNING
/* The legacy names confuse the g-ir-scanner program */
4 changes: 2 additions & 2 deletions scintilla/lexers/LexCPP.cxx
Original file line number Diff line number Diff line change
@@ -1349,14 +1349,14 @@ void SCI_METHOD LexerCPP::Fold(Sci_PositionU startPos, Sci_Position length, int
}
}
if (options.foldSyntaxBased && (style == SCE_C_OPERATOR)) {
if (ch == '{' || ch == '[') {
if (ch == '{' || ch == '[' || ch == '(') {
// Measure the minimum before a '{' to allow
// folding on "} else {"
if (levelMinCurrent > levelNext) {
levelMinCurrent = levelNext;
}
levelNext++;
} else if (ch == '}' || ch == ']') {
} else if (ch == '}' || ch == ']' || ch == ')') {
levelNext--;
}
}
Loading

0 comments on commit 97a3afa

Please sign in to comment.