make sure textarea runs checkSyntax whenever amount of columns changes

jasp-stats · Dec 12, 2023 · 023ab81 · 023ab81
1 parent a5250c3
commit 023ab81
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/QMLComponents/components/JASP/Controls/TextArea.qml b/QMLComponents/components/JASP/Controls/TextArea.qml
@@ -29,9 +29,6 @@ TextAreaBase
 	property bool	useTabAsSpaces		: true
 	property var	nextTabItem
 
-    signal applyRequest()
-	signal editingFinished()
-
 	Component.onCompleted: control.editingFinished.connect(editingFinished)
 
 	function userEnteredInput() {

diff --git a/QMLComponents/controls/textareabase.cpp b/QMLComponents/controls/textareabase.cpp
@@ -70,7 +70,12 @@ void TextAreaBase::setUp()
 			_separators.push_back(separator.toString());
 	}
 
-	connect(this, SIGNAL(applyRequest()), this, SLOT(checkSyntaxHandler()));
+	//If "rowCount" changes on VariableInfo it means a column has been added or removed, this means the model should be reencoded and checked
+	//Fixes https://github.com/jasp-stats/jasp-issues/issues/2462
+	connect(VariableInfo::info(),	&VariableInfo::rowCountChanged,		this,		&TextAreaBase::checkSyntaxHandler);
+
+	//Also do it on request of course ;)
+	connect(this,					&TextAreaBase::applyRequest,		this,		&TextAreaBase::checkSyntaxHandler);
 }
 
 void TextAreaBase::rScriptDoneHandler(const QString & result)

diff --git a/QMLComponents/controls/textareabase.h b/QMLComponents/controls/textareabase.h
@@ -75,6 +75,8 @@ public slots:
 signals:
 	void	textTypeChanged();
 	void	hasScriptErrorChanged();
+	void	applyRequest();
+	void	editingFinished();
 
 protected slots:
 	void	termsChangedHandler()		override;