From d14d0823ac6bcc019a1b9a9a39a0701d14fb8210 Mon Sep 17 00:00:00 2001 From: zufuliu Date: Thu, 11 Jan 2024 19:18:21 +0800 Subject: [PATCH] Simplify `styler.SetLevel()` calls. --- scintilla/lexers/LexAPDL.cxx | 4 +--- scintilla/lexers/LexAsm.cxx | 4 +--- scintilla/lexers/LexAsymptote.cxx | 4 +--- scintilla/lexers/LexAutoHotkey.cxx | 4 +--- scintilla/lexers/LexAutoIt3.cxx | 4 +--- scintilla/lexers/LexAviSynth.cxx | 4 +--- scintilla/lexers/LexAwk.cxx | 4 +--- scintilla/lexers/LexBash.cxx | 4 +--- scintilla/lexers/LexBatch.cxx | 4 +--- scintilla/lexers/LexCIL.cxx | 4 +--- scintilla/lexers/LexCMake.cxx | 4 +--- scintilla/lexers/LexCPP.cxx | 4 +--- scintilla/lexers/LexCSS.cxx | 4 +--- scintilla/lexers/LexCSharp.cxx | 4 +--- scintilla/lexers/LexConfig.cxx | 4 +--- scintilla/lexers/LexD.cxx | 4 +--- scintilla/lexers/LexDart.cxx | 4 +--- scintilla/lexers/LexFortran.cxx | 4 +--- scintilla/lexers/LexGo.cxx | 4 +--- scintilla/lexers/LexGraphViz.cxx | 4 +--- scintilla/lexers/LexGroovy.cxx | 4 +--- scintilla/lexers/LexHaxe.cxx | 4 +--- scintilla/lexers/LexInno.cxx | 4 +--- scintilla/lexers/LexJSON.cxx | 4 +--- scintilla/lexers/LexJam.cxx | 4 +--- scintilla/lexers/LexJava.cxx | 4 +--- scintilla/lexers/LexJavaScript.cxx | 4 +--- scintilla/lexers/LexJulia.cxx | 4 +--- scintilla/lexers/LexKotlin.cxx | 4 +--- scintilla/lexers/LexLaTeX.cxx | 4 +--- scintilla/lexers/LexLisp.cxx | 4 +--- scintilla/lexers/LexLua.cxx | 4 +--- scintilla/lexers/LexMakefile.cxx | 4 +--- scintilla/lexers/LexMathematica.cxx | 4 +--- scintilla/lexers/LexMatlab.cxx | 4 +--- scintilla/lexers/LexNSIS.cxx | 4 +--- scintilla/lexers/LexPHP.cxx | 4 +--- scintilla/lexers/LexPascal.cxx | 4 +--- scintilla/lexers/LexPerl.cxx | 4 +--- scintilla/lexers/LexPowerShell.cxx | 4 +--- scintilla/lexers/LexProps.cxx | 9 ++------- scintilla/lexers/LexR.cxx | 4 +--- scintilla/lexers/LexRebol.cxx | 4 +--- scintilla/lexers/LexRust.cxx | 4 +--- scintilla/lexers/LexSQL.cxx | 4 +--- scintilla/lexers/LexSmali.cxx | 4 +--- scintilla/lexers/LexSwift.cxx | 4 +--- scintilla/lexers/LexTOML.cxx | 5 +---- scintilla/lexers/LexVB.cxx | 4 +--- scintilla/lexers/LexVHDL.cxx | 4 +--- scintilla/lexers/LexVerilog.cxx | 4 +--- scintilla/lexers/LexVim.cxx | 4 +--- scintilla/lexers/LexWASM.cxx | 4 +--- scintilla/lexers/LexWinHex.cxx | 4 +--- scintilla/lexers/LexZig.cxx | 4 +--- 55 files changed, 56 insertions(+), 170 deletions(-) diff --git a/scintilla/lexers/LexAPDL.cxx b/scintilla/lexers/LexAPDL.cxx index 00265c854f..efbe29d271 100644 --- a/scintilla/lexers/LexAPDL.cxx +++ b/scintilla/lexers/LexAPDL.cxx @@ -245,9 +245,7 @@ void FoldAPDLDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int /*initStyle if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexAsm.cxx b/scintilla/lexers/LexAsm.cxx index 6edce1f4a2..4a0d3129d0 100644 --- a/scintilla/lexers/LexAsm.cxx +++ b/scintilla/lexers/LexAsm.cxx @@ -454,9 +454,7 @@ void FoldAsmDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, Lexe int lev = levelUse | levelNext << 16; if (levelUse < levelNext) lev |= SC_FOLDLEVELHEADERFLAG; - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; levelCurrent = levelNext; styleEOL = style; diff --git a/scintilla/lexers/LexAsymptote.cxx b/scintilla/lexers/LexAsymptote.cxx index d6d0ac182a..08b1bcb4a2 100644 --- a/scintilla/lexers/LexAsymptote.cxx +++ b/scintilla/lexers/LexAsymptote.cxx @@ -316,9 +316,7 @@ void FoldAsyDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, L if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexAutoHotkey.cxx b/scintilla/lexers/LexAutoHotkey.cxx index 8974922921..3ee09870e2 100644 --- a/scintilla/lexers/LexAutoHotkey.cxx +++ b/scintilla/lexers/LexAutoHotkey.cxx @@ -851,9 +851,7 @@ void FoldAHKDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, L if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexAutoIt3.cxx b/scintilla/lexers/LexAutoIt3.cxx index 30269d7025..b75fe446ca 100644 --- a/scintilla/lexers/LexAutoIt3.cxx +++ b/scintilla/lexers/LexAutoIt3.cxx @@ -726,9 +726,7 @@ void FoldAU3Doc(Sci_PositionU startPos, Sci_Position length, int, LexerWordList, if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); // reset values for the next line lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexAviSynth.cxx b/scintilla/lexers/LexAviSynth.cxx index 482e780162..045408ef34 100644 --- a/scintilla/lexers/LexAviSynth.cxx +++ b/scintilla/lexers/LexAviSynth.cxx @@ -332,9 +332,7 @@ void FoldAvsDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, L if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexAwk.cxx b/scintilla/lexers/LexAwk.cxx index 0efd3c9850..f433fcd34b 100644 --- a/scintilla/lexers/LexAwk.cxx +++ b/scintilla/lexers/LexAwk.cxx @@ -463,9 +463,7 @@ void FoldAwkDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int /*initStyle* if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexBash.cxx b/scintilla/lexers/LexBash.cxx index 732fdb6272..80578e5464 100644 --- a/scintilla/lexers/LexBash.cxx +++ b/scintilla/lexers/LexBash.cxx @@ -964,9 +964,7 @@ void FoldBashDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, Lex if ((levelCurrent > levelPrev)) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); lineStartNext = sci::min(lineStartNext, endPos); diff --git a/scintilla/lexers/LexBatch.cxx b/scintilla/lexers/LexBatch.cxx index 747306d6ae..db079cf8ac 100644 --- a/scintilla/lexers/LexBatch.cxx +++ b/scintilla/lexers/LexBatch.cxx @@ -648,9 +648,7 @@ void ColouriseBatchDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initS if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(sc.currentLine)) { - styler.SetLevel(sc.currentLine, lev); - } + styler.SetLevel(sc.currentLine, lev); levelPrev = lev; levelCurrent = levelNext; prev2LineState = prevLineState; diff --git a/scintilla/lexers/LexCIL.cxx b/scintilla/lexers/LexCIL.cxx index 9ecfb000de..6894ba5eff 100644 --- a/scintilla/lexers/LexCIL.cxx +++ b/scintilla/lexers/LexCIL.cxx @@ -210,9 +210,7 @@ void FoldCILDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, Lexe int lev = levelUse | levelNext << 16; if (levelUse < levelNext) lev |= SC_FOLDLEVELHEADERFLAG; - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; levelCurrent = levelNext; } diff --git a/scintilla/lexers/LexCMake.cxx b/scintilla/lexers/LexCMake.cxx index 279d757f06..138f7a7c1f 100644 --- a/scintilla/lexers/LexCMake.cxx +++ b/scintilla/lexers/LexCMake.cxx @@ -406,9 +406,7 @@ void FoldCMakeDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexCPP.cxx b/scintilla/lexers/LexCPP.cxx index 9d536a46a5..ac45e5ce3d 100644 --- a/scintilla/lexers/LexCPP.cxx +++ b/scintilla/lexers/LexCPP.cxx @@ -969,9 +969,7 @@ void FoldCppDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, Lexe int lev = levelUse | levelNext << 16; if (levelUse < levelNext) lev |= SC_FOLDLEVELHEADERFLAG; - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; levelCurrent = levelNext; visibleChars = 0; diff --git a/scintilla/lexers/LexCSS.cxx b/scintilla/lexers/LexCSS.cxx index 6fe5dcd67b..a699272df8 100644 --- a/scintilla/lexers/LexCSS.cxx +++ b/scintilla/lexers/LexCSS.cxx @@ -366,9 +366,7 @@ void ColouriseCssDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSty if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(sc.currentLine)) { - styler.SetLevel(sc.currentLine, lev); - } + styler.SetLevel(sc.currentLine, lev); } const int lineState = (propertyValue & true) | (bracketCount << 1) | (parenCount << 8); diff --git a/scintilla/lexers/LexCSharp.cxx b/scintilla/lexers/LexCSharp.cxx index 89e7262119..38e9263729 100644 --- a/scintilla/lexers/LexCSharp.cxx +++ b/scintilla/lexers/LexCSharp.cxx @@ -902,9 +902,7 @@ void FoldCSharpDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexConfig.cxx b/scintilla/lexers/LexConfig.cxx index 3ec65e80eb..9e4acce50c 100644 --- a/scintilla/lexers/LexConfig.cxx +++ b/scintilla/lexers/LexConfig.cxx @@ -267,9 +267,7 @@ void FoldConfDoc(Sci_PositionU startPos, Sci_Position length, int /*initStyle*/, int lev = levelUse | levelNext << 16; if (levelUse < levelNext) lev |= SC_FOLDLEVELHEADERFLAG; - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; levelCurrent = levelNext; visibleChars = 0; diff --git a/scintilla/lexers/LexD.cxx b/scintilla/lexers/LexD.cxx index b6f8224d67..71a561e41c 100644 --- a/scintilla/lexers/LexD.cxx +++ b/scintilla/lexers/LexD.cxx @@ -757,9 +757,7 @@ void FoldDDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Lex if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexDart.cxx b/scintilla/lexers/LexDart.cxx index 048e4f0f50..6d573cadf8 100644 --- a/scintilla/lexers/LexDart.cxx +++ b/scintilla/lexers/LexDart.cxx @@ -557,9 +557,7 @@ void FoldDartDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexFortran.cxx b/scintilla/lexers/LexFortran.cxx index a041197c87..6e691eaf95 100644 --- a/scintilla/lexers/LexFortran.cxx +++ b/scintilla/lexers/LexFortran.cxx @@ -390,9 +390,7 @@ void FoldFortranDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int /*initSt if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexGo.cxx b/scintilla/lexers/LexGo.cxx index 7f0d4e6d5f..db5a7543fb 100644 --- a/scintilla/lexers/LexGo.cxx +++ b/scintilla/lexers/LexGo.cxx @@ -633,9 +633,7 @@ void FoldGoDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Le if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexGraphViz.cxx b/scintilla/lexers/LexGraphViz.cxx index 095a8685b3..6697979c1f 100644 --- a/scintilla/lexers/LexGraphViz.cxx +++ b/scintilla/lexers/LexGraphViz.cxx @@ -244,9 +244,7 @@ void ColouriseGraphVizDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int in if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(sc.currentLine)) { - styler.SetLevel(sc.currentLine, lev); - } + styler.SetLevel(sc.currentLine, lev); levelCurrent = levelNext; } } diff --git a/scintilla/lexers/LexGroovy.cxx b/scintilla/lexers/LexGroovy.cxx index e25097ef25..7108cc4aaf 100644 --- a/scintilla/lexers/LexGroovy.cxx +++ b/scintilla/lexers/LexGroovy.cxx @@ -670,9 +670,7 @@ void FoldGroovyDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexHaxe.cxx b/scintilla/lexers/LexHaxe.cxx index eb79ee7a4f..704aa57677 100644 --- a/scintilla/lexers/LexHaxe.cxx +++ b/scintilla/lexers/LexHaxe.cxx @@ -494,9 +494,7 @@ void FoldHaxeDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexInno.cxx b/scintilla/lexers/LexInno.cxx index 04d51d10c7..181bad1c06 100644 --- a/scintilla/lexers/LexInno.cxx +++ b/scintilla/lexers/LexInno.cxx @@ -524,9 +524,7 @@ void FoldInnoDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexJSON.cxx b/scintilla/lexers/LexJSON.cxx index a215ce44c3..d603a8907a 100644 --- a/scintilla/lexers/LexJSON.cxx +++ b/scintilla/lexers/LexJSON.cxx @@ -261,9 +261,7 @@ void ColouriseJSONDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSt if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); levelCurrent = levelNext; } lineCurrent++; diff --git a/scintilla/lexers/LexJam.cxx b/scintilla/lexers/LexJam.cxx index 30b05b1167..f4778e5d3c 100644 --- a/scintilla/lexers/LexJam.cxx +++ b/scintilla/lexers/LexJam.cxx @@ -310,9 +310,7 @@ void FoldJamDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, L if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexJava.cxx b/scintilla/lexers/LexJava.cxx index 43fd2b1dd0..522555f588 100644 --- a/scintilla/lexers/LexJava.cxx +++ b/scintilla/lexers/LexJava.cxx @@ -677,9 +677,7 @@ void FoldJavaDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexJavaScript.cxx b/scintilla/lexers/LexJavaScript.cxx index 4b654f08d4..8298c2743b 100644 --- a/scintilla/lexers/LexJavaScript.cxx +++ b/scintilla/lexers/LexJavaScript.cxx @@ -698,9 +698,7 @@ void FoldJsDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Le if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexJulia.cxx b/scintilla/lexers/LexJulia.cxx index 66dcdd7f23..334a54b872 100644 --- a/scintilla/lexers/LexJulia.cxx +++ b/scintilla/lexers/LexJulia.cxx @@ -656,9 +656,7 @@ void FoldJuliaDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexKotlin.cxx b/scintilla/lexers/LexKotlin.cxx index c72802a427..b7a48c594e 100644 --- a/scintilla/lexers/LexKotlin.cxx +++ b/scintilla/lexers/LexKotlin.cxx @@ -481,9 +481,7 @@ void FoldKotlinDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexLaTeX.cxx b/scintilla/lexers/LexLaTeX.cxx index 4bbb645241..a3d631bd61 100644 --- a/scintilla/lexers/LexLaTeX.cxx +++ b/scintilla/lexers/LexLaTeX.cxx @@ -356,9 +356,7 @@ void FoldLatexDoc(Sci_PositionU startPos, Sci_Position length, int /*initStyle*/ int lev = levelUse | levelNext << 16; if (levelUse < levelNext) lev |= SC_FOLDLEVELHEADERFLAG; - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; levelCurrent = levelNext; } diff --git a/scintilla/lexers/LexLisp.cxx b/scintilla/lexers/LexLisp.cxx index 8faf3e9b24..8888a24afa 100644 --- a/scintilla/lexers/LexLisp.cxx +++ b/scintilla/lexers/LexLisp.cxx @@ -202,9 +202,7 @@ void FoldListDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, Lex int lev = levelUse | levelNext << 16; if (levelUse < levelNext) lev |= SC_FOLDLEVELHEADERFLAG; - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; levelCurrent = levelNext; } diff --git a/scintilla/lexers/LexLua.cxx b/scintilla/lexers/LexLua.cxx index 8e4d9f22ed..2498c9fdd4 100644 --- a/scintilla/lexers/LexLua.cxx +++ b/scintilla/lexers/LexLua.cxx @@ -442,9 +442,7 @@ void FoldLuaDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, L if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexMakefile.cxx b/scintilla/lexers/LexMakefile.cxx index 37099425ef..97a528f292 100644 --- a/scintilla/lexers/LexMakefile.cxx +++ b/scintilla/lexers/LexMakefile.cxx @@ -289,9 +289,7 @@ void FoldMakeDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, Lex int lev = levelUse | levelNext << 16; if (levelUse < levelNext) lev |= SC_FOLDLEVELHEADERFLAG; - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; levelCurrent = levelNext; visibleChars = 0; diff --git a/scintilla/lexers/LexMathematica.cxx b/scintilla/lexers/LexMathematica.cxx index 7ff885b43d..0d6d741583 100644 --- a/scintilla/lexers/LexMathematica.cxx +++ b/scintilla/lexers/LexMathematica.cxx @@ -158,9 +158,7 @@ void ColouriseMathematicaDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(sc.currentLine)) { - styler.SetLevel(sc.currentLine, lev); - } + styler.SetLevel(sc.currentLine, lev); } styler.SetLineState(sc.currentLine, commentLevel); diff --git a/scintilla/lexers/LexMatlab.cxx b/scintilla/lexers/LexMatlab.cxx index 4ef26ee411..e334642049 100644 --- a/scintilla/lexers/LexMatlab.cxx +++ b/scintilla/lexers/LexMatlab.cxx @@ -386,9 +386,7 @@ void FoldMatlabDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, L int lev = levelUse | levelNext << 16; if (levelUse < levelNext) lev |= SC_FOLDLEVELHEADERFLAG; - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; levelCurrent = levelNext; visibleChars = 0; diff --git a/scintilla/lexers/LexNSIS.cxx b/scintilla/lexers/LexNSIS.cxx index d1026ba8ef..6ad4ea9e19 100644 --- a/scintilla/lexers/LexNSIS.cxx +++ b/scintilla/lexers/LexNSIS.cxx @@ -276,9 +276,7 @@ void FoldNSISDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexPHP.cxx b/scintilla/lexers/LexPHP.cxx index 39fceac3de..0e14ab5fe5 100644 --- a/scintilla/lexers/LexPHP.cxx +++ b/scintilla/lexers/LexPHP.cxx @@ -1575,9 +1575,7 @@ void FoldPHPDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, L if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexPascal.cxx b/scintilla/lexers/LexPascal.cxx index 55094a5673..728963a520 100644 --- a/scintilla/lexers/LexPascal.cxx +++ b/scintilla/lexers/LexPascal.cxx @@ -422,9 +422,7 @@ void FoldPascalDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, L int lev = levelPrev; if ((levelCurrent > levelPrev)) lev |= SC_FOLDLEVELHEADERFLAG; - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); const int newLineState = (styler.GetLineState(lineCurrent) & ~stateFoldMaskAll) | lineFoldStateCurrent; styler.SetLineState(lineCurrent, newLineState); lineCurrent++; diff --git a/scintilla/lexers/LexPerl.cxx b/scintilla/lexers/LexPerl.cxx index b058e2ba14..4382d9824c 100644 --- a/scintilla/lexers/LexPerl.cxx +++ b/scintilla/lexers/LexPerl.cxx @@ -1678,9 +1678,7 @@ void FoldPerlDoc(Sci_PositionU startPos, Sci_Position length, int /*initStyle*/, lev |= levelCurrent << 16; if ((levelCurrent > levelPrev)) lev |= SC_FOLDLEVELHEADERFLAG; - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); lineStartNext = sci::min(lineStartNext, endPos); diff --git a/scintilla/lexers/LexPowerShell.cxx b/scintilla/lexers/LexPowerShell.cxx index 4b7f9f2f7f..229cc2bdd0 100644 --- a/scintilla/lexers/LexPowerShell.cxx +++ b/scintilla/lexers/LexPowerShell.cxx @@ -487,9 +487,7 @@ void FoldPowerShellDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initS if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexProps.cxx b/scintilla/lexers/LexProps.cxx index 1fd6adccbe..b9d27903d8 100644 --- a/scintilla/lexers/LexProps.cxx +++ b/scintilla/lexers/LexProps.cxx @@ -129,9 +129,7 @@ void ColourisePropsDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initS } else { nextLevel = prevLevel; } - if (nextLevel != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, nextLevel); - } + styler.SetLevel(lineCurrent, nextLevel); prevLevel = nextLevel; } #endif @@ -194,10 +192,7 @@ void FoldPropsDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int /*initStyl } } - if (nextLevel != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, nextLevel); - } - + styler.SetLevel(lineCurrent, nextLevel); prevLevel = nextLevel; prev2State = prevState; prevState = initStyle; diff --git a/scintilla/lexers/LexR.cxx b/scintilla/lexers/LexR.cxx index 2e832beedf..4b53b2f327 100644 --- a/scintilla/lexers/LexR.cxx +++ b/scintilla/lexers/LexR.cxx @@ -386,9 +386,7 @@ void FoldSimpleDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int /*initSty if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexRebol.cxx b/scintilla/lexers/LexRebol.cxx index 993d79126c..65acca3f1c 100644 --- a/scintilla/lexers/LexRebol.cxx +++ b/scintilla/lexers/LexRebol.cxx @@ -454,9 +454,7 @@ void FoldRebolDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int /*initStyl if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexRust.cxx b/scintilla/lexers/LexRust.cxx index dfdadb5514..da8cf9ece1 100644 --- a/scintilla/lexers/LexRust.cxx +++ b/scintilla/lexers/LexRust.cxx @@ -621,9 +621,7 @@ void FoldRustDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexSQL.cxx b/scintilla/lexers/LexSQL.cxx index fa22b9a514..865640d823 100644 --- a/scintilla/lexers/LexSQL.cxx +++ b/scintilla/lexers/LexSQL.cxx @@ -765,9 +765,7 @@ void FoldSqlDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, Lexe int lev = levelUse | levelNext << 16; if (levelUse < levelNext) lev |= SC_FOLDLEVELHEADERFLAG; - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; levelCurrent = levelNext; statementFound = false; diff --git a/scintilla/lexers/LexSmali.cxx b/scintilla/lexers/LexSmali.cxx index 09745f7704..939b879cf2 100644 --- a/scintilla/lexers/LexSmali.cxx +++ b/scintilla/lexers/LexSmali.cxx @@ -370,9 +370,7 @@ void FoldSmaliDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, Le int lev = levelUse | levelNext << 16; if (levelUse < levelNext) lev |= SC_FOLDLEVELHEADERFLAG; - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; levelCurrent = levelNext; } diff --git a/scintilla/lexers/LexSwift.cxx b/scintilla/lexers/LexSwift.cxx index 8e08ec48b1..33ada4fe60 100644 --- a/scintilla/lexers/LexSwift.cxx +++ b/scintilla/lexers/LexSwift.cxx @@ -594,9 +594,7 @@ void FoldSwiftDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexTOML.cxx b/scintilla/lexers/LexTOML.cxx index 3cd5c0a8a1..ddaeddda06 100644 --- a/scintilla/lexers/LexTOML.cxx +++ b/scintilla/lexers/LexTOML.cxx @@ -410,10 +410,7 @@ void FoldTOMLDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int /*initStyle } } - if (nextLevel != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, nextLevel); - } - + styler.SetLevel(lineCurrent, nextLevel); prevLevel = nextLevel; prev2Type = prevType; prevType = lineType; diff --git a/scintilla/lexers/LexVB.cxx b/scintilla/lexers/LexVB.cxx index 4895e8b557..e10c6630f8 100644 --- a/scintilla/lexers/LexVB.cxx +++ b/scintilla/lexers/LexVB.cxx @@ -497,9 +497,7 @@ void FoldVBDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, Lexer int lev = levelUse | levelNext << 16; if (levelUse < levelNext) lev |= SC_FOLDLEVELHEADERFLAG; - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; levelCurrent = levelNext; visibleChars = 0; diff --git a/scintilla/lexers/LexVHDL.cxx b/scintilla/lexers/LexVHDL.cxx index aeeb0dc012..ba91f9c14f 100644 --- a/scintilla/lexers/LexVHDL.cxx +++ b/scintilla/lexers/LexVHDL.cxx @@ -453,9 +453,7 @@ void FoldVHDLDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexVerilog.cxx b/scintilla/lexers/LexVerilog.cxx index a73414aec2..b8e0ab6f45 100644 --- a/scintilla/lexers/LexVerilog.cxx +++ b/scintilla/lexers/LexVerilog.cxx @@ -580,9 +580,7 @@ void FoldVerilogDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyl if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexVim.cxx b/scintilla/lexers/LexVim.cxx index ef24f756f7..59d538587c 100644 --- a/scintilla/lexers/LexVim.cxx +++ b/scintilla/lexers/LexVim.cxx @@ -344,9 +344,7 @@ void FoldVimDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int /*initStyle* if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexWASM.cxx b/scintilla/lexers/LexWASM.cxx index f57c0ff0d9..e196c7033b 100644 --- a/scintilla/lexers/LexWASM.cxx +++ b/scintilla/lexers/LexWASM.cxx @@ -262,9 +262,7 @@ void FoldWASMDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int /*initStyle if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1); diff --git a/scintilla/lexers/LexWinHex.cxx b/scintilla/lexers/LexWinHex.cxx index 4034f561af..04d91d000f 100644 --- a/scintilla/lexers/LexWinHex.cxx +++ b/scintilla/lexers/LexWinHex.cxx @@ -121,9 +121,7 @@ void ColouriseWinHexDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int init if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(sc.currentLine)) { - styler.SetLevel(sc.currentLine, lev); - } + styler.SetLevel(sc.currentLine, lev); levelCurrent = levelNext; } } diff --git a/scintilla/lexers/LexZig.cxx b/scintilla/lexers/LexZig.cxx index 4347fd09b7..299f08ed75 100644 --- a/scintilla/lexers/LexZig.cxx +++ b/scintilla/lexers/LexZig.cxx @@ -390,9 +390,7 @@ void FoldZigDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, L if (levelUse < levelNext) { lev |= SC_FOLDLEVELHEADERFLAG; } - if (lev != styler.LevelAt(lineCurrent)) { - styler.SetLevel(lineCurrent, lev); - } + styler.SetLevel(lineCurrent, lev); lineCurrent++; lineStartNext = styler.LineStart(lineCurrent + 1);