feat: R syntax highlighter in analysis panel controls

Desktop/components/JASP/Widgets/ComputeColumnWindow.qml

@@ -2,6 +2,7 @@ import QtQuick			2.7
 import QtQuick.Controls 2.12
 import QtQuick.Layouts	1.3
 import JASP.Controls	1.0 as JaspControls
+import JASP
 
 import "FilterConstructor"
 
@@ -103,6 +104,12 @@ FocusScope
 				TextArea
 				{
 					id: computeColumnEdit
+
+					RSyntaxHighlighterQuick
+					{
+						textDocument:		computeColumnEdit.textDocument
+					}
+
 
 					anchors.top:			parent.top
 					anchors.left:			parent.left

Desktop/components/JASP/Widgets/FilterWindow.qml

@@ -2,6 +2,7 @@ import QtQuick			2.12
 import QtQuick.Controls 2.12
 import JASP.Controls	1.0 as JaspControls
 import "FilterConstructor"
+import JASP
 
 FocusScope
 {
@@ -302,6 +303,11 @@ FocusScope
 
 						TextArea
 						{
+							RSyntaxHighlighterQuick
+							{
+								textDocument:		filterGeneratedEdit.textDocument
+							}
+
 							id:						filterGeneratedEdit
 							anchors.top:			filterGeneratedBox.top
 							anchors.left:			resetAllGeneratedFilters.right
@@ -347,6 +353,11 @@ FocusScope
 						TextArea
 						{
 
+							RSyntaxHighlighterQuick
+							{
+								textDocument:		filterEdit.textDocument
+							}
+
 							id:						filterEdit
 							height:					contentHeight + 30
 							selectByMouse:			true

Desktop/components/JASP/Widgets/RCommanderWindow.qml

@@ -110,6 +110,11 @@ Window
 
 					TextArea
 					{
+						RSyntaxHighlighterQuick
+						{
+							textDocument:		outputWindow.textDocument
+						}
+
 						id:					outputWindow
 						text:				rCmd.output
 						font:				jaspTheme.fontRCode
@@ -192,6 +197,13 @@ Window
 
 						TextArea
 						{
+
+							RSyntaxHighlighterQuick
+							{
+								textDocument:		codeEntry.textDocument
+							}
+
+
 							id:						codeEntry
 							font:					jaspTheme.fontRCode
 							color:					jaspTheme.textEnabled

Desktop/mainwindow.cpp

@@ -32,12 +32,11 @@
 #include <iostream>
 
 #include "log.h"
-#include "dirs.h"
 #include "timers.h"
 #include "appinfo.h"
 #include "tempfiles.h"
 #include "processinfo.h"
-#include "columnutils.h"
+
 #include "mainwindow.h"
 
 #include "analysisform.h"
@@ -46,6 +45,7 @@
 #include "controls/comboboxbase.h"
 #include "controls/textinputbase.h"
 #include "controls/componentslistbase.h"
+#include "controls/rsyntaxhighlighter.h"
 #include "controls/factorsformbase.h"
 #include "controls/inputlistbase.h"
 #include "controls/textareabase.h"
@@ -180,6 +180,7 @@ MainWindow::MainWindow(QApplication * application) : QObject(application), _appl
 	qmlRegisterType<ComboBoxBase>								("JASP",			1, 0, "ComboBoxBase"					);
 	qmlRegisterType<RadioButtonBase>							("JASP",			1, 0, "RadioButtonBase"					);
 	qmlRegisterType<RadioButtonsGroupBase>						("JASP",			1, 0, "RadioButtonsGroupBase"			);
+	qmlRegisterType<RSyntaxHighlighterQuick>					("JASP",			1, 0, "RSyntaxHighlighterQuick"			);
 	qmlRegisterType<ComponentsListBase>							("JASP",			1, 0, "ComponentsListBase"				);
 	qmlRegisterType<FactorsFormBase>							("JASP",			1, 0, "FactorsFormBase"					);
 	qmlRegisterType<InputListBase>								("JASP",			1, 0, "InputListBase"					);

QMLComponents/boundcontrols/boundcontrolcsemtextarea.h

@@ -1,12 +1,12 @@
 #ifndef BOUNDCONTROLCSEMTEXTAREA_H
 #define BOUNDCONTROLCSEMTEXTAREA_H
 
-#include "boundcontrollavaantextarea.h"
+#include "boundcontrolrlangtextarea.h"
 
-class BoundControlCSemTextArea : public BoundControlLavaanTextArea
+class BoundControlCSemTextArea : public BoundControlRlangTextArea
 {
 public:
-	using BoundControlLavaanTextArea::BoundControlLavaanTextArea;    
+    using BoundControlRlangTextArea::BoundControlRlangTextArea;
 
 protected:
 	const char * _checkSyntaxRFunctionName() override { return "jaspSem:::checkCSemModel"; }

QMLComponents/boundcontrols/boundcontrollavaantextarea.cpp → QMLComponents/boundcontrols/boundcontrolrlangtextarea.cpp

@@ -16,14 +16,14 @@
 // <http://www.gnu.org/licenses/>.
 //
 
-#include "boundcontrollavaantextarea.h"
+#include "boundcontrolrlangtextarea.h"
 #include "controls/textareabase.h"
 #include "log.h"
 #include "columnencoder.h"
 #include "analysisform.h"
 #include <QQuickTextDocument>
 
-BoundControlLavaanTextArea::BoundControlLavaanTextArea(TextAreaBase *textArea)
+BoundControlRlangTextArea::BoundControlRlangTextArea(TextAreaBase *textArea)
 	: BoundControlTextArea(textArea)
 {
 
@@ -32,14 +32,14 @@ BoundControlLavaanTextArea::BoundControlLavaanTextArea(TextAreaBase *textArea)
 	if (textDocumentQQuick)
 	{
 		QTextDocument* doc = textDocumentQQuick->textDocument();
-		_lavaanHighlighter = new LavaanSyntaxHighlighter(doc);
+        _rLangHighlighter = new RSyntaxHighlighter(doc);
 		//connect(doc, &QTextDocument::contentsChanged, this, &BoundQMLTextArea::contentsChangedHandler);
 	}
 	else
 		Log::log()  << "No document object found!" << std::endl;
 }
 
-void BoundControlLavaanTextArea::bindTo(const Json::Value &value)
+void BoundControlRlangTextArea::bindTo(const Json::Value &value)
 {
 	if (value.type() != Json::objectValue)	return;
 	BoundControlBase::bindTo(value);
@@ -50,7 +50,7 @@ void BoundControlLavaanTextArea::bindTo(const Json::Value &value)
 
 }
 
-Json::Value BoundControlLavaanTextArea::createJson() const
+Json::Value BoundControlRlangTextArea::createJson() const
 {
 	Json::Value result;
 	std::string text = _textArea->text().toStdString();
@@ -62,7 +62,7 @@ Json::Value BoundControlLavaanTextArea::createJson() const
 	return result;
 }
 
-bool BoundControlLavaanTextArea::isJsonValid(const Json::Value &value) const
+bool BoundControlRlangTextArea::isJsonValid(const Json::Value &value) const
 {
 	if (!value.isObject())					return false;
 	if (!value["modelOriginal"].isString())	return false;
@@ -73,7 +73,7 @@ bool BoundControlLavaanTextArea::isJsonValid(const Json::Value &value) const
 	return true;
 }
 
-void BoundControlLavaanTextArea::checkSyntax()
+void BoundControlRlangTextArea::checkSyntax()
 {
 	QString text = _textArea->text();
 
@@ -103,7 +103,7 @@ void BoundControlLavaanTextArea::checkSyntax()
 
 }
 
-QString BoundControlLavaanTextArea::rScriptDoneHandler(const QString & result)
+QString BoundControlRlangTextArea::rScriptDoneHandler(const QString & result)
 {
 	if (!result.isEmpty())
 		return result;

QMLComponents/boundcontrols/boundcontrollavaantextarea.h → QMLComponents/boundcontrols/boundcontrolrlangtextarea.h

@@ -16,16 +16,16 @@
 // <http://www.gnu.org/licenses/>.
 //
 
-#ifndef BOUNDCONTROLLAVAANTEXTAREA_H
-#define BOUNDCONTROLLAVAANTEXTAREA_H
+#ifndef BOUNDCONTROLRLANGTEXTAREA_H
+#define BOUNDCONTROLRLANGTEXTAREA_H
 
 #include "boundcontroltextarea.h"
-#include "controls/lavaansyntaxhighlighter.h"
+#include "controls/rsyntaxhighlighter.h"
 
-class BoundControlLavaanTextArea : public BoundControlTextArea
+class BoundControlRlangTextArea : public BoundControlTextArea
 {
 public:
-	BoundControlLavaanTextArea(TextAreaBase* textArea);
+    BoundControlRlangTextArea(TextAreaBase* textArea);
 
 	bool		isJsonValid(const Json::Value& optionValue)		const	override;
 	Json::Value	createJson()									const	override;
@@ -35,12 +35,12 @@ class BoundControlLavaanTextArea : public BoundControlTextArea
 	QString		rScriptDoneHandler(const QString &result)				override;
 
 protected:
-	LavaanSyntaxHighlighter*	_lavaanHighlighter		= nullptr;
+    RSyntaxHighlighter*	_rLangHighlighter		= nullptr;
 
 	std::set<std::string>		_usedColumnNames;
 	QString						_textEncoded;
 	virtual const char * 		_checkSyntaxRFunctionName() { return "jaspSem:::checkLavaanModel"; }
 
 };
 
-#endif // BOUNDCONTROLLAVAANTEXTAREA_H
+#endif // BOUNDCONTROLRLANGTEXTAREA_H

QMLComponents/components/JASP/Controls/Form.qml

@@ -240,6 +240,7 @@ AnalysisForm
 				width:				parent.width
 				height:				visible ? 100 * preferencesModel.uiScale : 0
 				text:				form.rSyntaxText
+				textType:           JASPControl.TextTypeRcode
 				isBound:			false
 				onApplyRequest:		form.sendRSyntax(text)