Commit b6da2d45 authored by Jarek Kobus's avatar Jarek Kobus
Browse files

Implement "Jump To File Under Cursor" in profile editor


Reviewed-by: default avatardt <qtc-committer@nokia.com>
Reviewed-by: default avatarossi <oswald.buddenhagen@nokia.com>
Task-number: QTCREATORBUG-688
parent d76abf38
......@@ -44,6 +44,7 @@
#include <texteditor/texteditorsettings.h>
#include <QtCore/QFileInfo>
#include <QtCore/QDir>
#include <QtGui/QMenu>
using namespace Qt4ProjectManager;
......@@ -107,6 +108,95 @@ void ProFileEditor::unCommentSelection()
Utils::unCommentSelection(this, m_commentDefinition);
}
static bool isValidFileNameChar(const QChar &c)
{
if (c.isLetterOrNumber()
|| c == QLatin1Char('.')
|| c == QLatin1Char('_')
|| c == QLatin1Char('-')
|| c == QLatin1Char('/')
|| c == QLatin1Char('\\'))
return true;
return false;
}
ProFileEditor::Link ProFileEditor::findLinkAt(const QTextCursor &cursor,
bool resolveTarget)
{
Link link;
int lineNumber = 0, positionInBlock = 0;
convertPosition(cursor.position(), &lineNumber, &positionInBlock);
const QString block = cursor.block().text();
// check if the current position is commented out
const int hashPos = block.indexOf(QLatin1Char('#'));
if (hashPos >= 0 && hashPos < positionInBlock)
return link;
// find the beginning of a filename
QString buffer;
int beginPos = positionInBlock - 1;
while (beginPos >= 0) {
QChar c = block.at(beginPos);
if (isValidFileNameChar(c)) {
buffer.prepend(c);
beginPos--;
} else {
break;
}
}
// find the end of a filename
int endPos = positionInBlock;
while (endPos < block.count()) {
QChar c = block.at(endPos);
if (isValidFileNameChar(c)) {
buffer.append(c);
endPos++;
} else {
break;
}
}
if (buffer.isEmpty())
return link;
// remove trailing '\' since it can be line continuation char
if (buffer.at(buffer.size() - 1) == QLatin1Char('\\')) {
buffer.chop(1);
endPos--;
}
// if the buffer starts with $$PWD accept it
if (buffer.startsWith(QLatin1String("PWD/")) ||
buffer.startsWith(QLatin1String("PWD\\"))) {
if (beginPos > 0 && block.mid(beginPos - 1, 2) == QLatin1String("$$")) {
beginPos -=2;
buffer = buffer.mid(4);
}
}
QDir dir(QFileInfo(file()->fileName()).absolutePath());
QString fileName = dir.filePath(buffer);
QFileInfo fi(fileName);
if (fi.exists()) {
if (fi.isDir()) {
QDir subDir(fi.absoluteFilePath());
QString subProject = subDir.filePath(subDir.dirName() + QLatin1String(".pro"));
if (QFileInfo(subProject).exists())
fileName = subProject;
else
return link;
}
link.fileName = fileName;
link.begin = cursor.position() - positionInBlock + beginPos + 1;
link.end = cursor.position() - positionInBlock + endPos;
}
return link;
}
TextEditor::BaseTextEditorEditable *ProFileEditor::createEditableInterface()
{
return new ProFileEditorEditable(this);
......@@ -169,6 +259,11 @@ void ProFileEditor::addLibrary()
editable->insert(snippet);
}
void ProFileEditor::jumpToFile()
{
openLink(findLinkAt(textCursor()));
}
//
// ProFileDocument
//
......
......@@ -82,12 +82,14 @@ public:
void unCommentSelection();
protected:
virtual Link findLinkAt(const QTextCursor &, bool resolveTarget = true);
TextEditor::BaseTextEditorEditable *createEditableInterface();
void contextMenuEvent(QContextMenuEvent *);
public slots:
virtual void setFontSettings(const TextEditor::FontSettings &);
void addLibrary();
void jumpToFile();
private:
ProFileEditorFactory *m_factory;
......
......@@ -65,6 +65,8 @@ const char * const BUILDSUBDIR = "Qt4Builder.BuildSubDir";
const char * const REBUILDSUBDIR = "Qt4Builder.RebuildSubDir";
const char * const CLEANSUBDIR = "Qt4Builder.CleanSubDir";
const char * const ADDLIBRARY = "Qt4.AddLibrary";
const char * const JUMP_TO_FILE = "Qt4.JumpToFile";
const char * const SEPARATOR = "Qt4.Separator";
//configurations
const char * const CONFIG_DEBUG = "debug";
......
......@@ -232,19 +232,31 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
Core::Command *cmd;
cmd = am->command(TextEditor::Constants::UN_COMMENT_SELECTION);
contextMenu->addAction(cmd);
Core::Context proFileEditorContext = Core::Context(Qt4ProjectManager::Constants::PROJECT_ID);
QAction *jumpToFile = new QAction(tr("Jump to File Under Cursor"), this);
cmd = am->registerAction(jumpToFile,
Constants::JUMP_TO_FILE, proFileEditorContext);
cmd->setDefaultKeySequence(QKeySequence(Qt::Key_F2));
connect(jumpToFile, SIGNAL(triggered()),
this, SLOT(jumpToFile()));
contextMenu->addAction(cmd);
QAction *addLibrary = new QAction(tr("Add Library..."), this);
cmd = am->registerAction(addLibrary,
Constants::ADDLIBRARY, proFileEditorContext);
//cmd->setDefaultKeySequence(QKeySequence(Qt::Key_F2));
connect(addLibrary, SIGNAL(triggered()),
this, SLOT(addLibrary()));
contextMenu->addAction(cmd);
QAction *separator = new QAction(this);
separator->setSeparator(true);
contextMenu->addAction(am->registerAction(separator,
Core::Id(Constants::SEPARATOR), proFileEditorContext));
cmd = am->command(TextEditor::Constants::UN_COMMENT_SELECTION);
contextMenu->addAction(cmd);
return true;
}
......@@ -306,6 +318,14 @@ void Qt4ProjectManagerPlugin::addLibrary()
editor->addLibrary();
}
void Qt4ProjectManagerPlugin::jumpToFile()
{
Core::EditorManager *em = Core::EditorManager::instance();
ProFileEditor *editor = qobject_cast<ProFileEditor*>(em->currentEditor()->widget());
if (editor)
editor->jumpToFile();
}
#ifdef WITH_TESTS
void Qt4ProjectManagerPlugin::testBasicProjectLoading()
{
......
......@@ -75,6 +75,7 @@ private slots:
void currentProjectChanged();
void buildStateChanged(ProjectExplorer::Project *pro);
void addLibrary();
void jumpToFile();
#ifdef WITH_TESTS
void testBasicProjectLoading(); // Test fails!
......
......@@ -4304,7 +4304,9 @@ bool BaseTextEditor::openLink(const Link &link)
return true;
}
return openEditorAt(link.fileName, link.line, link.column);
return openEditorAt(link.fileName, link.line, link.column, QString(),
Core::EditorManager::IgnoreNavigationHistory
| Core::EditorManager::ModeSwitch);
}
void BaseTextEditor::updateLink(QMouseEvent *e)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment