Fix tag navigation (#1987)

novelwriter/guimain.py

@@ -526,8 +526,14 @@ def closeDocument(self, beforeOpen: bool = False) -> None:
                 self.novelView.setActiveHandle(None)
         return
 
-    def openDocument(self, tHandle: str | None, tLine: int | None = None,
-                     changeFocus: bool = True, doScroll: bool = False) -> bool:
+    def openDocument(
+        self,
+        tHandle: str | None,
+        tLine: int | None = None,
+        sTitle: str | None = None,
+        changeFocus: bool = True,
+        doScroll: bool = False
+    ) -> bool:
         """Open a specific document, optionally at a given line."""
         if not SHARED.hasProject:
             logger.error("No project open")
@@ -537,9 +543,12 @@ def openDocument(self, tHandle: str | None, tLine: int | None = None,
             logger.debug("Requested item '%s' is not a document", tHandle)
             return False
 
+        if sTitle and tLine is None:
+            if hItem := SHARED.project.index.getItemHeading(tHandle, sTitle):
+                tLine = hItem.line
+
         self._changeView(nwView.EDITOR)
-        cHandle = self.docEditor.docHandle
-        if cHandle == tHandle:
+        if tHandle == self.docEditor.docHandle:
             self.docEditor.setCursorLine(tLine)
             if changeFocus:
                 self.docEditor.setFocus()
@@ -711,7 +720,6 @@ def openSelectedItem(self) -> None:
         if SHARED.hasProject:
             tHandle = None
             sTitle = None
-            tLine = None
             if self.projView.treeHasFocus():
                 tHandle = self.projView.getSelectedHandle()
             elif self.novelView.treeHasFocus():
@@ -722,11 +730,8 @@ def openSelectedItem(self) -> None:
                 logger.warning("No item selected")
                 return
 
-            if tHandle and sTitle:
-                if hItem := SHARED.project.index.getItemHeading(tHandle, sTitle):
-                    tLine = hItem.line
             if tHandle:
-                self.openDocument(tHandle, tLine=tLine, changeFocus=False, doScroll=False)
+                self.openDocument(tHandle, sTitle=sTitle, changeFocus=False, doScroll=False)
 
         return
 
@@ -1118,7 +1123,7 @@ def _followTag(self, tag: str, mode: nwDocMode) -> None:
         tHandle, sTitle = self._getTagSource(tag)
         if tHandle is not None:
             if mode == nwDocMode.EDIT:
-                self.openDocument(tHandle)
+                self.openDocument(tHandle, sTitle=sTitle)
             elif mode == nwDocMode.VIEW:
                 self.viewDocument(tHandle=tHandle, sTitle=sTitle)
         return
@@ -1137,11 +1142,7 @@ def _openDocument(self, tHandle: str, mode: nwDocMode, sTitle: str, setFocus: bo
         """Handle an open document request."""
         if tHandle is not None:
             if mode == nwDocMode.EDIT:
-                tLine = None
-                hItem = SHARED.project.index.getItemHeading(tHandle, sTitle)
-                if hItem is not None:
-                    tLine = hItem.line
-                self.openDocument(tHandle, tLine=tLine, changeFocus=setFocus)
+                self.openDocument(tHandle, sTitle=sTitle, changeFocus=setFocus)
             elif mode == nwDocMode.VIEW:
                 self.viewDocument(tHandle=tHandle, sTitle=sTitle)
         return

tests/test_gui/test_gui_guimain.py

@@ -39,6 +39,7 @@
 from novelwriter.gui.projtree import GuiProjectTree
 from novelwriter.tools.welcome import GuiWelcome
 
+from tests.mocked import causeOSError
 from tests.tools import NWD_IGNORE, XML_IGNORE, C, buildTestProject, cmpFiles
 
 KEY_DELAY = 1
@@ -651,7 +652,7 @@ def testGuiMain_Viewing(qtbot, monkeypatch, nwGUI, projPath, mockRnd):
 
 
 @pytest.mark.gui
-def testGuiMain_Features(qtbot, nwGUI, projPath, mockRnd):
+def testGuiMain_Features(qtbot, monkeypatch, nwGUI, projPath, mockRnd):
     """Test various features of the main window."""
     buildTestProject(nwGUI, projPath)
     assert SHARED.focusMode is False
@@ -672,6 +673,7 @@ def testGuiMain_Features(qtbot, nwGUI, projPath, mockRnd):
 
     # Enable focus mode
     nwGUI.toggleFocusMode()
+    assert SHARED.focusMode is True
     assert nwGUI.treePane.isVisible() is False
     assert nwGUI.mainStatus.isVisible() is False
     assert nwGUI.mainMenu.isVisible() is False
@@ -680,12 +682,19 @@ def testGuiMain_Features(qtbot, nwGUI, projPath, mockRnd):
 
     # Disable focus mode
     nwGUI.toggleFocusMode()
+    assert SHARED.focusMode is False
     assert nwGUI.treePane.isVisible() is True
     assert nwGUI.mainStatus.isVisible() is True
     assert nwGUI.mainMenu.isVisible() is True
     assert nwGUI.sideBar.isVisible() is True
     assert nwGUI.splitView.isVisible() is True
 
+    # Closing editor disables focus mode
+    nwGUI.toggleFocusMode()
+    assert SHARED.focusMode is True
+    nwGUI.closeDocument()
+    assert SHARED.focusMode is False
+
     # Full Screen Mode
     # ================
 
@@ -702,6 +711,17 @@ def testGuiMain_Features(qtbot, nwGUI, projPath, mockRnd):
     nwGUI.sideBar.mSettings.show()
     nwGUI.sideBar.mSettings.hide()
 
+    # Document Open Errors
+    # ====================
+
+    # Cannot edit a folder
+    assert nwGUI.openDocument(C.hChapterDir) is False
+
+    # Handle I/O error
+    with monkeypatch.context() as mp:
+        mp.setattr("builtins.open", causeOSError)
+        assert nwGUI.openDocument(C.hChapterDoc) is False
+
     # qtbot.stop()