forked from qt-creator/qt-creator
Locator Cpp filters can jump to a column too.
This commit is contained in:
@@ -135,5 +135,5 @@ QList<Locator::FilterEntry> CppLocatorFilter::matchesFor(const QString &origEntr
|
|||||||
void CppLocatorFilter::accept(Locator::FilterEntry selection) const
|
void CppLocatorFilter::accept(Locator::FilterEntry selection) const
|
||||||
{
|
{
|
||||||
ModelItemInfo info = qvariant_cast<CppTools::Internal::ModelItemInfo>(selection.internalData);
|
ModelItemInfo info = qvariant_cast<CppTools::Internal::ModelItemInfo>(selection.internalData);
|
||||||
TextEditor::BaseTextEditor::openEditorAt(info.fileName, info.line);
|
TextEditor::BaseTextEditor::openEditorAt(info.fileName, info.line, info.column);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -213,5 +213,6 @@ void SearchSymbols::appendItem(const QString &name,
|
|||||||
items.append(ModelItemInfo(name, info, type,
|
items.append(ModelItemInfo(name, info, type,
|
||||||
QString::fromUtf8(symbol->fileName(), symbol->fileNameLength()),
|
QString::fromUtf8(symbol->fileName(), symbol->fileNameLength()),
|
||||||
symbol->line(),
|
symbol->line(),
|
||||||
|
symbol->column() - 1, // 1-based vs 0-based column
|
||||||
icon));
|
icon));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,12 +60,14 @@ struct ModelItemInfo
|
|||||||
ItemType type,
|
ItemType type,
|
||||||
const QString &fileName,
|
const QString &fileName,
|
||||||
int line,
|
int line,
|
||||||
|
int column,
|
||||||
const QIcon &icon)
|
const QIcon &icon)
|
||||||
: symbolName(symbolName),
|
: symbolName(symbolName),
|
||||||
symbolType(symbolType),
|
symbolType(symbolType),
|
||||||
type(type),
|
type(type),
|
||||||
fileName(fileName),
|
fileName(fileName),
|
||||||
line(line),
|
line(line),
|
||||||
|
column(column),
|
||||||
icon(icon)
|
icon(icon)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
@@ -74,6 +76,7 @@ struct ModelItemInfo
|
|||||||
ItemType type;
|
ItemType type;
|
||||||
QString fileName;
|
QString fileName;
|
||||||
int line;
|
int line;
|
||||||
|
int column;
|
||||||
QIcon icon;
|
QIcon icon;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user