User forums > Help
EOL issue, the EOL should be automatically detected, and make consistent
dmoore:
Looks like you are on the right track. Why don't you make a patch? For mixed files, voting makes sense.
Do we have room on the status bar for the EOL mode? (Or is it there already) Some sort of warning, especially for mixed sources would be nice (though not everyone likes warnings and they shouldn't be intrusive).
thomas:
--- Quote from: ollydbg on August 24, 2012, 04:13:31 pm ---OK about my brain? :)
--- End quote ---
Yours is hopefully ok, it's mine that isn't good.
The approach sounds very good, though I would like to also reserve a way to always have a particular encoding and line ending (for example I'm using UTF-8 and LF everywhere, for everything, even under Windows -- don't want to have the editor interfere with this in any way, even hypothetically).
Maybe these options would be a good solution:
* use system default
* use XYZ line ending
* use file's line ending (and fall back to system default)
To detect the encoding, I'd just scan over all lines (does not really take that much longer!) and take whichever encoding occurs more often. On a tie, fall back to system default.
ollydbg:
Thank you thomas and dmoore for the constructive suggestion.
OK, I will take the job to implement this, but before that, I need to firstly comprehend what the current way do. (Now, I even do not understand what does "Ensure consistent EOLs" used for, so it will take some time to read the source)
dmoore:
--- Quote from: ollydbg on August 24, 2012, 05:41:10 pm ---(Now, I even do not understand what does "Ensure consistent EOLs" used for, so it will take some time to read the source)
--- End quote ---
Converts all EOLs in the doc to whatever is the currently set EOL mode of that editor when you save.
Note that I put in some features related to EOLs in the editortweaks plugin so users could temporarly change from the default manually, per editor. Would be nice not to break that, but I suspect what you are doing will be fine. (If installed, those options are in Edit->Editor tweaks)
ollydbg:
Here is the draft patch, I add an item "AUTO" in the editor setting, this has the value "3".
The changed file are: src\sdk\cbeditor.cpp and src\sdk\resources\editor_configuration.xrc
Note, I have problems to generate the patch file, because wxsmith change the resource file a lot(strange, it convert the spaces to tabs, I manually change them back to spaces), so I add the xrc file. Both of the files were generated by tortoiseGit, which have LF format.
I added a static function, which I think is not a good idea, right?
Comments are welcome. Thanks.
EDIT: I remove the old attachment, and the patch against the latest svn revision is below:
--- Code: ---Index: cbeditor.cpp
===================================================================
--- cbeditor.cpp (revision 8249)
+++ cbeditor.cpp (working copy)
@@ -731,6 +731,39 @@
END_EVENT_TABLE()
+
+// Count the EOL in the opened file
+static void CountLineEnds(cbStyledTextCtrl* control, int &linesCR, int &linesLF, int &linesCRLF)
+{
+ linesCR = 0;
+ linesLF = 0;
+ linesCRLF = 0;
+
+ //int GetCharAt(int pos)
+ //int GetLength() const;
+ int lengthDoc = control->GetLength();
+ 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 > 1000000) {
+ return;
+ }
+ chPrev = ch;
+ }
+}
+
// class constructor
cbEditor::cbEditor(wxWindow* parent, const wxString& filename, EditorColourSet* theme)
: EditorBase(parent, filename),
@@ -1557,7 +1590,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 +1607,23 @@
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);
+ if (eolMode == 3) //auto detect the eol
+ {
+ int linesCR;
+ int linesLF;
+ int linesCRLF;
+ CountLineEnds(control, linesCR, linesLF, linesCRLF);
+ if (((linesLF >= linesCR) && (linesLF > linesCRLF)) || ((linesLF > linesCR) && (linesLF >= linesCRLF)))
+ eolMode = wxSCI_EOL_LF;
+ else if (((linesCR >= linesLF) && (linesCR > linesCRLF)) || ((linesCR > linesLF) && (linesCR >= linesCRLF)))
+ eolMode = wxSCI_EOL_CR;
+ else if (((linesCRLF >= linesLF) && (linesCRLF > linesCR)) || ((linesCRLF > linesLF) && (linesCRLF >= linesCR)))
+ eolMode = wxSCI_EOL_CRLF;
+ }
+ 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 ---
Navigation
[0] Message Index
[#] Next page
[*] Previous page
Go to full version