Skip to content

Commit

Permalink
Update Scintilla and Lexilla to v5.1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
dail8859 committed May 26, 2022
1 parent 056f01f commit ac25f4b
Show file tree
Hide file tree
Showing 161 changed files with 4,001 additions and 645 deletions.
4 changes: 4 additions & 0 deletions src/lexilla/.gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,20 @@
**.def text
**.manifest text
**.properties text
**.session text
**.styled text
**.folded text
**.adoc text
**.asp text
**.php text
**.vb text
**.cmake text
**.d text
**.erl text
**.gd text
**.iss text
**.jl text
**.json text
**.lua text
**.matlab text
**.ml text
Expand All @@ -44,6 +47,7 @@
**.mms text
**.tex text
**.fs text
**.vhd text
**.x12 text
**.yaml text
**.md text
Expand Down
2 changes: 1 addition & 1 deletion src/lexilla/access/LexillaAccess.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ std::wstring WideStringFromUTF8(std::string_view sv) {
const int sLength = static_cast<int>(sv.length());
const int cchWide = ::MultiByteToWideChar(CP_UTF8, 0, sv.data(), sLength, nullptr, 0);
std::wstring sWide(cchWide, 0);
::MultiByteToWideChar(CP_UTF8, 0, sv.data(), sLength, &sWide[0], cchWide);
::MultiByteToWideChar(CP_UTF8, 0, sv.data(), sLength, sWide.data(), cchWide);
return sWide;
}

Expand Down
8 changes: 5 additions & 3 deletions src/lexilla/cppcheck.suppress
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ passedByValue
// Suppress most lexer warnings since the lexers are maintained by others
redundantCondition:lexilla/lexers/LexA68k.cxx
constParameter:lexilla/lexers/LexAbaqus.cxx
unusedStructMember:lexilla/lexers/LexAsciidoc.cxx
constParameterCallback:lexilla/lexers/LexAsn1.cxx
knownConditionTrueFalse:lexilla/lexers/LexAU3.cxx
shadowVariable:lexilla/lexers/LexAU3.cxx
constParameter:lexilla/lexers/LexBaan.cxx
Expand All @@ -36,6 +38,7 @@ constParameter:lexilla/lexers/LexCPP.cxx
variableScope:lexilla/lexers/LexCSS.cxx
variableScope:lexilla/lexers/LexDataflex.cxx
knownConditionTrueFalse:lexilla/lexers/LexECL.cxx
knownConditionTrueFalse:lexilla/lexers/LexEiffel.cxx
variableScope:lexilla/lexers/LexErlang.cxx
knownConditionTrueFalse:lexilla/lexers/LexEScript.cxx
constParameter:lexilla/lexers/LexFortran.cxx
Expand Down Expand Up @@ -83,6 +86,7 @@ redundantInitialization:lexilla/lexers/LexRegistry.cxx
constParameter:lexilla/lexers/LexRuby.cxx
constParameter:lexilla/lexers/LexRust.cxx
constParameter:lexilla/lexers/LexScriptol.cxx
knownConditionTrueFalse:lexilla/lexers/LexScriptol.cxx
variableScope:lexilla/lexers/LexSpecman.cxx
unreadVariable:lexilla/lexers/LexSpice.cxx
constParameter:lexilla/lexers/LexSTTXT.cxx
Expand All @@ -93,6 +97,7 @@ invalidscanf:lexilla/lexers/LexTCMD.cxx
constParameter:lexilla/lexers/LexTeX.cxx
variableScope:lexilla/lexers/LexTeX.cxx
knownConditionTrueFalse:lexilla/lexers/LexTxt2tags.cxx
knownConditionTrueFalse:lexilla/lexers/LexVB.cxx
constParameter:lexilla/lexers/LexVerilog.cxx
constParameter:lexilla/lexers/LexVHDL.cxx
shadowVariable:lexilla/lexers/LexVHDL.cxx
Expand Down Expand Up @@ -137,9 +142,6 @@ constVariable:lexilla/lexers/LexTACL.cxx
constVariable:lexilla/lexers/LexTADS3.cxx
constVariable:lexilla/lexers/LexTAL.cxx

// bp.itBracket not actually redundant as needed by return statements
redundantAssignment:lexilla/lexers/LexCPP.cxx

// Suppress consting argv in main as non-const is standard
constParameter:lexilla/examples/CheckLexilla/CheckLexilla.c

