forked from qt-creator/qt-creator
4f383f77b4
Clicking on error messages is supposed to jump to the editor. And "Show Output" on the task is supposed to select the error in the output. The old code just registered the task for the last line of output. This broke for every parser that allowed for error messages that spanned multiple lines. And was obviously also incorrect for tasks that weren't generated due to compile output. Fix both of those issues by giving the IOutputParsers more control on which lines are linked to a task. Task-number: QTCREATORBUG-14136 Change-Id: I095922c9875620dabfb7d406f6b152c8a9b25b62 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
103 lines
3.4 KiB
C++
103 lines
3.4 KiB
C++
/**************************************************************************
|
|
**
|
|
** Copyright (C) 2015 BogDan Vatra <bog_dan_ro@yahoo.com>
|
|
** Contact: http://www.qt.io/licensing
|
|
**
|
|
** This file is part of Qt Creator.
|
|
**
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms and
|
|
** conditions see http://www.qt.io/terms-conditions. For further information
|
|
** use the contact form at http://www.qt.io/contact-us.
|
|
**
|
|
** GNU Lesser General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
** General Public License version 2.1 or version 3 as published by the Free
|
|
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
|
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
|
** following information to ensure the GNU Lesser General Public License
|
|
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, The Qt Company gives you certain additional
|
|
** rights. These rights are described in The Qt Company LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "javaparser.h"
|
|
|
|
#include <projectexplorer/projectexplorerconstants.h>
|
|
#include <projectexplorer/task.h>
|
|
#include <QFileInfo>
|
|
|
|
using namespace Android::Internal;
|
|
using namespace ProjectExplorer;
|
|
|
|
JavaParser::JavaParser() :
|
|
m_javaRegExp(QLatin1String("^(.*\\[javac\\]\\s)(.*\\.java):(\\d+):(.*)$"))
|
|
{ }
|
|
|
|
void JavaParser::stdOutput(const QString &line)
|
|
{
|
|
parse(line);
|
|
IOutputParser::stdOutput(line);
|
|
}
|
|
|
|
void JavaParser::stdError(const QString &line)
|
|
{
|
|
parse(line);
|
|
IOutputParser::stdError(line);
|
|
}
|
|
|
|
void JavaParser::setProjectFileList(const QStringList &fileList)
|
|
{
|
|
m_fileList = fileList;
|
|
}
|
|
|
|
void JavaParser::setBuildDirectory(const Utils::FileName &buildDirectory)
|
|
{
|
|
m_buildDirectory = buildDirectory;
|
|
}
|
|
|
|
void JavaParser::setSourceDirectory(const Utils::FileName &sourceDirectory)
|
|
{
|
|
m_sourceDirectory = sourceDirectory;
|
|
}
|
|
|
|
void JavaParser::parse(const QString &line)
|
|
{
|
|
if (m_javaRegExp.indexIn(line) > -1) {
|
|
bool ok;
|
|
int lineno = m_javaRegExp.cap(3).toInt(&ok);
|
|
if (!ok)
|
|
lineno = -1;
|
|
Utils::FileName file = Utils::FileName::fromUserInput(m_javaRegExp.cap(2));
|
|
if (file.isChildOf(m_buildDirectory)) {
|
|
Utils::FileName relativePath = file.relativeChildPath(m_buildDirectory);
|
|
file = m_sourceDirectory;
|
|
file.appendPath(relativePath.toString());
|
|
}
|
|
|
|
if (file.toFileInfo().isRelative()) {
|
|
for (int i = 0; i < m_fileList.size(); i++)
|
|
if (m_fileList[i].endsWith(file.toString())) {
|
|
file = Utils::FileName::fromString(m_fileList[i]);
|
|
break;
|
|
}
|
|
}
|
|
|
|
Task task(Task::Error,
|
|
m_javaRegExp.cap(4).trimmed(),
|
|
file /* filename */,
|
|
lineno,
|
|
Constants::TASK_CATEGORY_COMPILE);
|
|
emit addTask(task, 1);
|
|
return;
|
|
}
|
|
|
|
}
|