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

Make GLSL highlighter aware of language variant

Browse Source
This commit is contained in:
Rhys Weatherley
2010-12-01 11:49:36 +10:00
parent 85aa32dfca
commit 16862432e3
4 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/glsleditor/glslhighlighter.cpp
View File

@@ -27,6 +27,7 @@
**
**************************************************************************/
#include "glslhighlighter.h"
#include "glsleditor.h"
#include <glsl/glsllexer.h>
#include <glsl/glslparser.h>
#include <texteditor/basetextdocumentlayout.h>
@@ -37,8 +38,8 @@ using namespace GLSLEditor;
using namespace GLSLEditor::Internal;
using namespace TextEditor;
Highlighter::Highlighter(QTextDocument *parent)
: TextEditor::SyntaxHighlighter(parent)
Highlighter::Highlighter(GLSLTextEditor *editor, QTextDocument *parent)
: TextEditor::SyntaxHighlighter(parent), m_editor(editor)
{
}
@@ -68,9 +69,7 @@ void Highlighter::highlightBlock(const QString &text)
lex.setState(state);
lex.setScanKeywords(false);
lex.setScanComments(true);
const int variant = GLSL::Lexer::Variant_GLSL_Qt | // ### FIXME: hardcoded
GLSL::Lexer::Variant_VertexShader |
GLSL::Lexer::Variant_FragmentShader;
const int variant = m_editor->languageVariant();
lex.setVariant(variant);
int initialState = state;
@@ -341,9 +340,7 @@ void Highlighter::highlightBlock(const QString &text)
lex.setState(qMax(0, previousState));
lex.setScanKeywords(false);
lex.setScanComments(true);
const int variant = GLSL::Lexer::Variant_GLSL_Qt | // ### FIXME: hardcoded
GLSL::Lexer::Variant_VertexShader |
GLSL::Lexer::Variant_FragmentShader;
const int variant = m_editor->languageVariant();
lex.setVariant(variant);
int foldingIndent = initialBraceDepth;