feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

DiffEditor: Avoid "jump to file" for directories and nonexistent files

Browse Source 
Submodule diff sample (sub is the submodule's root directory):

diff --git a/sub b/sub
index 6ae5025..4b26500 160000
--- a/sub
+++ b/sub
@@ -1 +1 @@
-Subproject commit 6ae5025c9a66767e90cd320f9661e7694f7ea8b5
+Subproject commit 4b2650066d4143e8b7a9f4b19e46b96996a1dd90

Change-Id: I388de5bc50ceb1fcfc31a3a70ce8328c83fafa71
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
Orgad Shaneh
2014-06-18 12:04:14 +03:00
committed by Orgad Shaneh
parent ed8677b391
commit 6c921090bf
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
View File

@@ -1236,7 +1236,9 @@ void SideBySideDiffEditorWidget::jumpToOriginalFile(const QString &fileName,
const QDir dir(m_controller->workingDirectory()); const QDir dir(m_controller->workingDirectory());
const QString absoluteFileName = dir.absoluteFilePath(fileName); const QString absoluteFileName = dir.absoluteFilePath(fileName);
Core::EditorManager::openEditorAt(absoluteFileName, lineNumber, columnNumber); QFileInfo fi(absoluteFileName);
if (fi.exists() && !fi.isDir())
Core::EditorManager::openEditorAt(absoluteFileName, lineNumber, columnNumber);
} }
void SideBySideDiffEditorWidget::slotLeftContextMenuRequested(QMenu *menu, void SideBySideDiffEditorWidget::slotLeftContextMenuRequested(QMenu *menu,

4
src/plugins/diffeditor/unifieddiffeditorwidget.cpp
View File

@@ -758,7 +758,9 @@ void UnifiedDiffEditorWidget::jumpToOriginalFile(const QString &fileName,
const QDir dir(m_controller->workingDirectory()); const QDir dir(m_controller->workingDirectory());
const QString absoluteFileName = dir.absoluteFilePath(fileName); const QString absoluteFileName = dir.absoluteFilePath(fileName);
Core::EditorManager::openEditorAt(absoluteFileName, lineNumber, columnNumber); QFileInfo fi(absoluteFileName);
if (fi.exists() && !fi.isDir())
Core::EditorManager::openEditorAt(absoluteFileName, lineNumber, columnNumber);
} }
void UnifiedDiffEditorWidget::setCurrentDiffFileIndex(int diffFileIndex) void UnifiedDiffEditorWidget::setCurrentDiffFileIndex(int diffFileIndex)