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

GlslEditor: Update language spec

Browse Source 
Task-number: QTCREATORBUG-24068
Change-Id: Id49f341881262b2398766513720ed38ba5c0deeb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Stenger
2020-06-02 12:48:39 +02:00
parent 65838ae510
commit 2419725466
5 changed files with 959 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/glsleditor/glsleditor.cpp
View File

@@ -193,13 +193,23 @@ void GlslEditorWidget::updateDocumentNow()
{
m_updateDocumentTimer.stop();
static const QRegularExpression versionRegex("^#version\\s+(\\d{3})\\s+(.*)?$",
QRegularExpression::MultilineOption);
int variant = languageVariant(textDocument()->mimeType());
const QString contents = toPlainText(); // get the code from the editor
const QByteArray preprocessedCode = contents.toLatin1(); // ### use the QtCreator C++ preprocessor.
QRegularExpressionMatch match = versionRegex.match(contents);
if (match.hasMatch()) {
const int version = match.captured(1).toInt();
if (version >= 330)
variant |= GLSL::Lexer::Variant_GLSL_400;
}
Document::Ptr doc(new Document());
doc->_engine = new Engine();
Parser parser(doc->_engine, preprocessedCode.constData(), preprocessedCode.size(), variant);
TranslationUnitAST *ast = parser.parse();
if (ast || extraSelections(CodeWarningsSelection).isEmpty()) {
Semantic sem;