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

Core: move the fileName line column parsing of openEditor

Browse Source 
Move it from EditorManagerPrivate::openEditor to the
EditorManager::openEditor overlaod that take a QString so no line or
column number should be passed via FilePath now.

Change-Id: Ia98058195045cbe555fb6a15c1010057746051d8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
David Schulz
2021-05-26 14:41:10 +02:00
parent b9c7ca0096
commit ee06b995cb
1 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -789,23 +789,10 @@ IEditor *EditorManagerPrivate::openEditor(EditorView *view, const FilePath &file
if (debugEditorManager) if (debugEditorManager)
qDebug() << Q_FUNC_INFO << filePath << editorId.name(); qDebug() << Q_FUNC_INFO << filePath << editorId.name();
QString fn = filePath.toString(); const QString fn = Utils::FileUtils::normalizePathName(filePath.toString());
QFileInfo fi(fn);
int lineNumber = -1;
int columnNumber = -1;
if ((flags & EditorManager::CanContainLineAndColumnNumber) && !fi.exists()) {
Link link = Link::fromString(fn, true);
fn = Utils::FileUtils::normalizePathName(link.targetFilePath.toString());
lineNumber = link.targetLine;
columnNumber = link.targetColumn;
} else {
fn = Utils::FileUtils::normalizePathName(fn);
}
if (fn.isEmpty()) if (fn.isEmpty())
return nullptr; return nullptr;
if (fn != filePath.toString()) const QFileInfo fi(fn);
fi.setFile(fn);
if (newEditor) if (newEditor)
*newEditor = false; *newEditor = false;
@@ -824,10 +811,7 @@ IEditor *EditorManagerPrivate::openEditor(EditorView *view, const FilePath &file
} }
} }
} }
editor = activateEditor(view, editor, flags); return activateEditor(view, editor, flags);
if (editor && flags & EditorManager::CanContainLineAndColumnNumber)
editor->gotoLine(lineNumber, columnNumber);
return editor;
} }
QString realFn = autoSaveName(fn); QString realFn = autoSaveName(fn);
@@ -947,9 +931,6 @@ IEditor *EditorManagerPrivate::openEditor(EditorView *view, const FilePath &file
if (editor == result) if (editor == result)
restoreEditorState(editor); restoreEditorState(editor);
if (flags & EditorManager::CanContainLineAndColumnNumber)
editor->gotoLine(lineNumber, columnNumber);
return result; return result;
} }
@@ -3090,6 +3071,9 @@ IEditor *EditorManager::openEditor(const FilePath &filePath, Id editorId,
IEditor *EditorManager::openEditor(const QString &fileName, Id editorId, IEditor *EditorManager::openEditor(const QString &fileName, Id editorId,
OpenEditorFlags flags, bool *newEditor) OpenEditorFlags flags, bool *newEditor)
{ {
QFileInfo fi(fileName);
if ((flags & CanContainLineAndColumnNumber) && !fi.exists())
return openEditorAt(Link::fromString(fileName, true), editorId, flags, newEditor);
return openEditor(FilePath::fromString(fileName), editorId, flags, newEditor); return openEditor(FilePath::fromString(fileName), editorId, flags, newEditor);
} }