fix reset folding margin if lexer does not use it

antonvw · Oct 27, 2024 · 0cec611 · 0cec611
1 parent a8c6ffe
commit 0cec611
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/ex/ex.cpp b/src/ex/ex.cpp
@@ -265,7 +265,7 @@ bool wex::ex::marker_add(char marker, int line)
 
   const int col(
     lin == get_stc()->GetCurrentLine() ?
-      get_stc()->GetColumn(get_stc()->GetCurrentPos()) :
+      get_stc()->GetColumn(get_stc()->GetCurrentPos()) + 1 :
       0);
 
   m_marker_columns[marker] = col;

diff --git a/src/syntax/lexer.cpp b/src/syntax/lexer.cpp
@@ -815,11 +815,15 @@ bool wex::lexer::set(const lexer& lexer, bool fold)
     m_stc->SetMarginWidth(
       m_stc->margin_folding_number(),
       config(_("stc.margin.Folding")).get(16));
-  }
 
-  if (fold)
+    if (fold)
+    {
+      m_stc->fold();
+    }
+  }
+  else
   {
-    m_stc->fold();
+    m_stc->SetMarginWidth(m_stc->margin_folding_number(), 0);
   }
 
   return m_scintilla_lexer.empty() || ok;