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

QmlJS checks: Change suppression annotation to @disable-check.

Browse Source 
Change-Id: I913cd757c4f8339a518c947569c5ba651153f1c1
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
This commit is contained in:
Christian Kamm
2011-10-28 12:27:10 +02:00
parent 4537e1b834
commit 5ac449a708
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/qmljs/qmljscheck.cpp
View File

@@ -1174,7 +1174,7 @@ void Check::scanCommentsForAnnotations()
m_disabledMessageTypesByLine.clear();
// find all disable annotations
const QRegExp disableCommentPattern(QLatin1String("@disable M(\\d+)"));
const QRegExp disableCommentPattern(Message::suppressionPattern());
foreach (const SourceLocation &commentLoc, _doc->engine()->comments()) {
const QString &comment = _doc->source().mid(commentLoc.begin(), commentLoc.length);
int lastOffset = -1;

7
src/libs/qmljs/qmljsstaticanalysismessage.cpp
View File

@@ -248,5 +248,10 @@ DiagnosticMessage Message::toDiagnosticMessage() const
QString Message::suppressionString() const
{
return QString("@disable M%1").arg(QString::number(type));
return QString("@disable-check M%1").arg(QString::number(type));
}
QRegExp Message::suppressionPattern()
{
return QRegExp(QLatin1String("@disable-check M(\\d+)"));
}

5
src/libs/qmljs/qmljsstaticanalysismessage.h
View File

@@ -36,6 +36,10 @@
#include "qmljs_global.h"
#include "parser/qmljsengine_p.h"
#include <QtCore/QRegExp>
#include <QtCore/QString>
#include <QtCore/QList>
namespace QmlJS {
namespace StaticAnalysis {
@@ -124,6 +128,7 @@ public:
DiagnosticMessage toDiagnosticMessage() const;
QString suppressionString() const;
static QRegExp suppressionPattern();
AST::SourceLocation location;
QString message;