aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--License.txt28
-rw-r--r--doc/SciCoding.html2
-rw-r--r--gtk/ScintillaGTK.cxx2
-rw-r--r--lexers/LexBaan.cxx6
-rw-r--r--lexers/LexEDIFACT.cxx4
-rw-r--r--lexers/LexErrorList.cxx2
-rw-r--r--lexers/LexMaxima.cxx18
-rw-r--r--lexers/LexProgress.cxx14
-rw-r--r--lexers/LexVHDL.cxx2
-rw-r--r--qt/README10
-rw-r--r--qt/ScintillaEdit/ScintillaDocument.h2
-rw-r--r--qt/ScintillaEdit/ScintillaEdit.cpp.template10
-rw-r--r--qt/ScintillaEdit/ScintillaEdit.h.template6
-rw-r--r--qt/ScintillaEditPy/README22
-rw-r--r--qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template6
-rw-r--r--src/Decoration.cxx4
-rw-r--r--src/Selection.cxx2
-rw-r--r--src/SparseVector.h2
-rw-r--r--src/SplitVector.h2
-rw-r--r--src/ViewStyle.cxx2
-rw-r--r--test/README4
-rw-r--r--test/unit/Sci.natvis2
-rw-r--r--test/unit/test.mak2
-rw-r--r--test/unit/testCellBuffer.cxx4
-rw-r--r--test/unit/testCharClassify.cxx2
-rw-r--r--test/unit/testWordList.cxx2
-rw-r--r--test/unit/unitTest.cxx2
-rw-r--r--win32/PlatWin.cxx2
28 files changed, 83 insertions, 83 deletions
diff --git a/License.txt b/License.txt
index cbe25b2fc..47c792655 100644
--- a/License.txt
+++ b/License.txt
@@ -2,19 +2,19 @@ License for Scintilla and SciTE
Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-All Rights Reserved
+All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation.
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation.
-NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
-OR PERFORMANCE OF THIS SOFTWARE. \ No newline at end of file
+NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
+OR PERFORMANCE OF THIS SOFTWARE. \ No newline at end of file
diff --git a/doc/SciCoding.html b/doc/SciCoding.html
index 4f7664516..c5debf51a 100644
--- a/doc/SciCoding.html
+++ b/doc/SciCoding.html
@@ -278,7 +278,7 @@
<p>
Properties provided by a new lexer should follow the naming conventions
and should include a comment suitable for showing to end users.
- The convention is for properties that control styling to be named
+ The convention is for properties that control styling to be named
lexer.&lt;lexername&gt;.* and those that control folding to be named
fold.&lt;lexername&gt;.*.
Examples are "lexer.python.literals.binary" and "fold.haskell.imports".
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 6a9af496b..2dc0266fe 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -1563,7 +1563,7 @@ void ScintillaGTK::PrimarySelection(GtkWidget *, GtkSelectionData *selection_dat
}
}
-gboolean ScintillaGTK::PrimaryClear(GtkWidget *widget, GdkEventSelection *event, ScintillaGTK *sciThis) {
+gboolean ScintillaGTK::PrimaryClear(GtkWidget *widget, GdkEventSelection *event, ScintillaGTK *sciThis) {
sciThis->UnclaimSelection(event);
if (GTK_WIDGET_CLASS(sciThis->parentClass)->selection_clear_event) {
return GTK_WIDGET_CLASS(sciThis->parentClass)->selection_clear_event(widget, event);
diff --git a/lexers/LexBaan.cxx b/lexers/LexBaan.cxx
index 1c004528d..fa8b46302 100644
--- a/lexers/LexBaan.cxx
+++ b/lexers/LexBaan.cxx
@@ -142,7 +142,7 @@ static inline int IsAnyOtherIdentifier(char *s, Sci_Position sLength) {
switch (sLength) {
case 8:
if (isalpha(s[0]) && isalpha(s[1]) && isalpha(s[2]) && isalpha(s[3]) && isalpha(s[4]) && IsADigit(s[5]) && IsADigit(s[6]) && IsADigit(s[7])) {
- //^^^^^###
+ //^^^^^###
return(SCE_BAAN_TABLEDEF);
}
break;
@@ -522,7 +522,7 @@ void SCI_METHOD LexerBaan::Lex(Sci_PositionU startPos, Sci_Position length, int
case SCE_BAAN_OPERATOR:
sc.SetState(SCE_BAAN_DEFAULT);
break;
- case SCE_BAAN_NUMBER:
+ case SCE_BAAN_NUMBER:
if (IsASpaceOrTab(sc.ch) || sc.ch == '\r' || sc.ch == '\n' || IsAnOperator(sc.ch)) {
sc.SetState(SCE_BAAN_DEFAULT);
}
@@ -933,7 +933,7 @@ void SCI_METHOD LexerBaan::Fold(Sci_PositionU startPos, Sci_Position length, int
levelCurrent++;
}
else if (nextLineStyle != 0 && currLineStyle != nextLineStyle
- && (priorSectionIsSubSection(lineCurrent -1 ,styler)
+ && (priorSectionIsSubSection(lineCurrent -1 ,styler)
|| !nextSectionIsSubSection(lineCurrent + 1, styler))) {
for (Sci_Position j = styler.LineStart(lineCurrent + 1); j < styler.LineStart(lineCurrent + 1 + 1) - 1; j++) {
if (IsASpaceOrTab(styler[j]))
diff --git a/lexers/LexEDIFACT.cxx b/lexers/LexEDIFACT.cxx
index aafd5c2a9..d03e60a70 100644
--- a/lexers/LexEDIFACT.cxx
+++ b/lexers/LexEDIFACT.cxx
@@ -4,7 +4,7 @@
// and more readably here: https://en.wikipedia.org/wiki/EDIFACT
// This code is subject to the same license terms as the rest of the scintilla project:
// The License.txt file describes the conditions under which this software may be distributed.
-//
+//
// Header order must match order in scripts/HeaderOrder.txt
#include <cstdlib>
@@ -145,7 +145,7 @@ void LexerEDIFACT::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int, IDoc
if (SegmentStyle == SCE_EDI_UNA)
{
posCurrent += 9;
- styler.ColourTo(posCurrent - 1, SCE_EDI_UNA); // UNA
+ styler.ColourTo(posCurrent - 1, SCE_EDI_UNA); // UNA
continue;
}
posSegmentStart = posCurrent;
diff --git a/lexers/LexErrorList.cxx b/lexers/LexErrorList.cxx
index a82d0cf7c..b3dcd2a59 100644
--- a/lexers/LexErrorList.cxx
+++ b/lexers/LexErrorList.cxx
@@ -104,7 +104,7 @@ static int RecogniseErrorListLine(const char *lineBuffer, Sci_PositionU lengthLi
// perl error message:
// <message> at <file> line <line>
return SCE_ERR_PERL;
- } else if ((lengthLine >= 6) &&
+ } else if ((lengthLine >= 6) &&
(memcmp(lineBuffer, " at ", 6) == 0) &&
strstr(lineBuffer, ":line ")) {
// A .NET traceback
diff --git a/lexers/LexMaxima.cxx b/lexers/LexMaxima.cxx
index 08f4a0901..4897c995e 100644
--- a/lexers/LexMaxima.cxx
+++ b/lexers/LexMaxima.cxx
@@ -52,7 +52,7 @@ static void ColouriseMaximaDoc(Sci_PositionU startPos, Sci_Position length, int
!((styler.SafeGetCharAt(i+1) == '*') && (styler.SafeGetCharAt(i) == '/')))
i--;
}
-
+
for (; i < lengthDoc; i++) {
char ch = styler.SafeGetCharAt(i);
char chNext = styler.SafeGetCharAt(i + 1);
@@ -65,7 +65,7 @@ static void ColouriseMaximaDoc(Sci_PositionU startPos, Sci_Position length, int
if((ch == '/') && (chNext == '*'))
{
i++;i++;
-
+
chNext = styler.SafeGetCharAt(i);
for (; i < lengthDoc; i++)
{
@@ -84,7 +84,7 @@ static void ColouriseMaximaDoc(Sci_PositionU startPos, Sci_Position length, int
styler.ColourTo(i, SCE_MAXIMA_COMMENT);
continue;
}
-
+
// Handle Operators
if(isMaximaoperator(ch))
{
@@ -98,7 +98,7 @@ static void ColouriseMaximaDoc(Sci_PositionU startPos, Sci_Position length, int
styler.ColourTo(i, SCE_MAXIMA_COMMANDENDING);
continue;
}
-
+
// Handle numbers. Numbers always begin with a digit.
if(IsASCII(ch) && isdigit(ch))
{
@@ -110,7 +110,7 @@ static void ColouriseMaximaDoc(Sci_PositionU startPos, Sci_Position length, int
if(ch == '.')
continue;
-
+
// A "e" or similar can be followed by a "+" or a "-"
if(((ch == 'e') || (ch == 'b') || (ch == 'g') || (ch == 'f')) &&
((chNext == '+') || (chNext == '-')))
@@ -119,7 +119,7 @@ static void ColouriseMaximaDoc(Sci_PositionU startPos, Sci_Position length, int
chNext = styler.SafeGetCharAt(i + 1);
continue;
}
-
+
if(!IsASCII(ch) || !(isdigit(ch) || islower(ch) || isupper(ch)))
{
i--;
@@ -149,7 +149,7 @@ static void ColouriseMaximaDoc(Sci_PositionU startPos, Sci_Position length, int
styler.ColourTo(i, SCE_MAXIMA_STRING);
continue;
}
-
+
// Handle keywords. Maxima treats Non-ASCII chars as ordinary letters.
if(((!IsASCII(ch))) || isalpha(ch) || (ch == '_'))
{
@@ -194,7 +194,7 @@ static void ColouriseMaximaDoc(Sci_PositionU startPos, Sci_Position length, int
styler.ColourTo(i, SCE_MAXIMA_COMMAND);
continue;
}
-
+
// All other keywords are functions if they are followed
// by an opening parenthesis
char nextNonwhitespace = ' ';
@@ -214,7 +214,7 @@ static void ColouriseMaximaDoc(Sci_PositionU startPos, Sci_Position length, int
}
continue;
}
-
+
styler.ColourTo(i-1, SCE_MAXIMA_UNKNOWN);
}
}
diff --git a/lexers/LexProgress.cxx b/lexers/LexProgress.cxx
index 5bc8c76eb..0d27fdcdb 100644
--- a/lexers/LexProgress.cxx
+++ b/lexers/LexProgress.cxx
@@ -11,7 +11,7 @@
SpeedScript support in html lexer
Differentiate between labels and variables
Option 1: By symbols table
- Option 2: As a single unidentified symbol in a sytactical line
+ Option 2: As a single unidentified symbol in a sytactical line
**/
@@ -74,7 +74,7 @@ namespace {
bool IsStreamCommentStyle(int style) {
return style == SCE_ABL_COMMENT;
- // style == SCE_ABL_LINECOMMENT; Only block comments are used for folding
+ // style == SCE_ABL_LINECOMMENT; Only block comments are used for folding
}
// Options used for LexerABL
@@ -160,7 +160,7 @@ public:
return osABL.DescribeProperty(name);
}
Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override ;
-
+
const char * SCI_METHOD DescribeWordListSets() override {
return osABL.DescribeWordListSets();
}
@@ -236,7 +236,7 @@ void SCI_METHOD LexerABL::Lex(Sci_PositionU startPos, Sci_Position length, int i
continuationLine = styler.SafeGetCharAt(endLinePrevious-1) == '~';
}
}
- }
+ }
// Look back to set variables that are actually invisible secondary states. The reason to avoid formal states is to cut down on state's bits
if (startPos > 0) {
@@ -254,9 +254,9 @@ void SCI_METHOD LexerABL::Lex(Sci_PositionU startPos, Sci_Position length, int i
ch = styler.SafeGetCharAt(back);
styler.Flush(); // looking at styles so need to flush
st = styler.StyleAt(back);
-
+
chPrev = styler.SafeGetCharAt(back-1);
- // isSentenceStart is a non-visible state, used to identify where statements and preprocessor declerations can start
+ // isSentenceStart is a non-visible state, used to identify where statements and preprocessor declerations can start
if (checkIsSentenceStart && st != SCE_ABL_COMMENT && st != SCE_ABL_LINECOMMENT && st != SCE_ABL_CHARACTER && st != SCE_ABL_STRING ) {
chPrev_1 = styler.SafeGetCharAt(back-2);
chPrev_2 = styler.SafeGetCharAt(back-3);
@@ -287,7 +287,7 @@ void SCI_METHOD LexerABL::Lex(Sci_PositionU startPos, Sci_Position length, int i
// eat the '*' so we don't miscount a /* if we see */*/
--back;
}
- }
+ }
--back;
}
}
diff --git a/lexers/LexVHDL.cxx b/lexers/LexVHDL.cxx
index de87d2792..92b18269b 100644
--- a/lexers/LexVHDL.cxx
+++ b/lexers/LexVHDL.cxx
@@ -167,7 +167,7 @@ static void ColouriseVHDLDoc(
sc.SetState(SCE_VHDL_OPERATOR);
}
}
-
+
if (advance)
sc.Forward();
}
diff --git a/qt/README b/qt/README
index 040795724..3ad22e5d8 100644
--- a/qt/README
+++ b/qt/README
@@ -3,7 +3,7 @@ README for building of Scintilla on Qt
There are three different Scintilla libraries that can be produced:
ScintillaEditBase
-A basic widget callable from C++ which is small and can be used just as is
+A basic widget callable from C++ which is small and can be used just as is
or with higher level functionality added.
ScintillaEdit
@@ -16,7 +16,7 @@ A Python callable version of ScintillaEdit using the PySide bindings.
Building a library
ScintillaEditBase can be built without performing any generation steps.
-The ScintillaEditBase/ScintillaEditBase.pro project can be loaded into
+The ScintillaEditBase/ScintillaEditBase.pro project can be loaded into
Qt Creator and the "Build All" command performed.
Alternatively, run "qmake" to build make files and then use the platform
make to build. Most commonly, use "make" on Unix and "nmake"
@@ -24,15 +24,15 @@ on Windows.
On Linux, qmake may be called qmake-qt5 or qmake-qt4.
-ScintillaEdit requires a generation command be run first. From the
+ScintillaEdit requires a generation command be run first. From the
ScintillaEdit directory:
python WidgetGen.py
After the generation command has run, the ScintillaEdit.h and
ScintillaEdit.cpp files will have been populated with the Scintilla API
-methods.
+methods.
To build, use Qt Creator or qmake and make as for ScintillaEditBase.
-ScintillaEditPy is more complex and instructions are found in
+ScintillaEditPy is more complex and instructions are found in
ScintillaEditPy/README.
diff --git a/qt/ScintillaEdit/ScintillaDocument.h b/qt/ScintillaEdit/ScintillaDocument.h
index 1226fbef5..fb0acb1cf 100644
--- a/qt/ScintillaEdit/ScintillaDocument.h
+++ b/qt/ScintillaEdit/ScintillaDocument.h
@@ -84,7 +84,7 @@ signals:
void style_needed(int pos);
void lexer_changed();
void error_occurred(int status);
-
+
friend class ::WatcherHelper;
};
diff --git a/qt/ScintillaEdit/ScintillaEdit.cpp.template b/qt/ScintillaEdit/ScintillaEdit.cpp.template
index bf5895342..9fb18fd4e 100644
--- a/qt/ScintillaEdit/ScintillaEdit.cpp.template
+++ b/qt/ScintillaEdit/ScintillaEdit.cpp.template
@@ -57,25 +57,25 @@ void ScintillaEdit::set_doc(ScintillaDocument *pdoc_) {
send(SCI_SETDOCPOINTER, 0, (sptr_t)(pdoc_->pointer()));
}
-long ScintillaEdit::format_range(bool draw, QPaintDevice* target, QPaintDevice* measure,
+long ScintillaEdit::format_range(bool draw, QPaintDevice* target, QPaintDevice* measure,
const QRect& print_rect, const QRect& page_rect,
long range_start, long range_end)
{
Sci_RangeToFormat to_format;
-
+
to_format.hdc = target;
to_format.hdcTarget = measure;
-
+
to_format.rc.left = print_rect.left();
to_format.rc.top = print_rect.top();
to_format.rc.right = print_rect.right();
to_format.rc.bottom = print_rect.bottom();
-
+
to_format.rcPage.left = page_rect.left();
to_format.rcPage.top = page_rect.top();
to_format.rcPage.right = page_rect.right();
to_format.rcPage.bottom = page_rect.bottom();
-
+
to_format.chrg.cpMin = range_start;
to_format.chrg.cpMax = range_end;
diff --git a/qt/ScintillaEdit/ScintillaEdit.h.template b/qt/ScintillaEdit/ScintillaEdit.h.template
index d9853eb1a..875f2bee8 100644
--- a/qt/ScintillaEdit/ScintillaEdit.h.template
+++ b/qt/ScintillaEdit/ScintillaEdit.h.template
@@ -48,14 +48,14 @@ public:
}
// Exposing the FORMATRANGE api with both underscore & qt style names
- long format_range(bool draw, QPaintDevice* target, QPaintDevice* measure,
+ long format_range(bool draw, QPaintDevice* target, QPaintDevice* measure,
const QRect& print_rect, const QRect& page_rect,
long range_start, long range_end);
- long formatRange(bool draw, QPaintDevice* target, QPaintDevice* measure,
+ long formatRange(bool draw, QPaintDevice* target, QPaintDevice* measure,
const QRect& print_rect, const QRect& page_rect,
long range_start, long range_end) {
return format_range(draw, target, measure, print_rect, page_rect,
- range_start, range_end);
+ range_start, range_end);
}
/* ++Autogenerated -- start of section automatically generated from Scintilla.iface */
diff --git a/qt/ScintillaEditPy/README b/qt/ScintillaEditPy/README
index a9f4fbef1..d0c653d20 100644
--- a/qt/ScintillaEditPy/README
+++ b/qt/ScintillaEditPy/README
@@ -4,7 +4,7 @@ This directory is for building a Python encapsulation of Scintilla for use
with PySide. For C++ libraries see the README in the parent directory.
Prerequisites
-
+
PySide and ScintillaEditPy currently only support Python 2.x.
CMake may be used to rebuild PySide and is required on Windows.
@@ -30,16 +30,16 @@ The qmake program may be called qmake-qt5 or qmake-qt4.
It can be found with:
which qmake-qt5 || which qmake-qt4 || which qmake
-On Windows, the PySide library packages can be downloaded from
+On Windows, the PySide library packages can be downloaded from
http://developer.qt.nokia.com/wiki/PySide_Binaries_Windows
-The PySide development files must be built from source using CMake as
+The PySide development files must be built from source using CMake as
described on the PySide site. This will create a Unix-style set of [bin, include,
-lib, and share] directories in packaging\setuptools\install-py<ver>-qt<qver>.
+lib, and share] directories in packaging\setuptools\install-py<ver>-qt<qver>.
There is no standard place for the PySide development files so copy them
to "\usr", creating it if needed.
On OS X, a combined package with PySide libraries and PySide development
-files can be downloaded from
+files can be downloaded from
http://developer.qt.nokia.com/wiki/PySide_Binaries_MacOSX
This package works best in combination with the Qt libraries for Mac from
http://qt.nokia.com/downloads/downloads#qt-lib
@@ -54,21 +54,21 @@ script which is run:
python sepbuild.py
-This script first runs the WidgetGen.py script to fill out the ScintillaEdit.h,
+This script first runs the WidgetGen.py script to fill out the ScintillaEdit.h,
ScintillaEdit.cpp and ScintillaConstants.py files.
-A short file "sepbuild.pri" is written out which contains a series of version and
+A short file "sepbuild.pri" is written out which contains a series of version and
path properties discovered by sepbuild.py which are used by qmake.
Then it runs PySide's "shiboken" program to create C++ code that will act as a
-bridge between Python and the C++ libraries. This code goes into the
+bridge between Python and the C++ libraries. This code goes into the
ScintillaEditPy/ScintillaEditPy directory. Several log files are produced which can
help uncover problems in the bridge if it fails to build.
The qmake program is run to produce make files from ScintillaEditPy.pro.
The system make program is then run to build the library. The library is located in
-the scintilla/bin directory as ScintillaEditPy.so for Unix systems and
+the scintilla/bin directory as ScintillaEditPy.so for Unix systems and
ScintillaEditPy.pyd for Windows.
A demonstration program can be run:
@@ -76,12 +76,12 @@ A demonstration program can be run:
python testsepq.py
The individual steps in the script can be run manually if wanted although the
-shiboken program has complex arguments and differs between systems so run
+shiboken program has complex arguments and differs between systems so run
sepbuild.py and copy the section starting with a line containing "generatorrunner"
and continuing to "typesystem_ScintillaEdit.xml".
On Windows, it is more difficult to set up an environment to debug ScintillaEditPy
-since all the libraries have to be debug or all have to be release. The easy path
+since all the libraries have to be debug or all have to be release. The easy path
is to always build for release with "nmake release".
To remove generated code, run "python sepbuild.py --clean".
diff --git a/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template b/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template
index f9f166e56..f7196a274 100644
--- a/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template
+++ b/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template
@@ -11,9 +11,9 @@
<object-type name="ScintillaEdit">
<!-- ++Autogenerated start of section automatically generated from Scintilla.iface -->
<!-- ~~Autogenerated end of section automatically generated from Scintilla.iface -->
-
- <!-- Custom implementation of get and set_margin_mask_n: mask is defined
- as an int but is really a bitfield and the numeric value can be
+
+ <!-- Custom implementation of get and set_margin_mask_n: mask is defined
+ as an int but is really a bitfield and the numeric value can be
greater than max value of an int -->
<modify-function signature="set_margin_mask_n(sptr_t, sptr_t)">
<inject-code>
diff --git a/src/Decoration.cxx b/src/Decoration.cxx
index 09d8a8062..3aaeeea03 100644
--- a/src/Decoration.cxx
+++ b/src/Decoration.cxx
@@ -59,11 +59,11 @@ Decoration *DecorationList::Create(int indicator, Sci::Position length) {
decoNew->rs.InsertSpace(0, length);
std::vector<std::unique_ptr<Decoration>>::iterator it = std::lower_bound(
- decorationList.begin(), decorationList.end(), decoNew,
+ decorationList.begin(), decorationList.end(), decoNew,
[](const std::unique_ptr<Decoration> &a, const std::unique_ptr<Decoration> &b) {
return a->Indicator() < b->Indicator();
});
- std::vector<std::unique_ptr<Decoration>>::iterator itAdded =
+ std::vector<std::unique_ptr<Decoration>>::iterator itAdded =
decorationList.insert(it, std::move(decoNew));
SetView();
diff --git a/src/Selection.cxx b/src/Selection.cxx
index a45adcf51..f6e4bdad0 100644
--- a/src/Selection.cxx
+++ b/src/Selection.cxx
@@ -296,7 +296,7 @@ void Selection::MovePositions(bool insertion, Sci::Position startChange, Sci::Po
}
if (selType == selRectangle) {
rangeRectangular.MoveForInsertDelete(insertion, startChange, length);
- }
+ }
}
void Selection::TrimSelection(SelectionRange range) {
diff --git a/src/SparseVector.h b/src/SparseVector.h
index 4e28996fc..867409895 100644
--- a/src/SparseVector.h
+++ b/src/SparseVector.h
@@ -126,7 +126,7 @@ public:
ClearValue(partition);
starts->RemovePartition(partition);
values->Delete(partition);
- // Its the previous partition now that gets smaller
+ // Its the previous partition now that gets smaller
partition--;
}
}
diff --git a/src/SplitVector.h b/src/SplitVector.h
index 8c533d357..16dec6e98 100644
--- a/src/SplitVector.h
+++ b/src/SplitVector.h
@@ -78,7 +78,7 @@ public:
ptrdiff_t GetGrowSize() const {
return growSize;
}
-
+
void SetGrowSize(ptrdiff_t growSize_) {
growSize = growSize_;
}
diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx
index 63a866b37..f8653605b 100644
--- a/src/ViewStyle.cxx
+++ b/src/ViewStyle.cxx
@@ -317,7 +317,7 @@ void ViewStyle::Refresh(Surface &surface, int tabInChars) {
for (Style &style : styles) {
style.extraFontFlag = extraFontFlag;
}
-
+
// Create a FontRealised object for each unique font in the styles.
CreateAndAddFont(styles[STYLE_DEFAULT]);
for (const Style &style : styles) {
diff --git a/test/README b/test/README
index f62f17851..53bfb7caa 100644
--- a/test/README
+++ b/test/README
@@ -10,8 +10,8 @@ pythonw xite.py
To run the basic tests:
python simpleTests.py
-There are some lexing tests with simple input files in several languages in the examples
-subdirectory and their expected lexed states in *.styled where the start of each style
+There are some lexing tests with simple input files in several languages in the examples
+subdirectory and their expected lexed states in *.styled where the start of each style
is marked with {styleNumber}, for example:
{15}<%@{16}language=javas{15}%>{0}
diff --git a/test/unit/Sci.natvis b/test/unit/Sci.natvis
index 562dd7ae3..0646036ba 100644
--- a/test/unit/Sci.natvis
+++ b/test/unit/Sci.natvis
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
<Type Name="SplitVector&lt;*&gt;">
<DisplayString>{{size = {lengthBody}}}</DisplayString>
diff --git a/test/unit/test.mak b/test/unit/test.mak
index d79aff8b3..f7adc7396 100644
--- a/test/unit/test.mak
+++ b/test/unit/test.mak
@@ -17,7 +17,7 @@ TESTEDSRC=\
../../src/CharClassify.cxx \
../../src/ContractionState.cxx \
../../src/Decoration.cxx \
- ../../src/RunStyles.cxx
+ ../../src/RunStyles.cxx
TESTS=$(EXE)
diff --git a/test/unit/testCellBuffer.cxx b/test/unit/testCellBuffer.cxx
index 0efe35014..d99214481 100644
--- a/test/unit/testCellBuffer.cxx
+++ b/test/unit/testCellBuffer.cxx
@@ -26,7 +26,7 @@ TEST_CASE("CellBuffer") {
const Sci::Position sLength = static_cast<Sci::Position>(strlen(sText));
CellBuffer cb(true);
-
+
SECTION("InsertOneLine") {
bool startSequence = false;
const char *cpChange = cb.InsertString(0, sText, static_cast<int>(sLength), startSequence);
@@ -119,7 +119,7 @@ TEST_CASE("CellBuffer") {
REQUIRE(memcmp(cb.BufferPointer(), sTextAfterDeletion, strlen(sTextAfterDeletion)) == 0);
REQUIRE(cb.CanUndo());
REQUIRE(!cb.CanRedo());
-
+
cb.DeleteUndoHistory();
REQUIRE(!cb.CanUndo());
REQUIRE(!cb.CanRedo());
diff --git a/test/unit/testCharClassify.cxx b/test/unit/testCharClassify.cxx
index ce034e9d4..4a695588b 100644
--- a/test/unit/testCharClassify.cxx
+++ b/test/unit/testCharClassify.cxx
@@ -17,7 +17,7 @@ using namespace Scintilla;
// Test CharClassify.
class CharClassifyTest {
- // Avoid warnings, deleted so never called.
+ // Avoid warnings, deleted so never called.
CharClassifyTest(const CharClassifyTest &) = delete;
protected:
CharClassifyTest() {
diff --git a/test/unit/testWordList.cxx b/test/unit/testWordList.cxx
index 22025d6e5..4d7805d1e 100644
--- a/test/unit/testWordList.cxx
+++ b/test/unit/testWordList.cxx
@@ -56,7 +56,7 @@ TEST_CASE("WordList") {
REQUIRE(wl.InListAbridged("w..active", '~'));
REQUIRE(!wl.InListAbridged("w.active", '~'));
REQUIRE(!wl.InListAbridged("w.x.closed", '~'));
-
+
REQUIRE(wl.InListAbridged("book", '~'));
REQUIRE(wl.InListAbridged("bok", '~'));
REQUIRE(!wl.InListAbridged("bk", '~'));
diff --git a/test/unit/unitTest.cxx b/test/unit/unitTest.cxx
index 254f2ada6..762f202bc 100644
--- a/test/unit/unitTest.cxx
+++ b/test/unit/unitTest.cxx
@@ -40,7 +40,7 @@
#if defined(__GNUC__)
// Want to avoid misleading indentation warnings in catch.hpp but the pragma
-// may not be available so protect by turning off pragma warnings
+// may not be available so protect by turning off pragma warnings
#pragma GCC diagnostic ignored "-Wunknown-pragmas"
#pragma GCC diagnostic ignored "-Wpragmas"
#pragma GCC diagnostic ignored "-Wmisleading-indentation"
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx
index 3c0d44f6b..9e89e2f84 100644
--- a/win32/PlatWin.cxx
+++ b/win32/PlatWin.cxx
@@ -1283,7 +1283,7 @@ static int Delta(int difference) {
return 0;
}
-// Round to integer, with halfway cases rounding down.
+// Round to integer, with halfway cases rounding down.
static float RoundFloat(float f) {
return std::floor(f+0.5f);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-11 18:28:45 +0000