User forums > Help
EOL issue, the EOL should be automatically detected, and make consistent
ollydbg:
Damn, I found is that my local git clone was merged around 2012-08-10 (it is the code base my git patch was against on), and after that day( in 2012-08-14) there is a new svn commit 8230 in the xrc file, see:
WebSVN - codeblocks - Path Comparison - /trunk/src/sdk/resources/editor_configuration.xrc Rev 8142 and /trunk/src/sdk/resources/editor_configuration.xrc Rev 8230
So, I think lots of the "extra change"(I believed the bug of wxsmith) in my attachment file in the previous post did the same thing as the commit 8230.
Sorry about the noise. :-[
ironhead:
I've manually applied the patch against r.8250 (some of the offsets were wrong) and it's working really well! Thank you for implementing this feature, I hope to see it applied to the official repository. ;)
dmoore:
I don't have time to test right now, but the code looks good. I have one small suggestion to use the info window to alert the user to the outcome of the voting logic if there are mixed line endings. In your logic that sets the line ending, you could modify it as follows:
--- Code: --- if (((linesLF >= linesCR) && (linesLF > linesCRLF)) || ((linesLF > linesCR) && (linesLF >= linesCRLF)))
{
eolMode = wxSCI_EOL_LF;
if((linesCR>0) || (linesCRLF>0))
{
wxBell();
InfoWindow::Display(_("Mixed Line Endings"), _("Mixed line endings found, setting mode \"LF\""), 1000);
}
}
else if (((linesCR >= linesLF) && (linesCR > linesCRLF)) || ((linesCR > linesLF) && (linesCR >= linesCRLF)))
{
eolMode = wxSCI_EOL_CR;
if((linesLF>0) || (linesCRLF>0))
{
wxBell();
InfoWindow::Display(_("Mixed Line Endings"), _("Mixed line endings found, setting mode \"CR\""), 1000);
}
}
else if (((linesCRLF >= linesLF) && (linesCRLF > linesCR)) || ((linesCRLF > linesLF) && (linesCRLF >= linesCR)))
{
eolMode = wxSCI_EOL_CRLF;
if((linesCR>0) || (linesLF>0))
{
wxBell();
InfoWindow::Display(_("Mixed Line Endings"), _("Mixed line endings found, setting mode \"CR-LF\""), 1000);
}
}
--- End code ---
ollydbg:
Thanks ironhead for the test.
Thanks dmoore for the suggestion, below is the refined patch. (combined your suggestion, code style and comments refined)
--- Code: ---Index: cbeditor.cpp
===================================================================
--- cbeditor.cpp (revision 8249)
+++ cbeditor.cpp (working copy)
@@ -731,6 +731,42 @@
END_EVENT_TABLE()
+// Count lines of EOL style in the opened file
+static void CountLineEnds(cbStyledTextCtrl* control, int &linesCR, int &linesLF, int &linesCRLF)
+{
+ linesCR = 0;
+ linesLF = 0;
+ linesCRLF = 0;
+
+ int lengthDoc = control->GetLength();
+ const int maxLineNumber = 1000000;
+ char chPrev = ' ';
+ char chNext = control->GetCharAt(0);
+ for (int i = 0; i < lengthDoc; i++)
+ {
+ char ch = chNext;
+ chNext = control->GetCharAt(i + 1);
+ if (ch == '\r')
+ {
+ if (chNext == '\n')
+ linesCRLF++;
+ else
+ linesCR++;
+ }
+ else if (ch == '\n')
+ {
+ if (chPrev != '\r')
+ {
+ linesLF++;
+ }
+ }
+ else if (i > maxLineNumber) // stop the loop if the file contains too many lines
+ return;
+
+ chPrev = ch;
+ }
+}
+
// class constructor
cbEditor::cbEditor(wxWindow* parent, const wxString& filename, EditorColourSet* theme)
: EditorBase(parent, filename),
@@ -1557,7 +1593,6 @@
control->SetMarginWidth(C_CHANGEBAR_MARGIN, 0);
// NOTE: duplicate line in editorconfigurationdlg.cpp (ctor)
- control->SetEOLMode( mgr->ReadInt(_T("/eol/eolmode"), platform::windows ? wxSCI_EOL_CRLF : wxSCI_EOL_LF)); // Windows takes CR+LF, other platforms LF only
control->SetScrollWidthTracking( mgr->ReadBool(_T("/margin/scroll_width_tracking"), false));
control->SetMultipleSelection( mgr->ReadBool(_T("/selection/multi_select"), false));
control->SetAdditionalSelectionTyping(mgr->ReadBool(_T("/selection/multi_typing"), false));
@@ -1575,6 +1610,53 @@
ConfigManager* mgr = Manager::Get()->GetConfigManager(_T("editor"));
+ // set the EOL, fall back value: Windows takes CR+LF, other platforms LF only
+ int eolMode = mgr->ReadInt(_T("/eol/eolmode"), platform::windows ? wxSCI_EOL_CRLF : wxSCI_EOL_LF);
+
+ // The code snippet of auto detect EOL is copied from SciTE's source, CountLineEnds() function
+ // scans the current source file, and counts lines of each EOL style, then finally sets the EOL
+ // by voting logic. In the case of mixed EOL files, we give the user a beep and InfoWindow notification.
+ if (eolMode == 3) //auto detect the EOL
+ {
+ int linesCR;
+ int linesLF;
+ int linesCRLF;
+
+ // count lines of each EOL style
+ CountLineEnds(control, linesCR, linesLF, linesCRLF);
+
+ //voting logic
+ unsigned int delay = 2000;
+ if (((linesLF >= linesCR) && (linesLF > linesCRLF)) || ((linesLF > linesCR) && (linesLF >= linesCRLF)))
+ {
+ eolMode = wxSCI_EOL_LF;
+ if((linesCR>0) || (linesCRLF>0))
+ {
+ wxBell();
+ InfoWindow::Display(_("Mixed Line Endings"), _("Mixed line endings found, setting mode \"LF\""), delay);
+ }
+ }
+ else if (((linesCR >= linesLF) && (linesCR > linesCRLF)) || ((linesCR > linesLF) && (linesCR >= linesCRLF)))
+ {
+ eolMode = wxSCI_EOL_CR;
+ if((linesLF>0) || (linesCRLF>0))
+ {
+ wxBell();
+ InfoWindow::Display(_("Mixed Line Endings"), _("Mixed line endings found, setting mode \"CR\""), delay);
+ }
+ }
+ else if (((linesCRLF >= linesLF) && (linesCRLF > linesCR)) || ((linesCRLF > linesLF) && (linesCRLF >= linesCR)))
+ {
+ eolMode = wxSCI_EOL_CRLF;
+ if((linesCR>0) || (linesLF>0))
+ {
+ wxBell();
+ InfoWindow::Display(_("Mixed Line Endings"), _("Mixed line endings found, setting mode \"CR-LF\""), delay);
+ }
+ }
+ }
+ control->SetEOLMode(eolMode);
+
// Interpret #if/#else/#endif to grey out code that is not active
control->SetProperty(_T("lexer.cpp.track.preprocessor"), mgr->ReadBool(_T("/track_preprocessor"), true) ? _T("1") : _T("0"));
Index: resources/editor_configuration.xrc
===================================================================
--- resources/editor_configuration.xrc (revision 8249)
+++ resources/editor_configuration.xrc (working copy)
@@ -200,6 +200,7 @@
<item>CR LF</item>
<item>CR</item>
<item>LF</item>
+ <item>AUTO</item>
</content>
<style>wxCB_READONLY</style>
</object>
--- End code ---
I would like to show the filename of the control in the InfoWindow::Display(), I see cbEditor(editorbase) have a member function:
--- Code: ---virtual const wxString& GetShortName() const { return m_Shortname; }
--- End code ---
What a pity is that
--- Code: ---// static
void cbEditor::InternalSetEditorStyleAfterFileOpen(cbStyledTextCtrl* control)
--- End code ---
This is a static member function, so no access to the filename. :(
MortenMacFly:
... you shouldn't not forget to do nothing (!) if the file dos not contain a line-feed, btw. For this to work, you can return true/false in the method you've introduced.
Navigation
[0] Message Index
[#] Next page
[*] Previous page
Go to full version