Merge pull request #3733 from rlaverde/pr-eol-bug

PR: Fix EOL status after changing it

Author: ccordoba12

Diff for: spyder/plugins/editor.py

@@ -926,13 +926,13 @@ def get_plugin_actions(self):
 
         self.win_eol_action = create_action(self,
                            _("Carriage return and line feed (Windows)"),
-                           toggled=lambda: self.toggle_eol_chars('nt'))
+                           toggled=lambda checked: self.toggle_eol_chars('nt', checked))
         self.linux_eol_action = create_action(self,
                            _("Line feed (UNIX)"),
-                           toggled=lambda: self.toggle_eol_chars('posix'))
+                           toggled=lambda checked: self.toggle_eol_chars('posix', checked))
         self.mac_eol_action = create_action(self,
                            _("Carriage return (Mac)"),
-                           toggled=lambda: self.toggle_eol_chars('mac'))
+                           toggled=lambda checked: self.toggle_eol_chars('mac', checked))
         eol_action_group = QActionGroup(self)
         eol_actions = (self.win_eol_action, self.linux_eol_action,
                        self.mac_eol_action)
@@ -1180,7 +1180,7 @@ def register_editorstack(self, editorstack):
                                          self.encoding_status.encoding_changed)
             editorstack.sig_editor_cursor_position_changed.connect(
                                  self.cursorpos_status.cursor_position_changed)
-            editorstack.refresh_eol_chars.connect(self.eol_status.eol_changed)
+            editorstack.sig_refresh_eol_chars.connect(self.eol_status.eol_changed)
 
         editorstack.set_help(self.help)
         editorstack.set_io_actions(self.new_action, self.open_action,
@@ -1264,7 +1264,7 @@ def register_editorstack(self, editorstack):
         editorstack.refresh_file_dependent_actions.connect(
                                            self.refresh_file_dependent_actions)
         editorstack.refresh_save_all_action.connect(self.refresh_save_all_action)
-        editorstack.refresh_eol_chars.connect(self.refresh_eol_chars)
+        editorstack.sig_refresh_eol_chars.connect(self.refresh_eol_chars)
         editorstack.save_breakpoints.connect(self.save_breakpoints)
         editorstack.text_changed_at.connect(self.text_changed_at)
         editorstack.current_file_changed.connect(self.current_file_changed)
@@ -2059,10 +2059,11 @@ def run_winpdb(self):
             # must be changed to None in this case.)
             programs.run_program(WINPDB_PATH, [fname] + args, cwd=wdir or None)
 
-    def toggle_eol_chars(self, os_name):
-        editor = self.get_current_editor()
-        if self.__set_eol_chars:
-            editor.set_eol_chars(sourcecode.get_eol_chars_from_os_name(os_name))
+    def toggle_eol_chars(self, os_name, checked):
+        if checked:
+            editor = self.get_current_editor()
+            if self.__set_eol_chars:
+                editor.set_eol_chars(sourcecode.get_eol_chars_from_os_name(os_name))
 
     @Slot(bool)
     def toggle_show_blanks(self, checked):

Diff for: spyder/widgets/editor.py

@@ -278,7 +278,7 @@ class EditorStack(QWidget):
     readonly_changed = Signal(bool)
     encoding_changed = Signal(str)
     sig_editor_cursor_position_changed = Signal(int, int)
-    refresh_eol_chars = Signal(str)
+    sig_refresh_eol_chars = Signal(str)
     starting_long_process = Signal(str)
     ending_long_process = Signal(str)
     redirect_stdio = Signal(bool)
@@ -1628,8 +1628,11 @@ def modification_changed(self, state=None, index=None, editor_id=None):
         self.refresh_save_all_action.emit()
         # Refreshing eol mode
         eol_chars = finfo.editor.get_line_separator()
+        self.refresh_eol_chars(eol_chars)
+
+    def refresh_eol_chars(self, eol_chars):
         os_name = sourcecode.get_os_name_from_eol_chars(eol_chars)
-        self.refresh_eol_chars.emit(os_name)
+        self.sig_refresh_eol_chars.emit(os_name)
 
 
     #------ Load, reload
@@ -1740,6 +1743,7 @@ def create_new_editor(self, fname, enc, txt, set_current, new=False,
         editor.zoom_in.connect(lambda: self.zoom_in.emit())
         editor.zoom_out.connect(lambda: self.zoom_out.emit())
         editor.zoom_reset.connect(lambda: self.zoom_reset.emit())
+        editor.sig_eol_chars_changed.connect(lambda eol_chars: self.refresh_eol_chars(eol_chars))
         if self.outlineexplorer is not None:
             # Removing editor reference from outline explorer settings:
             editor.destroyed.connect(lambda obj=editor:
@@ -2140,7 +2144,7 @@ def register_editorstack(self, editorstack):
                                          self.encoding_status.encoding_changed)
         editorstack.sig_editor_cursor_position_changed.connect(
                      self.cursorpos_status.cursor_position_changed)
-        editorstack.refresh_eol_chars.connect(self.eol_status.eol_changed)
+        editorstack.sig_refresh_eol_chars.connect(self.eol_status.eol_changed)
         self.plugin.register_editorstack(editorstack)
         oe_btn = create_toolbutton(self)
         oe_btn.setDefaultAction(self.outlineexplorer.visibility_action)

Diff for: spyder/widgets/mixins.py

@@ -125,9 +125,12 @@ def set_eol_chars(self, text):
         if not is_text_string(text): # testing for QString (PyQt API#1)
             text = to_text_string(text)
         eol_chars = sourcecode.get_eol_chars(text)
-        if eol_chars is not None and self.eol_chars is not None:
-            self.document().setModified(True)
+        is_document_modified = eol_chars is not None and self.eol_chars is not None
         self.eol_chars = eol_chars
+        if is_document_modified:
+            self.document().setModified(True)
+            if self.sig_eol_chars_changed is not None:
+                self.sig_eol_chars_changed.emit(eol_chars)
 
     def get_line_separator(self):
         """Return line separator based on current EOL mode"""

Diff for: spyder/widgets/sourcecode/base.py

@@ -222,6 +222,7 @@ class TextEditBaseWidget(QPlainTextEdit, BaseEditMixin):
     zoom_out = Signal()
     zoom_reset = Signal()
     focus_changed = Signal()
+    sig_eol_chars_changed = Signal(str)
 
     def __init__(self, parent=None):
         QPlainTextEdit.__init__(self, parent)