mirror of
https://github.com/python-LimeReport/LimeReport.git
synced 2024-12-23 20:22:58 +03:00
CodeEditor fixed
This commit is contained in:
parent
be2b187d4f
commit
7d634a950f
@ -188,6 +188,7 @@ bool CodeEditor::matchRightParenthesis(QTextBlock currentBlock, QChar parenthesi
|
||||
if (data){
|
||||
QVector<ParenthesisInfo *> parentheses = data->parentheses();
|
||||
int docPos = currentBlock.position();
|
||||
if (i == -2) i = parentheses.size()-1;
|
||||
for (; i > -1 && parentheses.size() > 0; --i) {
|
||||
ParenthesisInfo *info = parentheses.at(i);
|
||||
if (info->character == parenthesisType) {
|
||||
@ -205,7 +206,7 @@ bool CodeEditor::matchRightParenthesis(QTextBlock currentBlock, QChar parenthesi
|
||||
|
||||
currentBlock = currentBlock.previous();
|
||||
if (currentBlock.isValid())
|
||||
return matchRightParenthesis(currentBlock, parenthesisType, 0, numRightParentheses);
|
||||
return matchRightParenthesis(currentBlock, parenthesisType, -2, numRightParentheses);
|
||||
|
||||
}
|
||||
return false;
|
||||
|
@ -110,7 +110,11 @@ void ScriptHighlighter::highlightBlock(const QString& text)
|
||||
}
|
||||
buffer.clear();
|
||||
buffer += currentChar;
|
||||
|
||||
break;
|
||||
case String:
|
||||
case String2:
|
||||
buffer.clear();
|
||||
buffer += currentChar;
|
||||
break;
|
||||
case MayBeKeyWord:
|
||||
case MayBeNumber:
|
||||
@ -160,17 +164,10 @@ void ScriptHighlighter::highlightBlock(const QString& text)
|
||||
|
||||
TextBlockData *data = new TextBlockData;
|
||||
|
||||
|
||||
for (int i = 0; i < PARENHEIS_COUNT; ++i){
|
||||
createParentheisisInfo(parenthesisCharacters[LeftParenthesis][i].toLatin1(), data, text);
|
||||
createParentheisisInfo(parenthesisCharacters[RightParenthesis][i].toLatin1(), data, text);
|
||||
}
|
||||
// createParentheisisInfo('(', data, text);
|
||||
// createParentheisisInfo(')', data, text);
|
||||
// createParentheisisInfo('{', data, text);
|
||||
// createParentheisisInfo('}', data, text);
|
||||
// createParentheisisInfo('[', data, text);
|
||||
// createParentheisisInfo(']', data, text);
|
||||
|
||||
setCurrentBlockUserData(data);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user