aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2021-08-24 11:39:57 +1000
committerNeil <nyamatongwe@gmail.com>2021-08-24 11:39:57 +1000
commitdc0398d650e75efe9641f0c48d630f2c2027281a (patch)
tree83819a98c36c4b1c6a011d9524e26eb5b87da3d3
parentf756e89f53b407432c7db7c4134bfdb8af94d964 (diff)
downloadscintilla-mirror-dc0398d650e75efe9641f0c48d630f2c2027281a.tar.gz
Remove line end white space.
-rw-r--r--cocoa/ScintillaTest/AppController.mm50
-rw-r--r--doc/Scintilla5Migration.html8
-rw-r--r--doc/ScintillaDoc.html14
-rw-r--r--scripts/CheckMentioned.py2
-rwxr-xr-xscripts/HFacer.py2
-rw-r--r--scripts/LexGen.py4
-rw-r--r--src/CallTip.cxx2
-rw-r--r--src/CellBuffer.cxx2
-rw-r--r--src/Document.cxx2
-rw-r--r--src/EditView.cxx4
-rw-r--r--src/Geometry.h8
-rw-r--r--src/Indicator.cxx4
-rw-r--r--src/UniConversion.h2
-rw-r--r--src/ViewStyle.h2
-rw-r--r--test/simpleTests.py18
-rw-r--r--test/unit/testCellBuffer.cxx4
-rw-r--r--test/unit/testDocument.cxx4
-rw-r--r--test/win32Tests.py2
-rw-r--r--win32/ScintillaWin.cxx2
19 files changed, 68 insertions, 68 deletions
diff --git a/cocoa/ScintillaTest/AppController.mm b/cocoa/ScintillaTest/AppController.mm
index 97c75945f..c835ba0de 100644
--- a/cocoa/ScintillaTest/AppController.mm
+++ b/cocoa/ScintillaTest/AppController.mm
@@ -64,20 +64,20 @@ const char user_keywords[] = // Definition of own keywords, not used by MySQL.
NSRect newFrame = mEditHost.frame;
newFrame.size.width -= 2 * newFrame.origin.x;
newFrame.size.height -= 3 * newFrame.origin.y;
-
+
mEditor = [[[ScintillaView alloc] initWithFrame: newFrame] autorelease];
-
+
[mEditHost.contentView addSubview: mEditor];
[mEditor setAutoresizesSubviews: YES];
[mEditor setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
-
+
// Let's load some text for the editor, as initial content.
NSString *sql = [self exampleText];
[mEditor setString: sql];
[self setupEditor];
-
+
sciExtra = nil;
}
@@ -94,7 +94,7 @@ const char user_keywords[] = // Definition of own keywords, not used by MySQL.
if (error && [[error domain] isEqual: NSCocoaErrorDomain])
NSLog(@"%@", error);
-
+
return sql;
}
@@ -104,7 +104,7 @@ const char user_keywords[] = // Definition of own keywords, not used by MySQL.
* Initialize scintilla editor (styles, colors, markers, folding etc.].
*/
- (void) setupEditor
-{
+{
// Lexer type is MySQL.
void *lexillaDL = dlopen(LEXILLA_LIB LEXILLA_EXTENSION, RTLD_LAZY);
if (lexillaDL) {
@@ -128,29 +128,29 @@ const char user_keywords[] = // Definition of own keywords, not used by MySQL.
[mEditor setReferenceProperty: SCI_SETKEYWORDS parameter: 5 value: procedure_keywords];
[mEditor setReferenceProperty: SCI_SETKEYWORDS parameter: 6 value: client_keywords];
[mEditor setReferenceProperty: SCI_SETKEYWORDS parameter: 7 value: user_keywords];
-
+
// Colors and styles for various syntactic elements. First the default style.
[mEditor setStringProperty: SCI_STYLESETFONT parameter: STYLE_DEFAULT value: @"Helvetica"];
// [mEditor setStringProperty: SCI_STYLESETFONT parameter: STYLE_DEFAULT value: @"Monospac821 BT"]; // Very pleasing programmer's font.
[mEditor setGeneralProperty: SCI_STYLESETSIZE parameter: STYLE_DEFAULT value: 14];
[mEditor setColorProperty: SCI_STYLESETFORE parameter: STYLE_DEFAULT value: [NSColor blackColor]];
- [mEditor setGeneralProperty: SCI_STYLECLEARALL parameter: 0 value: 0];
-
+ [mEditor setGeneralProperty: SCI_STYLECLEARALL parameter: 0 value: 0];
+
[mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_DEFAULT value: [NSColor blackColor]];
[mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_COMMENT fromHTML: @"#097BF7"];
[mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_COMMENTLINE fromHTML: @"#097BF7"];
[mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_HIDDENCOMMAND fromHTML: @"#097BF7"];
[mEditor setColorProperty: SCI_STYLESETBACK parameter: SCE_MYSQL_HIDDENCOMMAND fromHTML: @"#F0F0F0"];
-
+
[mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_VARIABLE fromHTML: @"378EA5"];
[mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_SYSTEMVARIABLE fromHTML: @"378EA5"];
[mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_KNOWNSYSTEMVARIABLE fromHTML: @"#3A37A5"];
-
+
[mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_NUMBER fromHTML: @"#7F7F00"];
[mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_SQSTRING fromHTML: @"#FFAA3E"];
-
- // Note: if we were using ANSI quotes we would set the DQSTRING to the same color as the
+
+ // Note: if we were using ANSI quotes we would set the DQSTRING to the same color as the
// the back tick string.
[mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_DQSTRING fromHTML: @"#274A6D"];
@@ -164,31 +164,31 @@ const char user_keywords[] = // Definition of own keywords, not used by MySQL.
[mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_USER1 fromHTML: @"#808080"];
[mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_USER2 fromHTML: @"#808080"];
[mEditor setColorProperty: SCI_STYLESETBACK parameter: SCE_MYSQL_USER2 fromHTML: @"#F0E0E0"];
-
+
// The following 3 styles have no impact as we did not set a keyword list for any of them.
[mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_DATABASEOBJECT value: [NSColor redColor]];
[mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_FUNCTION value: [NSColor redColor]];
-
+
[mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_IDENTIFIER value: [NSColor blackColor]];
[mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_QUOTEDIDENTIFIER fromHTML: @"#274A6D"];
[mEditor setGeneralProperty: SCI_STYLESETBOLD parameter: SCE_SQL_OPERATOR value: 1];
-
+
// Line number style.
[mEditor setColorProperty: SCI_STYLESETFORE parameter: STYLE_LINENUMBER fromHTML: @"#F0F0F0"];
[mEditor setColorProperty: SCI_STYLESETBACK parameter: STYLE_LINENUMBER fromHTML: @"#808080"];
-
+
[mEditor setGeneralProperty: SCI_SETMARGINTYPEN parameter: 0 value: SC_MARGIN_NUMBER];
[mEditor setGeneralProperty: SCI_SETMARGINWIDTHN parameter: 0 value: 35];
-
+
// Markers.
[mEditor setGeneralProperty: SCI_SETMARGINWIDTHN parameter: 1 value: 16];
-
+
// Some special lexer properties.
[mEditor setLexerProperty: @"fold" value: @"1"];
[mEditor setLexerProperty: @"fold.compact" value: @"0"];
[mEditor setLexerProperty: @"fold.comment" value: @"1"];
[mEditor setLexerProperty: @"fold.preprocessor" value: @"1"];
-
+
// Folder setup.
[mEditor setGeneralProperty: SCI_SETMARGINWIDTHN parameter: 2 value: 16];
[mEditor setGeneralProperty: SCI_SETMARGINMASKN parameter: 2 value: SC_MASK_FOLDERS];
@@ -206,19 +206,19 @@ const char user_keywords[] = // Definition of own keywords, not used by MySQL.
[mEditor setColorProperty: SCI_MARKERSETFORE parameter: n value: [NSColor whiteColor]];
[mEditor setColorProperty: SCI_MARKERSETBACK parameter: n value: [NSColor blackColor]];
}
-
+
// Init markers & indicators for highlighting of syntax errors.
[mEditor setColorProperty: SCI_INDICSETFORE parameter: 0 value: [NSColor redColor]];
[mEditor setGeneralProperty: SCI_INDICSETUNDER parameter: 0 value: 1];
[mEditor setGeneralProperty: SCI_INDICSETSTYLE parameter: 0 value: INDIC_SQUIGGLE];
-
+
[mEditor setColorProperty: SCI_MARKERSETBACK parameter: 0 fromHTML: @"#B1151C"];
-
+
[mEditor setColorProperty: SCI_SETSELBACK parameter: 1 value: [NSColor selectedTextBackgroundColor]];
-
+
// Uncomment if you wanna see auto wrapping in action.
//[mEditor setGeneralProperty: SCI_SETWRAPMODE parameter: SC_WRAP_WORD value: 0];
-
+
InfoBar* infoBar = [[[InfoBar alloc] initWithFrame: NSMakeRect(0, 0, 400, 0)] autorelease];
[infoBar setDisplay: IBShowAll];
[mEditor setInfoBar: infoBar top: NO];
diff --git a/doc/Scintilla5Migration.html b/doc/Scintilla5Migration.html
index 3f8b916ee..6b09f288f 100644
--- a/doc/Scintilla5Migration.html
+++ b/doc/Scintilla5Migration.html
@@ -101,15 +101,15 @@
<h2>From C++: LexillaAccess</h2>
<p>The easiest technique is to implement in C++ using LexillaAccess and load a Lexilla shared library.</p>
-
+
<p>LexillaAccess simplifies use of Lexilla, hides operating system differences, and allows loading
multiple libraries that support the Lexilla protocol.
It is defined in lexilla/access/LexillaAccess.h and the source code is in lexilla/access/LexillaAccess.cxx.
Add these to the build dependencies of the project or build file.</p>
-
+
<p>Both SciTE and TestLexers (used to test Lexilla) in lexilla/test use LexillaAccess.
TestLexers is much simpler than SciTE so can be a good example to examine.</p>
-
+
<h3>Building</h3>
<p>Header files for lexers and for using Lexilla will be included so build files will need to reference these new locations.
@@ -169,7 +169,7 @@
for a sufficiently motivated developer to call methods on the lexer from C.</p>
<p>There is an example for using Lexilla from C in examples/CheckLexilla.</p>
-
+
<h3>Steps in code</h3>
<p>Include the system header for loading shared objects.
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 01f65cbd1..e39ff9d30 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -313,7 +313,7 @@
As the protocol only supports object lexers, an additional function <code>CreateLexer(const char *name)</code>
is exposed which will create a lexer object (ILexer5 *) for any object lexer or function lexer.
</p>
-
+
<p>Lexer libraries that provide the same functions as Lexilla may provide lexers for use by Scintilla,
augmenting or replacing those provided by Lexilla.</p>
@@ -3337,14 +3337,14 @@ struct Sci_TextToFind {
<b id="SCI_GETELEMENTALLOWSTRANSLUCENT">SCI_GETELEMENTALLOWSTRANSLUCENT(int element) &rarr; bool</b><br />
Returns true when the element currently allows translucent drawing when an alpha component is included.
This may change based on circumstances - different platforms or graphics technologies may implement translucency
- and newer versions of Scintilla may implement translucency for elements that did not previously support it.
+ and newer versions of Scintilla may implement translucency for elements that did not previously support it.
</p>
-
+
<p>
<b id="SCI_GETELEMENTBASECOLOUR">SCI_GETELEMENTBASECOLOUR(int element) &rarr; colouralpha</b><br />
Returns the default colour of an element.
This may be a value defined by Scintilla or it may be derived from the operating system or platform.
- Which values are set from the operating system may differ between operating systems and operating system versions.
+ Which values are set from the operating system may differ between operating systems and operating system versions.
When undefined the return value is 0 which is equivalent to completely transparent black.
These colours may be useful when defining styles with similarities such as synthesizing dark
mode styles that use the same colours as the system</p>
@@ -3664,7 +3664,7 @@ struct Sci_TextToFind {
<p><b id="SCI_SETSELALPHA">SCI_SETSELALPHA(<a class="jump" href="#alpha">alpha</a> alpha)</b><br />
<b id="SCI_GETSELALPHA">SCI_GETSELALPHA &rarr; int</b><br />
- These APIs are now discouraged and should be replaced with
+ These APIs are now discouraged and should be replaced with
a combination of setting the layer with SCI_SETSELECTIONLAYER and
setting translucency through the SC_ELEMENT_SELECTION_BACK element.</p>
@@ -5614,7 +5614,7 @@ struct Sci_TextToFind {
<code>INDIC_STRIKE</code>, <code>INDIC_BOX</code>, <code>INDIC_ROUNDBOX</code>, <code>INDIC_STRAIGHTBOX</code>,
<code>INDIC_FULLBOX</code>, <code>INDIC_DASH</code>, <code>INDIC_DOTS</code>, <code>INDIC_SQUIGGLELOW</code>.
</p>
- <p>Fractional pixel widths are possible such as 50 for half a pixel wide.
+ <p>Fractional pixel widths are possible such as 50 for half a pixel wide.
On many systems a half pixel value will appear as a fainter line but it allows drawing very thin lines on systems with multiple physical pixels
per logical pixel.
Half (logical) pixel lines are available on macOS with 'retina' displays,
@@ -9517,7 +9517,7 @@ EM_FORMATRANGE
Any use of these symbols should be removed and replaced with <a href="#Indicators">standard indicators</a>.
<code>SCI_GETSTYLEBITS</code> and <code>SCI_GETSTYLEBITSNEEDED</code> always return 8,
indicating that 8 bits are used for styling and there are 256 styles.</p>
-
+
<p>Discouraged APIs are a step before deprecation. A new preferred API has been implemented that new code should use
but the old API is unlikely to be removed.
Discouraged APIs are marked with a <span class="discouraged">orange strikethrough</span> and their documentation mentions the preferred API.
diff --git a/scripts/CheckMentioned.py b/scripts/CheckMentioned.py
index d2c71dcbe..157acb31e 100644
--- a/scripts/CheckMentioned.py
+++ b/scripts/CheckMentioned.py
@@ -205,7 +205,7 @@ def checkDocumentation():
print(val, "<-", name, ";;", valOfName)
except KeyError:
print("***", val, "<-", name)
-
+
for name in sccToValue.keys():
if name not in ["SCI_OPTIONAL_START", "SCI_LEXER_START"] and name not in docs:
print(f"Unknown {name}")
diff --git a/scripts/HFacer.py b/scripts/HFacer.py
index 0a4f3259c..cc8467b2c 100755
--- a/scripts/HFacer.py
+++ b/scripts/HFacer.py
@@ -49,7 +49,7 @@ def RegenerateAll(root, showMaxID):
#~ except ValueError:
#~ pass
#~ for v in valuesUnused:
- #~ prev = valueToName.get(v-1, "")
+ #~ prev = valueToName.get(v-1, "")
#~ print(v, prev)
if __name__ == "__main__":
diff --git a/scripts/LexGen.py b/scripts/LexGen.py
index a862b6288..fba9f6631 100644
--- a/scripts/LexGen.py
+++ b/scripts/LexGen.py
@@ -3,7 +3,7 @@
# Released to the public domain.
# Update Scintilla files.
-# Update version numbers and modification dates in documentation and header files.
+# Update version numbers and modification dates in documentation and header files.
# Update make dependencies.
# Requires Python 3.6 or later
@@ -58,7 +58,7 @@ def UpdateVersionNumbers(sci, root):
0)
def RegenerateAll(rootDirectory):
-
+
root = pathlib.Path(rootDirectory)
scintillaBase = root.resolve()
diff --git a/src/CallTip.cxx b/src/CallTip.cxx
index 18caddea1..43afead55 100644
--- a/src/CallTip.cxx
+++ b/src/CallTip.cxx
@@ -345,7 +345,7 @@ void CallTip::SetPosition(bool aboveText) noexcept {
}
bool CallTip::UseStyleCallTip() const noexcept {
- return useStyleCallTip;
+ return useStyleCallTip;
}
// It might be better to have two access functions for this and to use
diff --git a/src/CellBuffer.cxx b/src/CellBuffer.cxx
index d94ffaaea..b922b08bb 100644
--- a/src/CellBuffer.cxx
+++ b/src/CellBuffer.cxx
@@ -523,7 +523,7 @@ void UndoHistory::TentativeCommit() {
}
bool UndoHistory::TentativeActive() const noexcept {
- return tentativePoint >= 0;
+ return tentativePoint >= 0;
}
int UndoHistory::TentativeSteps() noexcept {
diff --git a/src/Document.cxx b/src/Document.cxx
index 01949dc5e..657191ee1 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -2081,7 +2081,7 @@ Sci::Position Document::FindText(Sci::Position minPos, Sci::Position maxPos, con
const unsigned char charStartSearch = search[0];
if (forward && ((0 == dbcsCodePage) || (CpUtf8 == dbcsCodePage && !UTF8IsTrailByte(charStartSearch)))) {
// This is a fast case where there is no need to test byte values to iterate
- // so becomes the equivalent of a memchr+memcmp loop.
+ // so becomes the equivalent of a memchr+memcmp loop.
// UTF-8 search will not be self-synchronizing when starts with trail byte
const std::string_view suffix(search + 1, lengthFind - 1);
while (pos < endSearch) {
diff --git a/src/EditView.cxx b/src/EditView.cxx
index 8a303faea..b0b87a9b1 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -1458,7 +1458,7 @@ void EditView::DrawEOLAnnotationText(Surface *surface, const EditModel &model, c
}
}
- // For multi-phase drawing draw the text last as transparent over any box
+ // For multi-phase drawing draw the text last as transparent over any box
if (FlagSet(phase, DrawPhase::text)) {
if (phasesDraw != PhasesDraw::One) {
surface->DrawTextTransparentUTF8(rcText, fontText,
@@ -1603,7 +1603,7 @@ void EditView::DrawCarets(Surface *surface, const EditModel &model, const ViewSt
for (size_t r = 0; (r<model.sel.Count()) || drawDrag; r++) {
const bool mainCaret = r == model.sel.Main();
SelectionPosition posCaret = (drawDrag ? model.posDrag : model.sel.Range(r).caret);
- if ((vsDraw.DrawCaretInsideSelection(model.inOverstrike, imeCaretBlockOverride)) &&
+ if ((vsDraw.DrawCaretInsideSelection(model.inOverstrike, imeCaretBlockOverride)) &&
!drawDrag &&
posCaret > model.sel.Range(r).anchor) {
if (posCaret.VirtualSpace() > 0)
diff --git a/src/Geometry.h b/src/Geometry.h
index 6456af0e8..28241c5a9 100644
--- a/src/Geometry.h
+++ b/src/Geometry.h
@@ -260,7 +260,7 @@ class Stroke {
public:
ColourRGBA colour;
XYPOSITION width;
- constexpr Stroke(ColourRGBA colour_, XYPOSITION width_=1.0) noexcept :
+ constexpr Stroke(ColourRGBA colour_, XYPOSITION width_=1.0) noexcept :
colour(colour_), width(width_) {
}
constexpr float WidthF() const noexcept {
@@ -274,7 +274,7 @@ public:
class Fill {
public:
ColourRGBA colour;
- constexpr Fill(ColourRGBA colour_) noexcept :
+ constexpr Fill(ColourRGBA colour_) noexcept :
colour(colour_) {
}
};
@@ -286,10 +286,10 @@ class FillStroke {
public:
Fill fill;
Stroke stroke;
- constexpr FillStroke(ColourRGBA colourFill_, ColourRGBA colourStroke_, XYPOSITION widthStroke_=1.0) noexcept :
+ constexpr FillStroke(ColourRGBA colourFill_, ColourRGBA colourStroke_, XYPOSITION widthStroke_=1.0) noexcept :
fill(colourFill_), stroke(colourStroke_, widthStroke_) {
}
- constexpr FillStroke(ColourRGBA colourBoth, XYPOSITION widthStroke_=1.0) noexcept :
+ constexpr FillStroke(ColourRGBA colourBoth, XYPOSITION widthStroke_=1.0) noexcept :
fill(colourBoth), stroke(colourBoth, widthStroke_) {
}
};
diff --git a/src/Indicator.cxx b/src/Indicator.cxx
index 0dd9ba7c2..bd02a01d1 100644
--- a/src/Indicator.cxx
+++ b/src/Indicator.cxx
@@ -47,7 +47,7 @@ void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &r
const XYPOSITION ymid = PixelAlign(rc.Centre().y, pixelDivisions);
- // This is a reasonable clip for indicators beneath text like underlines
+ // This is a reasonable clip for indicators beneath text like underlines
PRectangle rcClip = rcAligned;
rcClip.bottom = rcFullHeightAligned.bottom;
@@ -242,7 +242,7 @@ void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &r
const XYPOSITION widthDot = std::round(strokeWidth);
XYPOSITION x = std::floor(rc.left);
while (x < rc.right) {
- const PRectangle rcDot = PRectangle(x, ymid,
+ const PRectangle rcDot = PRectangle(x, ymid,
x + widthDot, ymid + widthDot);
surface->FillRectangle(rcDot, sacDraw.fore);
x += widthDot * 2;
diff --git a/src/UniConversion.h b/src/UniConversion.h
index ead7aae57..95ff2ad43 100644
--- a/src/UniConversion.h
+++ b/src/UniConversion.h
@@ -80,7 +80,7 @@ inline bool UTF8IsNEL(const unsigned char *us) noexcept {
return (us[0] == 0xc2) && (us[1] == 0x85);
}
-// Is the sequence of 3 char a UTF-8 line end? Only the last two char are tested for a NEL.
+// Is the sequence of 3 char a UTF-8 line end? Only the last two char are tested for a NEL.
constexpr bool UTF8IsMultibyteLineEnd(unsigned char ch0, unsigned char ch1, unsigned char ch2) noexcept {
return
((ch0 == 0xe2) && (ch1 == 0x80) && ((ch2 == 0xa8) || (ch2 == 0xa9))) ||
diff --git a/src/ViewStyle.h b/src/ViewStyle.h
index 66a853848..843efc660 100644
--- a/src/ViewStyle.h
+++ b/src/ViewStyle.h
@@ -70,7 +70,7 @@ struct CaretLineAppearance {
};
struct CaretAppearance {
- // Line, block, over-strike bar ...
+ // Line, block, over-strike bar ...
Scintilla::CaretStyle style;
// Width in pixels
int width;
diff --git a/test/simpleTests.py b/test/simpleTests.py
index 2b8b7cdd8..0bf082438 100644
--- a/test/simpleTests.py
+++ b/test/simpleTests.py
@@ -2005,7 +2005,7 @@ class TestElements(unittest.TestCase):
def tearDown(self):
pass
-
+
def ElementColour(self, element):
# & 0xffffffff prevents sign extension issues
return self.ed.GetElementColour(element) & 0xffffffff
@@ -2062,14 +2062,14 @@ class TestElements(unittest.TestCase):
self.assertEquals(self.ed.SelectionLayer, self.ed.SC_LAYER_OVER_TEXT)
self.ed.SelectionLayer = self.ed.SC_LAYER_BASE
self.assertEquals(self.ed.SelectionLayer, self.ed.SC_LAYER_BASE)
-
+
def testCaretLine(self):
# Newer Layer / ElementColour API
self.assertEquals(self.ed.CaretLineLayer, 0)
self.assertFalse(self.ed.GetElementIsSet(self.ed.SC_ELEMENT_CARET_LINE_BACK))
self.assertEquals(self.ed.CaretLineFrame, 0)
self.assertFalse(self.ed.CaretLineVisibleAlways)
-
+
self.ed.CaretLineLayer = 2
self.assertEquals(self.ed.CaretLineLayer, 2)
self.ed.CaretLineFrame = 2
@@ -2078,7 +2078,7 @@ class TestElements(unittest.TestCase):
self.assertTrue(self.ed.CaretLineVisibleAlways)
self.ed.SetElementColour(self.ed.SC_ELEMENT_CARET_LINE_BACK, self.testColourAlpha)
self.assertEquals(self.ElementColour(self.ed.SC_ELEMENT_CARET_LINE_BACK), self.testColourAlpha)
-
+
self.RestoreCaretLine()
def testCaretLineLayerDiscouraged(self):
@@ -2104,13 +2104,13 @@ class TestElements(unittest.TestCase):
backColourTranslucent = backColour | (alpha << 24)
self.assertEquals(self.ElementColour(self.ed.SC_ELEMENT_CARET_LINE_BACK), backColourTranslucent)
self.assertEquals(self.ed.CaretLineLayer, 2)
-
+
self.ed.CaretLineBackAlpha = 0x100
self.assertEquals(self.ed.CaretLineBackAlpha, 0x100)
self.assertEquals(self.ed.CaretLineLayer, 0) # SC_ALPHA_NOALPHA moved to base layer
-
+
self.RestoreCaretLine()
-
+
# Try other orders
self.ed.CaretLineBackAlpha = 0x100
@@ -2135,7 +2135,7 @@ class TestElements(unittest.TestCase):
self.assertFalse(self.ed.GetElementIsSet(self.ed.SC_ELEMENT_HOT_SPOT_ACTIVE_BACK))
self.assertEquals(self.ed.HotspotActiveFore, 0)
self.assertEquals(self.ed.HotspotActiveBack, 0)
-
+
testColour = 0x804020
resetColour = 0x112233 # Doesn't get set
self.ed.SetHotspotActiveFore(1, testColour)
@@ -2146,7 +2146,7 @@ class TestElements(unittest.TestCase):
self.assertEquals(self.ed.HotspotActiveFore, 0)
self.assertFalse(self.ed.GetElementIsSet(self.ed.SC_ELEMENT_HOT_SPOT_ACTIVE))
self.assertEquals(self.ElementColour(self.ed.SC_ELEMENT_HOT_SPOT_ACTIVE), 0)
-
+
translucentColour = 0x50403020
self.ed.SetElementColour(self.ed.SC_ELEMENT_HOT_SPOT_ACTIVE, translucentColour)
self.assertEquals(self.ElementColour(self.ed.SC_ELEMENT_HOT_SPOT_ACTIVE), translucentColour)
diff --git a/test/unit/testCellBuffer.cxx b/test/unit/testCellBuffer.cxx
index b48e44bb9..ef7db099b 100644
--- a/test/unit/testCellBuffer.cxx
+++ b/test/unit/testCellBuffer.cxx
@@ -274,7 +274,7 @@ TEST_CASE("CharacterIndex") {
REQUIRE(cb.IndexLineStart(4, LineCharacterIndexType::Utf32) == 7);
REQUIRE(cb.IndexLineStart(5, LineCharacterIndexType::Utf32) == 7);
- // Insert a valid 3-byte UTF-8 character at start ->
+ // Insert a valid 3-byte UTF-8 character at start ->
// "\xE2\x82\xACa\n\xF0\x90\x8D\x88\nz\n\n" 5 lines
const char *euro = "\xE2\x82\xAC";
@@ -294,7 +294,7 @@ TEST_CASE("CharacterIndex") {
REQUIRE(cb.IndexLineStart(4, LineCharacterIndexType::Utf32) == 8);
REQUIRE(cb.IndexLineStart(5, LineCharacterIndexType::Utf32) == 8);
- // Insert a lone lead byte implying a 3 byte character at start of line 2 ->
+ // Insert a lone lead byte implying a 3 byte character at start of line 2 ->
// "\xE2\x82\xACa\n\EF\xF0\x90\x8D\x88\nz\n\n" 5 lines
// Should be treated as a single byte character
diff --git a/test/unit/testDocument.cxx b/test/unit/testDocument.cxx
index 809647e19..41e3907ae 100644
--- a/test/unit/testDocument.cxx
+++ b/test/unit/testDocument.cxx
@@ -332,7 +332,7 @@ TEST_CASE("Document") {
REQUIRE(location == 2);
location = doc.document.FindText(0, 2, finding932.c_str(), FindOption::None, &lengthFinding);
REQUIRE(location == -1);
- // Can not test case mapping of double byte text as folder available here does not implement this
+ // Can not test case mapping of double byte text as folder available here does not implement this
}
SECTION("GetCharacterAndWidth DBCS") {
@@ -342,7 +342,7 @@ TEST_CASE("Document") {
const Sci::Position length = doc.InsertString(0, "H\x84\xff\x84H", 5);
// This text is invalid in code page 932.
// A reasonable interpretation is as 4 items: 2 characters and 2 character fragments
- // The last item is a 2-byte CYRILLIC CAPITAL LETTER ZE character
+ // The last item is a 2-byte CYRILLIC CAPITAL LETTER ZE character
// H [84] [FF] ZE
REQUIRE(5 == length);
REQUIRE(5 == doc.Length());
diff --git a/test/win32Tests.py b/test/win32Tests.py
index d47ed66db..974f6ceae 100644
--- a/test/win32Tests.py
+++ b/test/win32Tests.py
@@ -113,7 +113,7 @@ class TestWins(unittest.TestCase):
value = self.TextValue()
self.assertEquals(len(value), 3)
self.assertEquals(value, katakanaMiddleDot)
-
+
# This is even less valid Shift-JIS
tu8 = b'[\xff]'
self.SetText(tu8)
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 5a35a659f..c1a4b1372 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -1895,7 +1895,7 @@ sptr_t ScintillaWin::SciMessage(Message iMessage, uptr_t wParam, sptr_t lParam)
case Message::EncodedFromUTF8:
return EncodedFromUTF8(ConstCharPtrFromUPtr(wParam),
CharPtrFromSPtr(lParam));
-
+
default:
break;