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

qmljs: handle js directives .pragma and .import

Browse Source 
The directives .pragma and .import are not included in the AST.
Their source code locations are not stored in any other place.
As a result, when reformatting the source, they simply disappear.

This patch keep track of their source code locations, so they are
not removed when reformatting the source code.
This patch contains also some modification in the lexer that should
probably be ported to the qtdeclarative version.

Task-number: QTCREATORBUG-13038
Change-Id: I5d568abf02d37a584d4d246939736aaec5af5053
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Marco Benelli
2017-10-19 17:14:12 +02:00
parent c637c66ebb
commit d7f431482d
5 changed files with 62 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/libs/qmljs/qmljsdocument.cpp
View File

@@ -230,7 +230,17 @@ QString Document::componentName() const
namespace {
class CollectDirectives : public Directives
{
QString documentPath;
void addLocation(int line, int column) {
const SourceLocation loc = SourceLocation(
0, // placeholder
0, // placeholder
static_cast<quint32>(line),
static_cast<quint32>(column));
_locations += loc;
}
QList<SourceLocation> _locations;
public:
CollectDirectives(const QString &documentPath)
: documentPath(documentPath)
@@ -238,29 +248,41 @@ public:
{}
virtual void pragmaLibrary() { isLibrary = true; }
virtual void importFile(const QString &jsfile, const QString &module, int line, int column)
virtual void pragmaLibrary(int line, int column) override
{
isLibrary = true;
addLocation(line, column);
}
virtual void importFile(const QString &jsfile, const QString &module,
int line, int column) override
{
Q_UNUSED(line);
Q_UNUSED(column);
imports += ImportInfo::pathImport(
documentPath, jsfile, LanguageUtils::ComponentVersion(), module);
addLocation(line, column);
}
virtual void importModule(const QString &uri, const QString &version, const QString &module,
int line, int column)
int line, int column) override
{
Q_UNUSED(line);
Q_UNUSED(column);
imports += ImportInfo::moduleImport(uri, LanguageUtils::ComponentVersion(version), module);
addLocation(line, column);
}
virtual QList<SourceLocation> locations() { return _locations; }
const QString documentPath;
bool isLibrary;
QList<ImportInfo> imports;
};
} // anonymous namespace
QList<SourceLocation> Document::jsDirectives() const
{
return _jsdirectives;
}
bool Document::parse_helper(int startToken)
{
Q_ASSERT(! _engine);
@@ -275,8 +297,8 @@ bool Document::parse_helper(int startToken)
QString source = _source;
lexer.setCode(source, /*line = */ 1, /*qmlMode = */_language.isQmlLikeLanguage());
CollectDirectives collectDirectives(path());
_engine->setDirectives(&collectDirectives);
CollectDirectives directives = CollectDirectives(path());
_engine->setDirectives(&directives);
switch (startToken) {
case QmlJSGrammar::T_FEED_UI_PROGRAM:
@@ -284,6 +306,9 @@ bool Document::parse_helper(int startToken)
break;
case QmlJSGrammar::T_FEED_JS_PROGRAM:
_parsedCorrectly = parser.parseProgram();
for (const auto &d: directives.locations()) {
_jsdirectives << d;
}
break;
case QmlJSGrammar::T_FEED_JS_EXPRESSION:
_parsedCorrectly = parser.parseExpression();
@@ -295,7 +320,7 @@ bool Document::parse_helper(int startToken)
_ast = parser.rootNode();
_diagnosticMessages = parser.diagnosticMessages();
_bind = new Bind(this, &_diagnosticMessages, collectDirectives.isLibrary, collectDirectives.imports);
_bind = new Bind(this, &_diagnosticMessages, directives.isLibrary, directives.imports);
return _parsedCorrectly;
}