Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:08:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ScriptEditor: single quotes support and spelling fix

Browse source
This commit is contained in:
Thijs Wenker 2015-10-14 14:47:29 +02:00
parent c9312803bd
commit 660bf6b3ea
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
interface/src/ScriptHighlighting.cpp
View file

@ -16,7 +16,7 @@ ScriptHighlighting::ScriptHighlighting(QTextDocument* parent) :
QSyntaxHighlighter(parent) QSyntaxHighlighter(parent)
{ {
_keywordRegex = QRegExp("\\b(break|case|catch|continue|debugger|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|this|throw|try|typeof|var|void|while|with)\\b"); _keywordRegex = QRegExp("\\b(break|case|catch|continue|debugger|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|this|throw|try|typeof|var|void|while|with)\\b");
_qoutedTextRegex = QRegExp("\"[^\"]*(\"){0,1}"); _quotedTextRegex = QRegExp("(\"[^\"]*(\"){0,1}|\'[^\']*(\'){0,1})");
_multiLineCommentBegin = QRegExp("/\\*"); _multiLineCommentBegin = QRegExp("/\\*");
_multiLineCommentEnd = QRegExp("\\*/"); _multiLineCommentEnd = QRegExp("\\*/");
_numberRegex = QRegExp("[0-9]+(\\.[0-9]+){0,1}"); _numberRegex = QRegExp("[0-9]+(\\.[0-9]+){0,1}");
@ -29,7 +29,7 @@ void ScriptHighlighting::highlightBlock(const QString& text) {
this->highlightKeywords(text); this->highlightKeywords(text);
this->formatNumbers(text); this->formatNumbers(text);
this->formatTrueFalse(text); this->formatTrueFalse(text);
this->formatQoutedText(text); this->formatQuotedText(text);
this->formatComments(text); this->formatComments(text);
} }
@ -61,14 +61,14 @@ void ScriptHighlighting::formatComments(const QString& text) {
int index = _singleLineComment.indexIn(text); int index = _singleLineComment.indexIn(text);
while (index >= 0) { while (index >= 0) {
int length = _singleLineComment.matchedLength(); int length = _singleLineComment.matchedLength();
int quoted_index = _qoutedTextRegex.indexIn(text); int quoted_index = _quotedTextRegex.indexIn(text);
bool valid = true; bool valid = true;
while (quoted_index >= 0 && valid) { while (quoted_index >= 0 && valid) {
int quoted_length = _qoutedTextRegex.matchedLength(); int quoted_length = _quotedTextRegex.matchedLength();
if (quoted_index <= index && index <= (quoted_index + quoted_length)) { if (quoted_index <= index && index <= (quoted_index + quoted_length)) {
valid = false; valid = false;
} }
quoted_index = _qoutedTextRegex.indexIn(text, quoted_index + quoted_length); quoted_index = _quotedTextRegex.indexIn(text, quoted_index + quoted_length);
} }
if (valid) { if (valid) {
@ -78,12 +78,12 @@ void ScriptHighlighting::formatComments(const QString& text) {
} }
} }
void ScriptHighlighting::formatQoutedText(const QString& text){ void ScriptHighlighting::formatQuotedText(const QString& text){
int index = _qoutedTextRegex.indexIn(text); int index = _quotedTextRegex.indexIn(text);
while (index >= 0) { while (index >= 0) {
int length = _qoutedTextRegex.matchedLength(); int length = _quotedTextRegex.matchedLength();
setFormat(index, length, Qt::red); setFormat(index, length, Qt::red);
index = _qoutedTextRegex.indexIn(text, index + length); index = _quotedTextRegex.indexIn(text, index + length);
} }
} }

4
interface/src/ScriptHighlighting.h
View file

@ -29,14 +29,14 @@ protected:
void highlightBlock(const QString& text); void highlightBlock(const QString& text);
void highlightKeywords(const QString& text); void highlightKeywords(const QString& text);
void formatComments(const QString& text); void formatComments(const QString& text);
void formatQoutedText(const QString& text); void formatQuotedText(const QString& text);
void formatNumbers(const QString& text); void formatNumbers(const QString& text);
void formatTrueFalse(const QString& text); void formatTrueFalse(const QString& text);
private: private:
QRegExp _alphacharRegex; QRegExp _alphacharRegex;
QRegExp _keywordRegex; QRegExp _keywordRegex;
QRegExp _qoutedTextRegex; QRegExp _quotedTextRegex;
QRegExp _multiLineCommentBegin; QRegExp _multiLineCommentBegin;
QRegExp _multiLineCommentEnd; QRegExp _multiLineCommentEnd;
QRegExp _numberRegex; QRegExp _numberRegex;