Diff of /lexers/LexHaskell.cxx [bc6d6a] .. [496aef]  Maximize  Restore

Switch to side-by-side view

--- a/lexers/LexHaskell.cxx
+++ b/lexers/LexHaskell.cxx
@@ -629,12 +629,12 @@
    // at least one line in all cases)
    int spaceFlags = 0;
    int lineCurrent = styler.GetLine(startPos);
-   bool importCurrent = LineContainsImport(lineCurrent, styler);
+   bool importHere = LineContainsImport(lineCurrent, styler);
    int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
 
    while (lineCurrent > 0) {
       lineCurrent--;
-      importCurrent = LineContainsImport(lineCurrent, styler);
+      importHere = LineContainsImport(lineCurrent, styler);
       indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
       if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG) &&
                !LineStartsWithACommentOrPreprocessor(lineCurrent, styler))
@@ -647,7 +647,7 @@
       firstImportLine = -1; // readjust first import position
    }
 
-   if (importCurrent) {
+   if (importHere) {
       if (firstImportLine == -1) {
          firstImportLine = lineCurrent;
       }
@@ -664,7 +664,7 @@
 
       // Gather info
       int lineNext = lineCurrent + 1;
-      bool importNext = LineContainsImport(lineNext, styler);
+      importHere = LineContainsImport(lineNext, styler);
       int indentNext = indentCurrent;
 
       if (lineNext <= docLines) {
@@ -683,13 +683,13 @@
             ((indentNext & SC_FOLDLEVELWHITEFLAG) ||
              (lineNext <= docLines && LineStartsWithACommentOrPreprocessor(lineNext, styler)))) {
          lineNext++;
-         importNext = LineContainsImport(lineNext, styler);
+         importHere = LineContainsImport(lineNext, styler);
          indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL);
       }
 
       int indentNextLevel = indentNext & SC_FOLDLEVELNUMBERMASK;
 
-      if (importNext) {
+      if (importHere) {
          if (firstImportLine == -1) {
             firstImportLine = lineNext;
          }