Skip to content

Commit

Permalink
Simplify styler.SetLevel() calls.
Browse files Browse the repository at this point in the history
  • Loading branch information
@zufuliu
zufuliu committed Jan 11, 2024
1 parent fedf322 commit d14d082
Show file tree
Hide file tree
Showing 55 changed files with 56 additions and 170 deletions.
4 changes: 1 addition & 3 deletions scintilla/lexers/LexAPDL.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexAsm.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexAsymptote.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexAutoHotkey.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexAutoIt3.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexAviSynth.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexAwk.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexBash.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexBatch.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexCIL.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexCMake.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexCPP.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexCSS.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexCSharp.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexConfig.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexD.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexDart.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexFortran.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexGo.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexGraphViz.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexGroovy.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexHaxe.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexInno.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexJSON.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexJam.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexJava.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexJavaScript.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexJulia.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexKotlin.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexLaTeX.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexLisp.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexLua.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexMakefile.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexMathematica.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexMatlab.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions scintilla/lexers/LexNSIS.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading

0 comments on commit d14d082

Please sign in to comment.