Import pyOverrides before script (#1309)

* Import pyOverrides before script

* Update translations

* Always add overrides before script

* Delete useless method

* Update translations

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Author: khodand

plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp

@@ -104,25 +104,15 @@ void trik::TrikTextualInterpreter::interpretCommand(const QString &script)
 	mScriptRunner.runDirectCommand(script);
 }
 
-QString trik::TrikTextualInterpreter::addCodeAfterImport(const QString &script, const QString &addCode) const
-{
-	QString updatedScript = script;
-	int lastIndexOfImport = updatedScript.lastIndexOf(QRegularExpression("^import .*"
-		, QRegularExpression::MultilineOption));
-	int indexOf = updatedScript.indexOf(QRegularExpression("$", QRegularExpression::MultilineOption)
-		, lastIndexOfImport);
-	updatedScript.insert(indexOf + 1, addCode);
-	return updatedScript;
-}
-
 void trik::TrikTextualInterpreter::interpretScript(const QString &script, const QString &languageExtension)
 {
 	mRunning = true;
 	mBrick.processSensors(true);
 	if (languageExtension.contains("js")) {
 		mScriptRunner.run(jsOverrides + script);
 	} else if (languageExtension.contains("py")) {
-		mScriptRunner.run(addCodeAfterImport(script, pyOverrides), "dummyFile.py");
+		auto updatedScript = script;
+		mScriptRunner.run(updatedScript.insert(0, pyOverrides), "dummyFile.py");
 	} else {
 		reportError(tr("Unsupported script file type"));
 	}
@@ -137,7 +127,8 @@ void trik::TrikTextualInterpreter::interpretScriptExercise(const QString &script
 	if (languageExtension.contains("js")) {
 		mScriptRunner.run(jsOverrides + "script.writeToFile = null;\n" + script);
 	} else if (languageExtension.contains("py")) {
-		mScriptRunner.run(addCodeAfterImport(script, pyOverrides + "\nscript.writeToFile = None\n"), "dummyFile.py");
+		auto updatedScript = script;
+		mScriptRunner.run(updatedScript.insert(0, pyOverrides + "\nscript.writeToFile = None\n"), "dummyFile.py");
 	} else {
 		reportError(tr("Unsupported script file type"));
 	}

qrtranslations/fr/plugins/robots/trikKitInterpreterCommon_fr.ts

@@ -4,7 +4,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../../../../plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp" line="+201"/>
+        <location filename="../../../../plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp" line="+192"/>
         <source>Bogus input values</source>
         <translation type="unfinished"></translation>
     </message>
@@ -230,8 +230,8 @@
 <context>
     <name>trik::TrikTextualInterpreter</name>
     <message>
-        <location filename="../../../../plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp" line="-96"/>
-        <location line="+15"/>
+        <location filename="../../../../plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp" line="-97"/>
+        <location line="+16"/>
         <source>Unsupported script file type</source>
         <translation type="unfinished"></translation>
     </message>

qrtranslations/ru/plugins/robots/trikKitInterpreterCommon_ru.ts

@@ -4,7 +4,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../../../../plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp" line="+201"/>
+        <location filename="../../../../plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp" line="+192"/>
         <source>Bogus input values</source>
         <translation>Неподходящие значения аргументов</translation>
     </message>
@@ -291,8 +291,8 @@
 <context>
     <name>trik::TrikTextualInterpreter</name>
     <message>
-        <location filename="../../../../plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp" line="-96"/>
-        <location line="+15"/>
+        <location filename="../../../../plugins/robots/interpreters/trikKitInterpreterCommon/src/trikTextualInterpreter.cpp" line="-97"/>
+        <location line="+16"/>
         <source>Unsupported script file type</source>
         <translation>Неверный формат файла</translation>
     </message>