Expand Down
12 changes: 7 additions & 5 deletions src/lexilla/doc/Lexilla.html
Original file line number Diff line number Diff line change
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="20220209" />
<meta name="Date.Modified" content="20220522" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<style type="text/css">
.logo {
Expand Down Expand Up @@ -61,8 +61,8 @@
<font color="#FFCC99" size="4"> A library of language lexers for use with Scintilla</font>
</td>
<td width="40%" align="right">
<font color="#FFCC99" size="3">Release version 5.1.5<br />
Site last modified February 9 2022</font>
<font color="#FFCC99" size="3">Release version 5.1.7<br />
Site last modified May 22 2022</font>
</td>
<td width="20%">
&nbsp;
Expand All @@ -77,6 +77,8 @@
</tr>
</table>
<ul id="versionlist">
<li>Version 5.1.7 improves CMake, HTML, Matlab, Raku, Ruby, and VHDL.</li>
<li>Version 5.1.6 improves Markdown and Ruby.</li>
<li>Version 5.1.5 improves Bash, Batch, F#, HTML, Inno Setup, and Python.</li>
<li>Version 5.1.4 adds lexers for AsciiDoc and GDScript.</li>
<li>Version 5.1.3 improves Rust.</li>
Expand Down Expand Up @@ -119,8 +121,8 @@
The testing framework uses some C++20 features but the basic library only uses C++17.
</p>
<p>
Lexilla is currently available for Intel Win32, OS X, and Linux compatible operating
systems. It has been run on Windows 10, OS X 10.13+, and on Ubuntu 20.04 but is likely
Lexilla is currently available for Intel Win32, macOS, and Linux compatible operating
systems. It has been run on Windows 10, macOS 10.13+, and on Ubuntu 20.04 but is likely
to run on earlier systems as it has no GUI functionality.
</p>
<p>
Expand Down
2 changes: 1 addition & 1 deletion src/lexilla/doc/LexillaDoc.html
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ <h2>The Lexilla protocol</h2>

<p>The Lexilla protocol is a superset of the earlier external lexer protocol that defined the first 3 functions
(<span class="name">GetLexerCount</span>, <span class="name">GetLexerName</span>, <span class="name">GetLexerFactory</span>)
so Lexilla be loaded by applications that support that protocol.
so Lexilla can be loaded by applications that support that protocol.
<span class="name">GetLexerFactory</span> will rarely be used now as it is easier to call <span class="name">CreateLexer</span>.
</p>

Expand Down
10 changes: 5 additions & 5 deletions src/lexilla/doc/LexillaDownload.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
<table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
<tr>
<td>
<font size="4"> <a href="https://www.scintilla.org/lexilla515.zip">
<font size="4"> <a href="https://www.scintilla.org/lexilla517.zip">
Windows</a>&nbsp;&nbsp;
<a href="https://www.scintilla.org/lexilla515.tgz">
<a href="https://www.scintilla.org/lexilla517.tgz">
GTK/Linux</a>&nbsp;&nbsp;
</font>
</td>
Expand All @@ -42,16 +42,16 @@ <h2>
containing very few restrictions.
</p>
<h3>
Release 5.1.5
Release 5.1.7
</h3>
<h4>
Source Code
</h4>
The source code package contains all of the source code for Lexilla but no binary
executable code and is available in
<ul>
<li><a href="https://www.scintilla.org/lexilla515.zip">zip format</a> (1.1M) commonly used on Windows</li>
<li><a href="https://www.scintilla.org/lexilla515.tgz">tgz format</a> (0.9M) commonly used on Linux and compatible operating systems</li>
<li><a href="https://www.scintilla.org/lexilla517.zip">zip format</a> (1.1M) commonly used on Windows</li>
<li><a href="https://www.scintilla.org/lexilla517.tgz">tgz format</a> (0.9M) 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
106 changes: 106 additions & 0 deletions src/lexilla/doc/LexillaHistory.html
Original file line number Diff line number Diff line change
Expand Up @@ -577,9 +577,115 @@ <h2>Contributors</h2>
<td>Arkadiusz Michalski</td>
</tr><tr>
<td>Red_M</td>
<td>cdbdev</td>
<td>Andrey Smolyakov</td>
<td>Knut Leimbert</td>
</tr>
</table>
<h2>Releases</h2>
<h3>
<a href="https://www.scintilla.org/lexilla517.zip">Release 5.1.7</a>
</h3>
<ul>
<li>
Released 22 May 2022.
</li>
<li>
Add LexAccessor::StyleIndexAt to retrieve style values as unsigned to handle styles > 127 better.
<a href="https://github.com/ScintillaOrg/lexilla/issues/61">Issue #61</a>.
</li>
<li>
Associate more than one file extension with a setting for testing.
<a href="https://github.com/ScintillaOrg/lexilla/issues/81">Issue #81</a>.
</li>
<li>
CMake: Fix folding of "ElseIf".
<a href="https://github.com/ScintillaOrg/lexilla/issues/77">Issue #77</a>,
<a href="https://github.com/ScintillaOrg/lexilla/pull/78">Pull request #78</a>,
<a href="https://sourceforge.net/p/scintilla/bugs/2213/">Bug #2213</a>.
</li>
<li>
HTML: Fix folding of JavaScript doc comments.
<a href="https://sourceforge.net/p/scintilla/bugs/2219/">Bug #2219</a>.
</li>
<li>
Matlab: add "classdef" and "spmd" to folding keywords.
<a href="https://github.com/ScintillaOrg/lexilla/pull/70">Pull request #70</a>.
</li>
<li>
Matlab: handle "arguments" contextual keyword.
<a href="https://github.com/ScintillaOrg/lexilla/pull/70">Pull request #70</a>.
</li>
<li>
Matlab: improve support of class definition syntax.
<a href="https://github.com/ScintillaOrg/lexilla/pull/75">Pull request #75</a>.
</li>
<li>
Raku: fix escape detection.
<a href="https://github.com/ScintillaOrg/lexilla/pull/76">Pull request #76</a>.
</li>
<li>
Ruby: fix character sequence "?\\#" to not include '#' in SCE_RB_NUMBER as only second '\' is quoted.
<a href="https://github.com/ScintillaOrg/lexilla/issues/69">Issue #69</a>.
</li>
<li>
Ruby: improve styling of ternary expressions as commonly used.
<a href="https://github.com/ScintillaOrg/lexilla/issues/69">Issue #69</a>.
</li>
<li>
VHDL: support folding for VHDL 08 else-generate and case-generate.
<a href="https://github.com/ScintillaOrg/lexilla/pull/80">Pull request #80</a>.
</li>
</ul>
<h3>
<a href="https://www.scintilla.org/lexilla516.zip">Release 5.1.6</a>
</h3>
<ul>
<li>
Released 31 March 2022.
</li>
<li>
Implement conditional statements "if" and "match", comparison function "$(=", and "FileNameExt"
property in TestLexers to allow varying lexer properties over different files.
<a href="https://github.com/ScintillaOrg/lexilla/issues/62">Issue #62</a>.
</li>
<li>
Add LexAccessor::BufferStyleAt to retrieve style values to simplify logic and
improve performance.
<a href="https://github.com/ScintillaOrg/lexilla/issues/54">Issue #54</a>.
</li>
<li>
Markdown: Optionally style all of Markdown header lines.
Enabled with lexer.markdown.header.eolfill=1.
<a href="https://github.com/ScintillaOrg/lexilla/issues/60">Issue #60</a>.
</li>
<li>
Ruby: Fix operator method styling so next word not treated as method name.
<a href="https://github.com/ScintillaOrg/lexilla/issues/65">Issue #65</a>.
</li>
<li>
Ruby: Fix folding for Ruby 3 endless method definition.
<a href="https://github.com/ScintillaOrg/lexilla/issues/65">Issue #65</a>.
</li>
<li>
Ruby: Fold string array SCE_RB_STRING_QW.
<a href="https://github.com/ScintillaOrg/lexilla/issues/65">Issue #65</a>.
</li>
<li>
Ruby: Fix final \n in indented heredoc to be SCE_RB_HERE_Q.
<a href="https://github.com/ScintillaOrg/lexilla/issues/66">Issue #66</a>.
</li>
<li>
Ruby: Fix heredoc recognition when '.' and ',' used in method calls and after SCE_RB_GLOBAL.
Classify word after heredoc delimiter instead of styling as keyword.
<a href="https://github.com/ScintillaOrg/lexilla/issues/67">Issue #67</a>.
</li>
<li>
Ruby: Improve method highlighting so method name is styled as SCE_RB_DEFNAME and class/object
is styled appropriately.
<a href="https://github.com/ScintillaOrg/lexilla/issues/68">Issue #68</a>.
</li>
</ul>
<h3>
<a href="https://www.scintilla.org/lexilla515.zip">Release 5.1.5</a>
</h3>
Expand Down
2 changes: 2 additions & 0 deletions src/lexilla/lexers/LexASY.cxx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Scintilla source code edit control
// @file LexASY.cxx
//Author: instanton (email: soft_share<at>126<dot>com)
// This lexer is for the Asymptote vector graphics language
// https://en.wikipedia.org/wiki/Asymptote_(vector_graphics_language)
// The License.txt file describes the conditions under which this software may be distributed.

#include <stdlib.h>
Expand Down
Loading

0 comments on commit ac25f4b

Please sign in to comment.