Fixed issue #18488: Conditions are not properly highlighted if they have additional spaces

[Shnoulle]

Dev: trim when view
Dev: trim when save
Dev: uneeded trim in expression

[c-schmitz]

I think it solves only part of the problem, as it only trims surrounding spaces of the equation.
It still does not take core of double spaces inside the condition parts, correct?

[Shnoulle]

It still does not take core of double spaces inside the condition parts, correct?

There are no issue with double or triple space inside relevance equation or line feed etc …

LimeSurvey/application/helpers/expressions/em_core_helper.php

Line 2485 in b10a1b1

private function RDP_Tokenize($sSource, $bOnEdit = false)

don't care of multiple space (don't care of any space) and happily!

Q00.NAOK 
           
== 


"Y"

===
Q00.NAOK=="Y"

There are just the space and line feed after the first { (and before the last) to allow javascript inside question.

Added it during Expression Manager construction some years ago

[Shnoulle]

LimeSurvey/application/helpers/expressions/em_core_helper.php

Line 2507 in b10a1b1

if ($this->RDP_TokenType[$i] !== 'SPACE' || $bOnEdit) {

LimeSurvey/application/helpers/expressions/em_core_helper.php

Line 2499 in b10a1b1

// $aTokens = array of tokens from equation, showing value, offsete position, and type. Will not contain SPACE if !$bOnEdit, but will contain OTHER

[sonarcloud]

Kudos, SonarCloud Quality Gate passed!   

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

0.0% Coverage
0.0% Duplication

[c-schmitz]

Looks good so far, please check my new information in the bug report.

[Shnoulle]

Screen-cast : only one «seems to be a space» character

Character not in this regexp :

LimeSurvey/application/helpers/expressions/em_core_helper.php

Line 115 in b10a1b1

$RDP_regex_whitespace = '\s+';

Proof done ?