Commit f209b065 authored by Roberto Raggi's avatar Roberto Raggi

Initial work on the new indenter for Qt Script.

parent 53db20f4
......@@ -31,6 +31,7 @@
#include "qtscripteditorconstants.h"
#include "qtscripthighlighter.h"
#include "qtscripteditorplugin.h"
#include "qtscriptindenter.h"
#include "parser/javascriptengine_p.h"
#include "parser/javascriptparser_p.h"
......@@ -39,7 +40,6 @@
#include "parser/javascriptastvisitor_p.h"
#include "parser/javascriptast_p.h"
#include <indenter.h>
#include <utils/uncommentselection.h>
#include <coreplugin/icore.h>
......@@ -338,29 +338,18 @@ bool ScriptEditor::isElectricCharacter(const QChar &ch) const
return false;
// Indent a code line based on previous
template <class Iterator>
static void indentScriptBlock(const TextEditor::TabSettings &ts,
const QTextBlock &block,
const Iterator &programBegin,
const Iterator &programEnd,
QChar typedChar)
typedef typename SharedTools::Indenter<Iterator> Indenter ;
Indenter &indenter = Indenter::instance();
const TextEditor::TextBlockIterator current(block);
const int indent = indenter.indentForBottomLine(current, programBegin,
programEnd, typedChar);
ts.indentLine(block, indent);
void ScriptEditor::indentBlock(QTextDocument *doc, QTextBlock block, QChar typedChar)
const TextEditor::TextBlockIterator begin(doc->begin());
const TextEditor::TextBlockIterator end(;
indentScriptBlock(tabSettings(), block, begin, end, typedChar);
TextEditor::TabSettings ts = tabSettings();
QtScriptIndenter indenter;
const int indent = indenter.indentForBottomLine(begin, end, typedChar);
ts.indentLine(block, indent);
TextEditor::BaseTextEditorEditable *ScriptEditor::createEditableInterface()
......@@ -13,12 +13,14 @@ HEADERS += qtscripteditor.h \
qtscripteditorfactory.h \
qtscripteditorplugin.h \
qtscripthighlighter.h \
qtscriptindenter.h \
SOURCES += qtscripteditor.cpp \
qtscripteditorfactory.cpp \
qtscripteditorplugin.cpp \
qtscripthighlighter.cpp \
qtscriptindenter.cpp \
RESOURCES += qtscripteditor.qrc
This diff is collapsed.
** This file is part of Qt Creator
** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (
** Commercial Usage
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial License Agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Nokia.
** 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 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met:
** If you are unsure which license is appropriate for your use, please
** contact the sales department at
#include <QtCore/QRegExp>
#include <QtCore/QStringList>
#include <texteditor/textblockiterator.h>
namespace QtScriptEditor {
namespace Internal {
class QtScriptIndenter
void setTabSize(int size);
void setIndentSize(int size);
int indentForBottomLine(TextEditor::TextBlockIterator begin, TextEditor::TextBlockIterator end, QChar typedIn);
QChar firstNonWhiteSpace(const QString &t);
static const int SmallRoof;
static const int BigRoof;
bool isOnlyWhiteSpace(const QString &t);
int columnForIndex(const QString &t, int index);
int indentOfLine(const QString &t);
QString trimmedCodeLine(const QString &t);
inline void eraseChar(QString &t, int k, QChar ch);
inline QChar lastParen(const QString &t);
inline bool okay(QChar typedIn, QChar okayCh);
The "linizer" is a group of functions and variables to iterate
through the source code of the program to indent. The program is
given as a list of strings, with the bottom line being the line
to indent. The actual program might contain extra lines, but
those are uninteresting and not passed over to us.
bool readLine();
void startLinizer();
bool bottomLineStartsInCComment();
int indentWhenBottomLineStartsInCComment();
bool matchBracelessControlStatement();
bool isUnfinishedLine();
bool isContinuationLine();
int indentForContinuationLine();
int indentForStandaloneLine();
int ppHardwareTabSize;
int ppIndentSize;
int ppContinuationIndentSize;
int ppCommentOffset;
struct LinizerState
: braceDepth(0),
{ }
int braceDepth;
bool leftBraceFollows;
bool inCComment;
bool pendingRightBrace;
QString line;
TextEditor::TextBlockIterator iter;
struct Program {
TextEditor::TextBlockIterator b, e;
typedef TextEditor::TextBlockIterator iterator;
typedef TextEditor::TextBlockIterator const_iterator;
Program() {}
Program(TextEditor::TextBlockIterator begin, TextEditor::TextBlockIterator end)
: b(begin), e(end) {}
iterator begin() const { return b; }
iterator end() const { return e; }
const_iterator constBegin() const { return b; }
const_iterator constEnd() const { return e; }
Program yyProgram;
LinizerState yyLinizerState;
// shorthands
const QString *yyLine;
const int *yyBraceDepth;
const bool *yyLeftBraceFollows;
QRegExp literal;
QRegExp label;
QRegExp inlineCComment;
QRegExp braceX;
QRegExp iflikeKeyword;
} // namespace Internal
} // namespace QtScriptEditor
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment