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

Line length for QML/JS editing automatic formatting

Browse Source 
Adding parameters to functions in the QML/JS formatter
Adding widget and setting to the QML/JS editing settings

Fixes: QTCREATORBUG-23411
Change-Id: Ib9d3ac3b22443e81cd636fbc276c6544dab1511b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
This commit is contained in:
Xavier BESSON
2022-04-02 12:15:26 +02:00
parent 4762d54401
commit 87e52ad189
21 changed files with 780 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/libs/qmljs/qmljsreformatter.cpp
View File

@@ -98,6 +98,7 @@ class Rewriter : protected Visitor
bool _hadEmptyLine = false;
int _binaryExpDepth = 0;
bool _hasOpenComment = false;
int _lineLength = 80;
public:
Rewriter(Document::Ptr doc)
@@ -107,6 +108,7 @@ public:
void setIndentSize(int size) { _formatter.setIndentSize(size); }
void setTabSize(int size) { _formatter.setTabSize(size); }
void setLineLength(int size) { _lineLength = size; }
QString operator()(Node *node)
{
@@ -286,10 +288,10 @@ protected:
QStringList lines;
qreal badnessFromSplits;
qreal badness()
qreal badness(int lineLength)
{
const int maxLineLength = 80;
const int strongMaxLineLength = 100;
const int maxLineLength = lineLength;
const int strongMaxLineLength = lineLength + 20;
const int minContentLength = 10;
qreal result = badnessFromSplits;
@@ -369,7 +371,7 @@ protected:
nested.lines.prepend(newContextLine);
nested.badnessFromSplits += possibleSplits.at(i).badness;
if (nested.badness() < result.badness())
if (nested.badness(_lineLength) < result.badness(_lineLength))
result = nested;
}
@@ -391,13 +393,15 @@ protected:
_indent = tryIndent(_line);
adjustIndent(&_line, &_possibleSplits, _indent);
// maybe make multi-line?
BestSplit split = computeBestSplits(QStringList(), _line, _possibleSplits);
if (!split.lines.isEmpty() && split.lines.size() > 1) {
for (int i = 0; i < split.lines.size(); ++i) {
_line = split.lines.at(i);
if (i != split.lines.size() - 1)
finishLine();
if (_lineLength > 0) {
// maybe make multi-line?
BestSplit split = computeBestSplits(QStringList(), _line, _possibleSplits);
if (!split.lines.isEmpty() && split.lines.size() > 1) {
for (int i = 0; i < split.lines.size(); ++i) {
_line = split.lines.at(i);
if (i != split.lines.size() - 1)
finishLine();
}
}
}
}
@@ -1414,10 +1418,11 @@ QString QmlJS::reformat(const Document::Ptr &doc)
return rewriter(doc->ast());
}
QString QmlJS::reformat(const Document::Ptr &doc, int indentSize, int tabSize)
QString QmlJS::reformat(const Document::Ptr &doc, int indentSize, int tabSize, int lineLength)
{
Rewriter rewriter(doc);
rewriter.setIndentSize(indentSize);
rewriter.setTabSize(tabSize);
rewriter.setLineLength(lineLength);
return rewriter(doc->ast());
}

4
src/libs/qmljs/qmljsreformatter.h
View File

@@ -31,5 +31,5 @@
namespace QmlJS {
QMLJS_EXPORT QString reformat(const Document::Ptr &doc);
QMLJS_EXPORT QString reformat(const Document::Ptr &doc, int indentSize, int tabSize);
}
QMLJS_EXPORT QString reformat(const Document::Ptr &doc, int indentSize, int tabSize, int lineLength);
} // namespace QmlJS